Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-03-18 | 5 | -18/+51 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/debug.h tools/syslogd.c | |||||
| * | | | | doc: mention last patches in ChangeLog | Rainer Gerhards | 2013-03-18 | 1 | -6/+8 | |
| | | | | | ||||||
| * | | | | Do not exit when messages get overwritten in the circular buffer | Milan Bartos | 2013-03-18 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | modified: plugins/imkmsg/kmsg.c | |||||
| * | | | | Fix message read buffer size | Milan Bartos | 2013-03-18 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | modified: plugins/imkmsg/kmsg.c | |||||
| * | | | | Remove unnecessary strlen() call | Milan Bartos | 2013-03-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | modified: plugins/imkmsg/kmsg.c | |||||
| * | | | | Fix trailing '-' in kernel messages. | Milan Bartos | 2013-03-18 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | modified: plugins/imkmsg/kmsg.c | |||||
| * | | | | debug system improvement & bug fix for init system status (see below) | Rainer Gerhards | 2013-03-15 | 4 | -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 Bartos | 2013-03-18 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | modified: plugins/imkmsg/kmsg.c | |||||
* | | | | | prepare for 7.3.8 release | Rainer Gerhards | 2013-03-18 | 2 | -2/+2 | |
| | | | | | ||||||
* | | | | | bugfix: mmanon did not build on some platforms (e.g. Ubuntu) | Rainer Gerhards | 2013-03-18 | 2 | -1/+3 | |
| | | | | | ||||||
* | | | | | bugfix: segfault in expression optimizer | Rainer Gerhards | 2013-03-15 | 2 | -4/+6 | |
| | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=423 | |||||
* | | | | | imrelp: now supports listening to IPv4/v6 only instead of always both | Rainer Gerhards | 2013-03-15 | 4 | -2/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | build now requires librelp 1.0.2 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=378 | |||||
* | | | | | doc: typo fix | Rainer Gerhards | 2013-03-15 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-03-15 | 1 | -0/+4 | |
|\| | | | | ||||||
| * | | | | bugfix: imuxsock was missing SysSock.ParseTrusted module parameter | Rainer Gerhards | 2013-03-15 | 3 | -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 parameter | Rainer Gerhards | 2013-03-12 | 3 | -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 Gerhards | 2013-03-13 | 5 | -6/+48 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | |||||
| * | | | | doc bugfix: rsyslog.conf man page had invalid file format info | Rainer Gerhards | 2013-03-11 | 2 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=418 | |||||
| * | | | | preparing for 7.2.6 releasev7.2.6 | Rainer Gerhards | 2013-03-05 | 3 | -3/+3 | |
| | | | | | ||||||
| * | | | | add bug tracker ID to ChangeLog bugfix | Rainer Gerhards | 2013-02-28 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | bugfix: include files got included in the wrong order | Rainer Gerhards | 2013-02-28 | 3 | -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() {} use | Rainer Gerhards | 2013-01-29 | 1 | -0/+8 | |
| | | | | | ||||||
| * | | | | doc: add link for set statement | Rainer Gerhards | 2013-01-28 | 1 | -1/+2 | |
| | | | | | ||||||
* | | | | | prepare 7.3.7 releasev7.3.7 | Rainer Gerhards | 2013-03-12 | 3 | -3/+3 | |
| | | | | | ||||||
* | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2013-03-12 | 2 | -2/+2 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2013-03-12 | 5 | -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 range | Tomas Heinrich | 2013-03-12 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | mmanon: slight doc improvement | Rainer Gerhards | 2013-03-04 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | mmanon: complete ipv4 functionality | Rainer Gerhards | 2013-03-04 | 5 | -44/+159 | |
| | | | | | ||||||
* | | | | | mmanon: add ability to specify number of bits to be anonymized | Rainer Gerhards | 2013-03-04 | 3 | -23/+107 | |
| | | | | | ||||||
* | | | | | mmanon: add capability to configure replacement character | Rainer Gerhards | 2013-03-03 | 3 | -15/+53 | |
| | | | | | ||||||
* | | | | | add initial version of mmanon (anonymoization support) | Rainer Gerhards | 2013-02-28 | 8 | -5/+325 | |
| | | | | | ||||||
* | | | | | omjournal: add more syslog fields in journal call | Rainer Gerhards | 2013-02-27 | 1 | -0/+5 | |
| | | | | | ||||||
* | | | | | bugfix: imuxsock segfault when system log socket was used | Rainer Gerhards | 2013-02-27 | 2 | -4/+11 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into master-omjournal | Rainer Gerhards | 2013-02-27 | 5 | -1/+67 | |
|\ \ \ \ \ | ||||||
| * | | | | | added ability to configure debug system via rsyslog.conf | Rainer Gerhards | 2013-02-27 | 5 | -1/+67 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | doc: fix small but important typo | Rainer Gerhards | 2013-02-26 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | imuxsock: made config settings for IgnoreOwnMsgs actually working ;) | Rainer Gerhards | 2013-02-26 | 1 | -5/+9 | |
| | | | | | ||||||
* | | | | | imuxsock: add capability to ignore messages from ourselfes | Rainer Gerhards | 2013-02-26 | 7 | -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 Gerhards | 2013-02-26 | 9 | -2/+294 | |
|/ / / / | ||||||
* | | | | minor: set proper permissions for queue recovery helper script | Rainer Gerhards | 2013-02-18 | 1 | -0/+0 | |
| | | | | ||||||
* | | | | doc: improved normalization sample conf | Rainer Gerhards | 2013-02-10 | 1 | -24/+59 | |
| | | | | ||||||
* | | | | field() function now supports a string as field delimiter | Rainer Gerhards | 2013-02-10 | 3 | -9/+73 | |
| | | | | | | | | | | | | | | | | | | | | also done a bugfix: field() function did never return "***FIELD NOT FOUND***" instead it returned "***ERROR in field() FUNCTION***" in that case | |||||
* | | | | doc: add sample config file | Rainer Gerhards | 2013-02-08 | 1 | -0/+152 | |
| | | | | ||||||
* | | | | bugfix: script == comparison did not work properly on JSON objects | Rainer Gerhards | 2013-02-08 | 2 | -0/+24 | |
| | | | | ||||||
* | | | | bugfix: mmjsonparse segfault if new-style config was used | Rainer Gerhards | 2013-01-30 | 2 | -11/+14 | |
| | | | | ||||||
* | | | | prepare for 7.3.6v7.3.6 | Rainer Gerhards | 2013-01-28 | 4 | -15/+19 | |
| | | | | ||||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-01-28 | 12 | -300/+122 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | doc: some improvements and more cleanup | Rainer Gerhards | 2013-01-28 | 9 | -297/+119 | |
| | | | | ||||||
| * | | | doc: some cleanup | Rainer Gerhards | 2013-01-28 | 3 | -3/+3 | |
| | | | |