summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into betaRainer Gerhards2011-10-271-2/+6
|\ | | | | | | | | Conflicts: ChangeLog
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-271-2/+6
| |\ | | | | | | | | | | | | Conflicts: ChangeLog
| | * bugfix: potential abort after reading invalid X.509 certificateTomas Heinrich2011-10-271-2/+6
| | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-111-1/+1
| | |\
| | | * Added MsgDup bugfix from v5-stable into v4-stable branchAndre Lorbach2011-08-111-1/+1
| | | |
| | * | Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-091-1/+1
| | |\|
| | * | Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-051-7/+7
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | issue a warning message for old-style dynafile actionRainer Gerhards2011-07-111-0/+1
| | | | |
| | * | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-07-111-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-06-141-0/+3
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-111-2/+6
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-092-11/+23
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
| | * | | | | | | bugfix: a slightly more informative error message when a TCPRainer Gerhards2011-05-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connections is aborted
| | * | | | | | | bugfix: PRI was invalid on Solaris for message from local log socketCorey Smith2011-03-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: root <root@localhost.localdomain>
* | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-212-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | | | bugfix: missing whitespace after property-based filter was not detectedRainer Gerhards2011-10-212-1/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-211-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_recording_pri.html
| * | | | | | | | bugfix: $OMFileFlushInterval period was doubled - now using correct valueRainer Gerhards2011-10-181-1/+1
| | | | | | | | |
* | | | | | | | | bugfix (kind of): removed numerical part from pri-textRainer Gerhards2011-10-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see v6 compatibility document for reasons
* | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-132-11/+51
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | | | bugfix: race condition when extracting structured data and PROCIDRainer Gerhards2011-10-131-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same issue as previous commit for PROGNAME and APPNAME
| * | | | | | | | bugfix: race condition when extracting program name and APPNAMERainer Gerhards2011-10-131-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | could lead to invalid characters e.g. in dynamic file names
| * | | | | | | | bugfix: imfile did invalid system call under some circumstancesRainer Gerhards2011-10-071-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-09-261-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | | | bugfix: omfile returns fatal error code for things that go really wrongRainer Gerhards2011-09-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously, RS_RET_RESUME was returned, which lead to a loop inside the rule engine as omfile could not really recover.
* | | | | | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-182-2/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | | | | | | removed debug code from action.c and runtime/queue.c after testingAndre Lorbach2011-08-181-4/+0
| | | | | | | | |
| * | | | | | | | bugfix: fixed incorrect state handling for Discard Action (transactions)Andre Lorbach2011-08-181-0/+13
| | | | | | | | |
| * | | | | | | | Added debug output into message parsers needed for bugtrackingAndre Lorbach2011-08-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed version to 5.8.5-pre1
| * | | | | | | | bugfixes for tag emulationRainer Gerhards2011-08-111-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: potential hang condition during tag emulation - bugfix: too-early string termination during tag emulation
* | | | | | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-111-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | | | Fixed BUG in MsgDup (msg.c), the NULL Byte was not copied for the SyslogTagAndre Lorbach2011-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The syslogtag of the duplicated message could get contain garbage at the end as the string terminating NULL Byte was missing.
* | | | | | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-101-3/+10
|\| | | | | | | |
| * | | | | | | | Merge branch 'v5-stable-msgidfix' into v5-stableAndre Lorbach2011-08-101-3/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Cosmetic changeAndre Lorbach2011-07-271-2/+2
| | | | | | | | | |
| | * | | | | | | | Fixed a stupid return bug introduced by the last commitAndre Lorbach2011-07-271-1/+2
| | | | | | | | | |
| | * | | | | | | | Experimentally added mutex lock in getMSGID in order to fix bug 275.Andre Lorbach2011-07-261-3/+9
| | | | | | | | | |
* | | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-08-091-1/+1
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-08-091-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | bugfix: memcpy overflow can occur in allowed sender checkingMarius Tomaschewski2011-08-091-1/+1
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...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>
| | * | | | | | | Merge branch 'v3-stable' into v4-stableAndre Lorbach2011-08-051-7/+7
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c
| | | * | | | | | bugfix: potential misadressing in property replacerAndre Lorbach2011-08-051-7/+7
| | | | | | | | |
* | | | | | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-051-7/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | | | bugfix: potential misadressing in property replacerAndre Lorbach2011-08-051-7/+9
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | added warning message for old-style outchannel syntaxRainer Gerhards2011-07-111-0/+1
| | | | | | | |
* | | | | | | | issue a warning if old omusrmsg action syntax is usedRainer Gerhards2011-07-061-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-06-215-9/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh
| * | | | | | | bugfix: mutex was invalidly left unlocked during action processingv5.8.2Rainer Gerhards2011-06-211-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | bugfix: problems in failover action handlingRainer Gerhards2011-06-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=254
| * | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-06-161-1/+1
| |\| | | | | |