summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* regression fix: config validation code affected by recent changesRainer Gerhards2011-05-301-0/+4
| | | | did not return with proper return value
* Merge branch 'beta'Rainer Gerhards2011-05-211-3/+2
|\ | | | | | | | | | | Conflicts: ChangeLog plugins/imrelp/imrelp.c
| * Merge branch 'v5-stable' into betaRainer Gerhards2011-05-092-4/+3
| |\ | | | | | | | | | | | | Conflicts: tools/omfwd.c
| | * 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
| | | |
* | | | merge fix: made mistake when merging in v5-devel changes, now fixingRainer Gerhards2011-04-272-18/+1
| | | |
* | | | step: moved main message queue activation to after priv dropRainer Gerhards2011-04-271-12/+1
| | | |
* | | | step: config-specific module list used during config processingRainer Gerhards2011-04-271-1/+1
| | | |
* | | | step: shuffled module-related code from syslogd.c to rsconf.cRainer Gerhards2011-04-271-217/+52
| | | | | | | | | | | | | | | | ... plus some minor cleanup/code shuffle
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-04-262-29/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tools/omfile.c
| * | | | 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...).
* | | | step: outchannel list integrated into main config objectRainer Gerhards2011-04-261-41/+20
| | | |
* | | | step: moved config validation codeRainer Gerhards2011-04-261-20/+0
| | | |
* | | | shuffled even more config code from syslgod to config handlerRainer Gerhards2011-04-261-166/+1
| | | |
* | | | step: config handler setting from syslogd.c moved to rsconf.cRainer Gerhards2011-04-211-351/+41
| | | |
* | | | step: begun to create a "load" interface in rsconfRainer Gerhards2011-04-211-19/+23
| | | |
* | | | step: slowly migrating config settings... ;)Rainer Gerhards2011-04-191-54/+25
| | | |
* | | | some more work was required on the ruleset modificationRainer Gerhards2011-04-191-1/+1
| | | |
* | | | milestone: ruleset now supports rsconf_tRainer Gerhards2011-04-191-11/+11
| | | |
* | | | milestone: conf obj interface now utilzes rsconf_tRainer Gerhards2011-04-191-13/+51
| | | |
* | | | milestone: templates are now in config objectRainer Gerhards2011-04-191-14/+24
| | | |
* | | | renaming conf.* wasn't a good idea -- undoingRainer Gerhards2011-04-1912-12/+12
| | | | | | | | | | | | | | | | | | | | too many dependencies, things get cluttered (and merging probably gets problematic). Now new config will be "conf2".
* | | | renamed conf.c to legacyconf.c to make room for new config systemRainer Gerhards2011-04-1912-12/+12
| |/ / |/| |
* | | omfwd: made send function handling incomplete sends correctlyRainer Gerhards2011-04-041-12/+7
| | |
* | | added one more testcase for sending TCP/TLS syslogRainer Gerhards2011-04-041-0/+4
| | |
* | | omfwd: speeded up tcp forwarding by reducing number of API callsRainer Gerhards2011-04-041-11/+66
| | |
* | | Merge branch 'v5-devel'Rainer Gerhards2011-03-312-3/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c
| * | 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-beta'Rainer Gerhards2011-03-1113-0/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh
| * | | 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>
* | | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-252-3/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | 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
| | | |
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-183-10/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c
| * | | 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
| | | |
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-111-3/+36
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | 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 'v5-devel'Rainer Gerhards2010-12-175-17/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c
| * | | 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