summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-051-7/+9
|\ | | | | | | | | | | Conflicts: ChangeLog
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-111-7/+9
| |\
| | * doc: updated rsyslog.conf man page with new syntaxesRainer Gerhards2011-07-111-7/+9
| | |
* | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-07-111-1/+16
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| * | added warning message for old-style outchannel syntaxRainer Gerhards2011-07-111-1/+8
| | |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-111-1/+9
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh
| | * support for :omfile: forward compatibility directiveRainer Gerhards2011-07-111-1/+9
| | |
* | | issue a warning if old omusrmsg action syntax is usedRainer Gerhards2011-07-061-2/+10
| | |
* | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-07-061-1/+3
|\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-061-1/+3
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * added support for the ":omusrmsg:" syntax in configuring user messagesRainer Gerhards2011-07-061-1/+3
| | |
* | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-161-1/+1
|\| | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| * | bugfix: problems in failover action handlingRainer Gerhards2011-06-161-1/+1
| | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!)
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-091-2/+2
| |\|
* | | bugfix: error state not correctly set for gone-away config directiveRainer Gerhards2011-06-101-0/+1
| | |
* | | Merge branch 'v4-devel' into v5-develRainer Gerhards2011-05-091-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/parser.c tests/Makefile.am
| * \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-091-2/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
| | * | bugfix: invalid storage type for config variablesRainer Gerhards2011-05-091-1/+1
| | | |
| | * | bugfix: stream driver mode was not correctly set on tcp ouput on big endian ↵Tomas Heinrich2011-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | systems. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-05-031-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | bugfix(minor): improper template function call in syslogd.cRainer Gerhards2011-04-191-1/+1
| | | |
* | | | bugfix: pipes not opened in full priv mode when privs are to be droppedRainer Gerhards2011-04-261-5/+13
| | | |
* | | | bugfix: do not open files with full privileges, if privs will be droppedRainer Gerhards2011-04-261-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 dataRainer Gerhards2011-03-221-2/+1
| | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=237
* | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-03-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| * | | fixed a regression of last patch and some cleanupRainer Gerhards2011-03-161-1/+1
| | | |
* | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-03-081-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tools/syslogd.c
| * | | bugfix(kind of): tell users that config graph can currently not be generatedRainer Gerhards2011-03-081-0/+5
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232
* | | | Merge branch 'v5-beta-gtls-fix' into v5-betaRainer Gerhards2011-03-0612-0/+12
|\ \ \ \
| * | | | added work-around for bug in gtls, which causes fd leak when using TLSBojan Smojver2011-02-2312-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 aidRainer Gerhards2011-02-251-1/+0
|/ / / /
* | | | bugfix (minor): warning message suggested invalid compatibility modeRainer Gerhards2011-02-221-1/+1
| | | |
* | | | regression: fixed compile error with --enable-debugRainer Gerhards2011-02-211-1/+0
| | | |
* | | | bugfix: fixed compile problem due to empty structsDražen Kačar2011-02-161-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 removedRainer Gerhards2011-02-163-10/+6
| | | |
* | | | fixed some compile issues in recent systemd patchRainer Gerhards2011-02-111-1/+1
| | | |
* | | | Improved systemd socket activation supportMarius Tomaschewski2011-02-111-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-develRainer Gerhards2010-12-171-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 bugfixingRainer Gerhards2010-12-161-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 Gerhards2010-12-161-1/+1
| | | |
| * | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-12-165-8/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: runtime/parser.c
| * | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-10-192-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/cfsysline.c tools/ompipe.c
* | \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2010-12-175-7/+3
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-12-164-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 resultsRainer Gerhards2010-12-164-6/+0
| | | | |
| | * | | typo fix (thanks to Björn Påhlsson for finding it!)Michael Biebl2010-11-301-2/+2
| | | |/ | | |/| | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | fixed cosmetic nit (as a result of clang static code analyzer run)Rainer Gerhards2010-12-161-1/+1
| | | |
* | | | bugfix: one type of 64bit atomics was enabled when 32bit atomics were supportedRainer Gerhards2010-12-021-7/+7
| | | | | | | | | | | | | | | | also cleaned up some minor things
* | | | Merge branch 'v5-beta' into v5-develRainer Gerhards2010-11-251-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 Gerhards2010-11-251-1/+5
| | | | | | | | | | | | | | | | | | | | At least one instance of that problem could potentially lead to abort (inside omfile).