Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable' into v5-devel | Andre Lorbach | 2011-08-05 | 1 | -7/+9 |
|\ | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-11 | 1 | -7/+9 |
| |\ | |||||
| | * | doc: updated rsyslog.conf man page with new syntaxes | Rainer Gerhards | 2011-07-11 | 1 | -7/+9 |
| | | | |||||
* | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-07-11 | 1 | -1/+16 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * | | added warning message for old-style outchannel syntax | Rainer Gerhards | 2011-07-11 | 1 | -1/+8 |
| | | | |||||
| * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-11 | 1 | -1/+9 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh | ||||
| | * | support for :omfile: forward compatibility directive | Rainer Gerhards | 2011-07-11 | 1 | -1/+9 |
| | | | |||||
* | | | issue a warning if old omusrmsg action syntax is used | Rainer Gerhards | 2011-07-06 | 1 | -2/+10 |
| | | | |||||
* | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-07-06 | 1 | -1/+3 |
|\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html | ||||
| * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-06 | 1 | -1/+3 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | added support for the ":omusrmsg:" syntax in configuring user messages | Rainer Gerhards | 2011-07-06 | 1 | -1/+3 |
| | | | |||||
* | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-06-16 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| * | | bugfix: problems in failover action handling | Rainer Gerhards | 2011-06-16 | 1 | -1/+1 |
| | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!) | ||||
| * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-05-09 | 1 | -2/+2 |
| |\| | |||||
* | | | bugfix: error state not correctly set for gone-away config directive | Rainer Gerhards | 2011-06-10 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'v4-devel' into v5-devel | Rainer Gerhards | 2011-05-09 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/parser.c tests/Makefile.am | ||||
| * \ \ | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-05-09 | 1 | -2/+2 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c | ||||
| | * | | bugfix: invalid storage type for config variables | Rainer Gerhards | 2011-05-09 | 1 | -1/+1 |
| | | | | |||||
| | * | | bugfix: stream driver mode was not correctly set on tcp ouput on big endian ↵ | Tomas Heinrich | 2011-05-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | systems. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-05-03 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | bugfix(minor): improper template function call in syslogd.c | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | bugfix: pipes not opened in full priv mode when privs are to be dropped | Rainer Gerhards | 2011-04-26 | 1 | -5/+13 |
| | | | | |||||
* | | | | bugfix: do not open files with full privileges, if privs will be dropped | Rainer Gerhards | 2011-04-26 | 1 | -36/+15 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | This make the privilege drop code more bulletproof, but breaks Ubuntu's work-around for log files created by external programs with the wrong user and/or group. Note that it was long said that this "functionality" would break once we go for serious privilege drop code, so hopefully nobody still depends on it (and, if so, they lost...). | ||||
* | | | bugfix: RFC5424 parser confused by empty structured data | Rainer Gerhards | 2011-03-22 | 1 | -2/+1 |
| | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=237 | ||||
* | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| * | | | fixed a regression of last patch and some cleanup | Rainer Gerhards | 2011-03-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-08 | 1 | -0/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tools/syslogd.c | ||||
| * | | | bugfix(kind of): tell users that config graph can currently not be generated | Rainer Gerhards | 2011-03-08 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232 | ||||
* | | | | Merge branch 'v5-beta-gtls-fix' into v5-beta | Rainer Gerhards | 2011-03-06 | 12 | -0/+12 |
|\ \ \ \ | |||||
| * | | | | added work-around for bug in gtls, which causes fd leak when using TLS | Bojan Smojver | 2011-02-23 | 12 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The capability has been added for module to specify that they do not like being unloaded. related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | | cosmetic: removing commented-out testing aid | Rainer Gerhards | 2011-02-25 | 1 | -1/+0 |
|/ / / / | |||||
* | | | | bugfix (minor): warning message suggested invalid compatibility mode | Rainer Gerhards | 2011-02-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | regression: fixed compile error with --enable-debug | Rainer Gerhards | 2011-02-21 | 1 | -1/+0 |
| | | | | |||||
* | | | | bugfix: fixed compile problem due to empty structs | Dražen Kačar | 2011-02-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | this occured only on some platforms/compilers. thanks to Dražen Kačar for the fix Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | cleanup: no longer parameter in iminternal system removed | Rainer Gerhards | 2011-02-16 | 3 | -10/+6 |
| | | | | |||||
* | | | | fixed some compile issues in recent systemd patch | Rainer Gerhards | 2011-02-11 | 1 | -1/+1 |
| | | | | |||||
* | | | | Improved systemd socket activation support | Marius Tomaschewski | 2011-02-11 | 1 | -3/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | Support for multiple unix sockets and activation in forking mode Signed-off-by: Marius Tomaschewski <mt@suse.de> | ||||
* | | | | Merge branch 'v4-devel' into v5-devel | Rainer Gerhards | 2010-12-17 | 1 | -3/+0 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html doc/manual.html plugins/imudp/imudp.c runtime/msg.h tools/syslogd.c | ||||
| * | | | added $LocalHostName config directive & some bugfixing | Rainer Gerhards | 2010-12-16 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | - added $LocalHostName config directive - bugfix: local hostname was pulled too-early, so that some config directives (namely FQDN settings) did not have any effect | ||||
| * | | | cleanup of cosmetic nit (result of clang static code analyser run) | Rainer Gerhards | 2010-12-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2010-12-16 | 5 | -8/+2 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: runtime/parser.c | ||||
| * | | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2010-10-19 | 2 | -1/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/cfsysline.c tools/ompipe.c | ||||
* | \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2010-12-17 | 5 | -7/+3 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2010-12-16 | 4 | -6/+2 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/parser.c runtime/queue.c runtime/wtp.c template.c threads.c tools/syslogd.c | ||||
| | * | | | some cleanup based on clang static analyzer results | Rainer Gerhards | 2010-12-16 | 4 | -6/+0 |
| | | | | | |||||
| | * | | | typo fix (thanks to Björn Påhlsson for finding it!) | Michael Biebl | 2010-11-30 | 1 | -2/+2 |
| | | |/ | | |/| | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | fixed cosmetic nit (as a result of clang static code analyzer run) | Rainer Gerhards | 2010-12-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | bugfix: one type of 64bit atomics was enabled when 32bit atomics were supported | Rainer Gerhards | 2010-12-02 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | also cleaned up some minor things | ||||
* | | | | Merge branch 'v5-beta' into v5-devel | Rainer Gerhards | 2010-11-25 | 1 | -1/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html plugins/imfile/imfile.c runtime/rsyslog.h | ||||
| * | | | bugfix: replacements for atomic operations for non-int sized types had problems. | Rainer Gerhards | 2010-11-25 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | At least one instance of that problem could potentially lead to abort (inside omfile). |