summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v7-stable'Rainer Gerhards2013-03-204-3/+13
|\
| * bugfix: $mmnormalizeuseramsg paramter was specified with wrong typeRainer Gerhards2013-03-202-1/+4
| | | | | | | | | | Thanks to Renzhong Zhang for alerting us of the problem. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=420
| * Merge branch 'v7-stable' of git+ssh://git.adiscon.com/git/rsyslog into v7-stableRainer Gerhards2013-03-200-0/+0
| |\
| | * bugfix: RainerScript getenv() function caused segfault when var was not foundPhilippe Muller2013-03-202-1/+8
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | bugfix: RainerScript getenv() function caused segfault when var was not foundPhilippe Muller2013-03-202-1/+8
| |/ | | | | | | | | | | | | This patch is released under ASL 2.0 as of email conversation from 2013-03-20. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * require newer libestr due to a bug in itRainer Gerhards2013-03-191-1/+1
| |
* | add recent bugfix to ChangeLogRainer Gerhards2013-03-201-0/+3
| |
* | bugfix: build on non-linux platforms failedRainer Gerhards2013-03-201-1/+1
| | | | | | | | The previous fix for this was incomplete.
* | bugfix: solve compile problems on non-Linux platformsRainer Gerhards2013-03-192-1/+2
| | | | | | | | Thanks to Michael Biebl for alerting us on this issue.
* | fix merge problemv7.3.8Rainer Gerhards2013-03-181-4/+4
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-03-185-18/+51
|\| | | | | | | | | | | Conflicts: runtime/debug.h tools/syslogd.c
| * doc: mention last patches in ChangeLogRainer Gerhards2013-03-181-6/+8
| |
| * Do not exit when messages get overwritten in the circular bufferMilan Bartos2013-03-181-0/+4
| | | | | | | | modified: plugins/imkmsg/kmsg.c
| * Fix message read buffer sizeMilan Bartos2013-03-181-2/+2
| | | | | | | | modified: plugins/imkmsg/kmsg.c
| * Remove unnecessary strlen() callMilan Bartos2013-03-181-1/+1
| | | | | | | | modified: plugins/imkmsg/kmsg.c
| * Fix trailing '-' in kernel messages.Milan Bartos2013-03-181-0/+4
| | | | | | | | modified: plugins/imkmsg/kmsg.c
| * debug system improvement & bug fix for init system status (see below)Rainer Gerhards2013-03-154-20/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | - rsyslogd startup information is now properly conveyed back to init when privileges are beging dropped Actually, we have moved termination of the parent in front of the priv drop. So it shall work now in all cases. See code comments in commit for more details. - If forking, the parent now waits for a maximum of 60 seconds for termination by the child - improved debugging support in forked (auto-backgrounding) mode The rsyslog debug log file is now continued to be written across the fork.
* | Fix trailing '-' in kernel messages.Milan Bartos2013-03-181-0/+4
| | | | | | | | modified: plugins/imkmsg/kmsg.c
* | prepare for 7.3.8 releaseRainer Gerhards2013-03-182-2/+2
| |
* | bugfix: mmanon did not build on some platforms (e.g. Ubuntu)Rainer Gerhards2013-03-182-1/+3
| |
* | bugfix: segfault in expression optimizerRainer Gerhards2013-03-152-4/+6
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=423
* | imrelp: now supports listening to IPv4/v6 only instead of always bothRainer Gerhards2013-03-154-2/+6
| | | | | | | | | | build now requires librelp 1.0.2 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=378
* | doc: typo fixRainer Gerhards2013-03-151-1/+1
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-03-151-0/+4
|\|
| * bugfix: imuxsock was missing SysSock.ParseTrusted module parameterRainer Gerhards2013-03-153-6/+28
| | | | | | | | | | | | To use that functionality, legacy rsyslog.conf syntax had to be used. Also, the doc was missing information on the "ParseTrusted" set of config directives.
* | bugfix: imuxsock was missing SysSock.ParseTrusted module parameterRainer Gerhards2013-03-123-6/+28
| | | | | | | | | | | | use that functionality, legacy rsyslog.conf syntax had to be used. Also, the doc was missing information on the "ParseTrusted" set of config directives.
* | Merge branch 'v7-stable'Rainer Gerhards2013-03-135-6/+48
|\| | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * doc bugfix: rsyslog.conf man page had invalid file format infoRainer Gerhards2013-03-112-1/+5
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=418
| * preparing for 7.2.6 releasev7.2.6Rainer Gerhards2013-03-053-3/+3
| |
| * add bug tracker ID to ChangeLog bugfixRainer Gerhards2013-02-281-0/+1
| |
| * bugfix: include files got included in the wrong orderRainer Gerhards2013-02-283-3/+21
| | | | | | | | | | | | | | | | | | This happens if an $IncludeConfig directive was done on multiple files (e.g. the distro default of $IncludeConfig /etc/rsyslog.d/*.conf). In that case, the order of include file processing is reversed, which could lead to all sorts of problems. Thanks to Nathan Stratton Treadway for his great analysis of the problem, which made bug fixing really easy.
| * doc: give quick example of ruleset() {} useRainer Gerhards2013-01-291-0/+8
| |
| * doc: add link for set statementRainer Gerhards2013-01-281-1/+2
| |
* | prepare 7.3.7 releasev7.3.7Rainer Gerhards2013-03-123-3/+3
| |
* | Merge branch 'v6-stable'Rainer Gerhards2013-03-122-2/+2
|\ \
| * \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-125-3/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: action.c queue.c (some code moved from action.c --> queue.c)
| | * | bugfix: divide action queue discard mark by 10 - was out of rangeTomas Heinrich2013-03-121-2/+2
| | | |
* | | | mmanon: slight doc improvementRainer Gerhards2013-03-041-2/+2
| | | |
* | | | mmanon: complete ipv4 functionalityRainer Gerhards2013-03-045-44/+159
| | | |
* | | | mmanon: add ability to specify number of bits to be anonymizedRainer Gerhards2013-03-043-23/+107
| | | |
* | | | mmanon: add capability to configure replacement characterRainer Gerhards2013-03-033-15/+53
| | | |
* | | | add initial version of mmanon (anonymoization support)Rainer Gerhards2013-02-288-5/+325
| | | |
* | | | omjournal: add more syslog fields in journal callRainer Gerhards2013-02-271-0/+5
| | | |
* | | | bugfix: imuxsock segfault when system log socket was usedRainer Gerhards2013-02-272-4/+11
| | | |
* | | | Merge branch 'master' into master-omjournalRainer Gerhards2013-02-275-1/+67
|\ \ \ \
| * | | | added ability to configure debug system via rsyslog.confRainer Gerhards2013-02-275-1/+67
| | | | |
* | | | | doc: fix small but important typoRainer Gerhards2013-02-261-1/+1
| | | | |
* | | | | imuxsock: made config settings for IgnoreOwnMsgs actually working ;)Rainer Gerhards2013-02-261-5/+9
| | | | |
* | | | | imuxsock: add capability to ignore messages from ourselfesRainer Gerhards2013-02-267-8/+48
| | | | | | | | | | | | | | | | | | | | | | | | | This helps prevent message routing loops, and is vital to have if omjournal is used together with traditional syslog.
* | | | | add support for writing to the Linux Journal (omjournal)Rainer Gerhards2013-02-269-2/+294
|/ / / /