rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-21 02:00:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,961 Commits 67 Branches 505 Tags
Commit Graph

904 Commits

Author SHA1 Message Date
Rainer Gerhards
18e60f46a1 Merge branch 'v4-stable' into v5-stable 
Conflicts:
	runtime/debug.h
	runtime/obj.c
	runtime/parser.h
	runtime/wti.h
 2012-01-16 16:14:30 +01:00
Rainer Gerhards
bd22bf8cb4 license changes 2012-01-16 15:23:01 +01:00
Rainer Gerhards
f6dea36394 runtime license change 2012-01-16 12:39:01 +01:00
Rainer Gerhards
095021e866 Merge branch 'v4-stable' into v5-stable 2012-01-14 19:04:46 +01:00
Rainer Gerhards
6df41eaa88 license change 
after careful consideration of affected code
 2012-01-14 19:01:44 +01:00
Kaiwang Chen
791b16ce06 bugfix: instabilities when using RFC5424 header fields 
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2012-01-09 14:32:52 +01:00
Rainer Gerhards
74722b2331 bugfix: stats counter were not properly initialized on creation 2011-12-20 18:22:58 +01:00
Rainer Gerhards
d2da5f39d0 Merge branch 'v4-stable' into v5-stable 
Conflicts:
	action.c
 2011-12-01 11:30:10 +01:00
Rainer Gerhards
cb0087ec47 Merge branch 'v3-stable' into v4-stable 2011-12-01 11:26:24 +01:00
Tomas Heinrich
ffa6e3b941 bugfix: cosmetic: proper constant used instead of number in open call 
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2011-12-01 11:18:49 +01:00
Rainer Gerhards
f3a7232069 Merge branch 'v4-stable' into v5-stable 
Conflicts:
	ChangeLog
 2011-10-27 09:39:45 +02:00
Tomas Heinrich
9b305b5de5 bugfix: potential abort after reading invalid X.509 certificate 
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2011-10-27 09:37:27 +02:00
Rainer Gerhards
10947b3f4a bugfix: missing whitespace after property-based filter was not detected 2011-10-21 14:05:59 +02:00
Rainer Gerhards
bea330746c bugfix: $OMFileFlushInterval period was doubled - now using correct value 2011-10-18 13:43:34 +02:00
Rainer Gerhards
d6a6666b66 bugfix: race condition when extracting structured data and PROCID 
same issue as previous commit for PROGNAME and APPNAME
 2011-10-13 08:15:54 +02:00
Rainer Gerhards
4831a51f5a bugfix: race condition when extracting program name and APPNAME 
could lead to invalid characters e.g. in dynamic file names
 2011-10-13 08:04:40 +02:00
Rainer Gerhards
cd5253fa82 bugfix: imfile did invalid system call under some circumstances 
when a file that was to be monitored did not exist BUT the state file
actually existed. Mostly a cosmetic issue. Root cause was incomplete
error checking in stream.c; so patch may affect other code areas.
 2011-10-07 11:42:49 +02:00
Rainer Gerhards
b26387e6b2 bugfix: omfile returns fatal error code for things that go really wrong 
previously, RS_RET_RESUME was returned, which lead to a loop inside the
rule engine as omfile could not really recover.
 2011-09-26 11:36:44 +02:00
Andre Lorbach
154747929f removed debug code from action.c and runtime/queue.c after testing 2011-08-18 13:15:10 +02:00
Andre Lorbach
47ed9921b6 bugfix: fixed incorrect state handling for Discard Action (transactions) 2011-08-18 09:36:59 +02:00
Andre Lorbach
1697917525 Added debug output into message parsers needed for bugtracking 
Changed version to 5.8.5-pre1
 2011-08-12 14:48:43 +02:00
Rainer Gerhards
b4d4366986 bugfixes for tag emulation 
- bugfix: potential hang condition during tag emulation
- bugfix: too-early string termination during tag emulation
 2011-08-11 15:05:00 +02:00
Andre Lorbach
b37a22e3c1 Merge branch 'v4-stable' into v4-beta 2011-08-11 10:58:57 +02:00
Andre Lorbach
fcb98138a6 Added MsgDup bugfix from v5-stable into v4-stable branch 2011-08-11 10:57:06 +02:00
Andre Lorbach
5722fde8e9 Fixed BUG in MsgDup (msg.c), the NULL Byte was not copied for the SyslogTag 
The syslogtag of the duplicated message could get contain garbage at the end
as the string terminating NULL Byte was missing.
 2011-08-10 17:27:21 +02:00
Andre Lorbach
2c403b28be Merge branch 'v5-stable-msgidfix' into v5-stable 2011-08-10 11:16:31 +02:00
Rainer Gerhards
41043f3f07 Merge branch 'v4-stable' into v5-stable 2011-08-09 12:28:35 +02:00
Rainer Gerhards
b882a00928 Merge branch 'v4-stable' into v4-beta 2011-08-09 12:26:53 +02:00
Marius Tomaschewski
9bea045e60 bugfix: memcpy overflow can occur in allowed sender checking 
...if a host name is resolved to IPv4-mapped-on-IPv6 address.
Found by Ismail Dönmez at suse.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2011-08-09 12:25:46 +02:00
Andre Lorbach
a8f2fd6eb4 Merge branch 'v4-stable' into v4-beta 
Conflicts:

	ChangeLog
 2011-08-05 14:14:23 +02:00
Andre Lorbach
a3953fbee9 Merge branch 'v3-stable' into v4-stable 
Conflicts:

	runtime/msg.c
 2011-08-05 14:09:08 +02:00
Andre Lorbach
3229fbeb1e bugfix: potential misadressing in property replacer 2011-08-05 13:59:44 +02:00
Andre Lorbach
7191cf03e2 bugfix: potential misadressing in property replacer 2011-08-05 13:45:16 +02:00
Andre Lorbach
37f5a7376a Cosmetic change 2011-07-27 17:19:00 +02:00
Andre Lorbach
d66f7b95e0 Fixed a stupid return bug introduced by the last commit 2011-07-27 09:35:14 +02:00
Andre Lorbach
a9b0ddd780 Experimentally added mutex lock in getMSGID in order to fix bug 275. 2011-07-26 12:20:41 +02:00
Rainer Gerhards
d66d3d6033 added warning message for old-style outchannel syntax 2011-07-11 10:08:16 +02:00
Rainer Gerhards
f55eee74a3 issue a warning message for old-style dynafile action 2011-07-11 09:34:26 +02:00
Rainer Gerhards
53265e3c74 Merge branch 'v4-stable' into v4-devel 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
 2011-07-11 09:02:09 +02:00
Rainer Gerhards
86225089f2 bugfix: mutex was invalidly left unlocked during action processing 
At least one case where this can occur is during thread shutdown, which
may be initiated by lower activity. In most cases, this is quite
unlikely to happen. However, if it does, data structures may be
corrupted which could lead to fatal failure and segfault. I detected
this via a testbench test, not a user report. But I assume that some
users may have had unreproducable aborts that were cause by this bug.
 2011-06-21 12:35:14 +02:00
Rainer Gerhards
656740b663 bugfix: problems in failover action handling 
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=254
 2011-06-20 15:01:11 +02:00
Rainer Gerhards
b3dae5cff3 Merge branch 'v4-stable' into v5-stable 2011-06-16 18:02:13 +02:00
Rainer Gerhards
3135b3335d Merge branch 'v3-stable' into v4-stable 
Conflicts:
	runtime/datetime.c
 2011-06-16 17:53:29 +02:00
Rainer Gerhards
da52cbae52 bugfix: timestamp was incorrectly calculated for timezones with minute offset 
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271
 2011-06-16 17:35:45 +02:00
Rainer Gerhards
90f8c73004 bugfix: problems in failover action handling 
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!)
 2011-06-16 15:17:48 +02:00
Rainer Gerhards
41d8672524 bugfix/improvement:$WorkDirectory now gracefully handles trailing slashes 2011-06-15 12:20:12 +02:00
Rainer Gerhards
6afbb39ea1 Merge branch 'v4-stable' into v4-devel 2011-06-14 12:52:35 +02:00
Rainer Gerhards
bcd956d4d5 bugfix: memory leak in imtcp & subsystems under some circumstances 
This leak is tied to error conditions which lead to incorrect cleanup
of some data structures. [backport from v6, limited testing under v4]
 2011-06-14 12:52:02 +02:00
Rainer Gerhards
fdc25fb14b bugfix: TLS-induced smaller memory still existed, now fixed 2011-06-14 12:23:33 +02:00
Rainer Gerhards
2c81df12bc bugfix: memory leak in imtcp & subsystems under some circumstances 
This leak is tied to error conditions which lead to incorrect cleanup
of some data structures.

Note: this is a backport from v6. In v5, we currently do not have
the toolchain to verify the original problem and that it is solved.
So this patch is preliminary and subject to change as work progresses.
 2011-06-10 22:50:25 +02:00