summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | 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
| |
* | 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: 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>
* | bugfix(minor): improper template function call in syslogd.cRainer Gerhards2011-04-191-1/+1
| |
* | 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).
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2010-10-222-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-10-192-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac runtime/cfsysline.c tools/ompipe.c
| | * | fixing some compile problems on FreeBSDRainer Gerhards2010-10-192-1/+2
| | | |
| * | | Merge branch 'v4-devel' into v5-betaRainer Gerhards2010-10-151-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: Makefile.am tests/tcpflood.c
* | | | removed need for math libraryRainer Gerhards2010-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | by doing math a little bit more optimal in hash table code. Also reduced memory requirement for imuxsock hash tables (expected number of connections was set too high -- table can be extended dynamically).
* | | | imuxsock: changed to per-pid ratelimitingRainer Gerhards2010-09-281-1/+1
| | | |
* | | | minor: improved error message when already runningRainer Gerhards2010-09-171-4/+3
| | | |
* | | | Merge branch 'systemd' into v5-develRainer Gerhards2010-09-082-30/+33
|\ \ \ \
| * | | | acquire /dev/log socket optionally from systemdLennart Poettering2010-09-072-30/+33
| | | | |
* | | | | Merge branch 'v4-devel' into masterRainer Gerhards2010-08-111-1/+1
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | | | | Conflicts: Makefile.am tests/tcpflood.c
| * | | Merge branch 'v4-stable-imptcp' into tmpRainer Gerhards2010-08-111-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am configure.ac runtime/rsyslog.h tests/Makefile.am
| | * | | added imptcpRainer Gerhards2010-08-101-1/+1
| | | |/ | | |/| | | | | | | | | | | | | imptcp is a simplified, Linux-specific and potentielly fast syslog plain tcp input plugin (NOT supporting TLS!)
* | | | changed omudpspoof default spoof address to simplify typical use caseRainer Gerhards2010-08-051-0/+3
| |_|/ |/| |