summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v3-stable' into betaRainer Gerhards2009-05-291-0/+3
|\ | | | | | | | | Conflicts: ChangeLog
| * fixed problem in syslog-protocol (now RFC5424) parserRainer Gerhards2009-05-291-0/+3
| | | | | | | | ... as well as some other minor issues.
* | Merge branch 'v3-stable' into betaRainer Gerhards2009-05-281-1/+1
|\| | | | | | | | | Conflicts: tests/Makefile.am
| * bugfix: potential segfault issue when multiple $UDPServerRun directives are ↵Rainer Gerhards2009-05-121-1/+1
| | | | | | | | | | | | specified. Thanks to Michael Biebl for helping to debug this one.
* | bugfix: compile problems in im3195Rainer Gerhards2009-04-231-1/+2
| |
* | Merge branch 'beta'Rainer Gerhards2009-04-171-9/+41
|\|
| * Merge branch 'v3-stable' into betaRainer Gerhards2009-04-171-9/+41
| |\
| | * Merge branch 'debian_lenny' into v3-stableRainer Gerhards2009-04-171-9/+41
| | |\
| | | * Merge branch 'v2-stable' into debian_lennyRainer Gerhards2009-04-171-9/+41
| | | |\
| | | | * bugfix: ompgsql did not detect problems in sql command executionRainer Gerhards2009-04-171-9/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this could cause loss of messages. The handling was correct if the connection broke, but not if there was a problem with statement execution. The most probable case for such a case would be invalid sql inside the template, and this is now much easier to diagnose.
| | | * | Merge branch 'v2-stable' into debian_lennyRainer Gerhards2008-12-181-2/+2
| | | |\|
| | | * | backport of $AllowedSender security fixv3.18.6Rainer Gerhards2008-12-083-22/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - security bugfix: $AllowedSender was not honored, all senders were permitted instead (see http://www.rsyslog.com/Article322.phtml) (backport from v3-stable, v3.20.9) - minor bugfix: dual close() call on tcp session closure
* | | | | Merge branch 'beta'Rainer Gerhards2009-04-091-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tcpsrv.c tcpsrv.h Note: we have a slight inconsistency, as interface version v4 was already used for tcpsrv in this branch. We accept this inconsistency.
| * | | | Merge branch 'v3-stable' into betaRainer Gerhards2009-04-091-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | bugfix: $InputTCPMaxSessions config directive was accepted, but not honoredRainer Gerhards2009-04-091-0/+1
| | | | | | | | | | | | | | | | | | | | This resulted in a fixed upper limit of 200 connections.
* | | | | improved test suite and added test for new output module interfaceRainer Gerhards2009-04-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The testbench has now a generic driver that can run a whole class of test suites just by providing a config file and test cases. This does not cover all testing needs, but a lot. We have now added one test for the new array-passing output plugin interface.
* | | | | added a new way how output plugins may be passed parameters.Rainer Gerhards2009-04-031-2/+78
| | | | | | | | | | | | | | | | | | | | | | | | | This is more efficient for some outputs. They new can receive fields not only as a single string but rather in an array where each string is seperated.
* | | | | added O_CLOEXEC to open() callsRainer Gerhards2009-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to make sure only the minimum number of file handles is left open during a exec call. This is not a 100% solution, as there are also some fopen() calls and, more importantly, file descriptors opened by libraries. But it is better than nothing (and it was quick, at least until we run into platform hell, what we will for sure ;)).
* | | | | begining touches for putting rsyslog on spaceshipsRainer Gerhards2009-04-012-0/+138
| | | | |
* | | | | improved testing supportRainer Gerhards2009-03-192-0/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worked on ways to provide a better test suite: - added -T rsyslogd command line option, enables to specify a directory where to chroot() into on startup. This is NOT a security feature but introduced to support testing. Thus, -T does not make sure chroot() is used in a secure way. (may be removed later) - added omstdout module for testing purposes. Spits out all messages to stdout - no config option, no other features - modified $ModLoad statement so that for modules whom's name starts with a dot, no path is prepended (this enables relative-pathes and should not break any valid current config)
* | | | | fixed broken make distcheck due to invalidly stated omtemplate fileRainer Gerhards2009-03-191-1/+1
| | | | |
* | | | | added output module templateRainer Gerhards2009-03-162-0/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so far, this is mostly some documentation, but I hope that during the process of creating output modules out of it we will get good questions and thus can extend the template. In any case, it should be better than what we had so far...
* | | | | Merge branch 'beta'Rainer Gerhards2009-03-111-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/omrelp.html
| * | | | Merge branch 'v3-stable' into betaRainer Gerhards2009-03-111-1/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | fixed a potential segfault problem in gssapi codevarmojfekoj2009-03-021-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | bugfix: parser did not correctly parse fields in UDP-received messagesRainer Gerhards2009-03-101-1/+1
| | | | |
* | | | | Merge branch 'beta'Rainer Gerhards2009-02-2420-27/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html
| * | | | Improve mysql configure check (for unusual paths)Michael Biebl2009-02-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove AC_CHECK_HEADERS([mysql/mysql.h],...) as this was causing pain for users where the mysql headers are not installed in the system include directory. It was superfluous anyways, as we check for mysql_config and set the include path to the correct directory. Update ommysql.c to use #include <mysql.h>, as mysql_config will set the include path to /path/to/include/mysql/ so <mysql/mysql.h> would not work. Remove errmsg.h include as it is not used.
| * | | | make all cflags and libs variables uppercaseMichael Biebl2009-02-2419-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pkg-config uses uppercase for its _CFLAGS and _LIBS variable names. So we follow suit and convert all _cflags and _libs variables to uppercase for more consistency.
* | | | | enhanced imtcp, among others to handel invalid NetScreen framingRainer Gerhards2008-12-101-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added $InputTCPServerAddtlFrameDelimiter config directive, which enabeles to specify an additional, non-standard message delimiter for processing plain tcp syslog. This is primarily a fix for the invalid framing used in Juniper's NetScreen products. Credit to forum user Arv for suggesting this solution. - added $InputTCPServerInputName property, which enables a name to be specified that will be available during message processing in the inputname property. This is considered useful for logic that treats messages differently depending on which input received them.
* | | | | added $PreserveFQDN config file directiveRainer Gerhards2008-12-081-0/+1
| | | | | | | | | | | | | | | | | | | | Enables to use FQDNs in sender names where the legacy default
* | | | | bugfix: imudp went into an endless loop under some circumstancesRainer Gerhards2008-12-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | (but could also leave it under some other circumstances...) Thanks to David Lang and speedfox for reporting this issue.
* | | | | Merge branch 'beta'Rainer Gerhards2008-12-051-4/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imudp/imudp.c
| * | | | Merge branch 'v3-stable' into betav3.21.9Rainer Gerhards2008-12-041-2/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imudp/imudp.c
| | * | | security fix: imudp emitted a message when a non-permitted sender...v3.20.2Rainer Gerhards2008-12-041-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...tried to send a message to it. This behaviour is operator-configurable. If enabled, a message was emitted each time. That way an attacker could effectively fill the disk via this facility. The message is now emitted only once in a minute (this currently is a hard-coded limit, if someone comes up with a good reason to make it configurable, we will probably do that).
* | | | | Merge branch 'beta'Rainer Gerhards2008-12-043-20/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf.html plugins/imudp/imudp.c runtime/rsyslog.h
| * | | | Merge branch 'v3-stable' into betaRainer Gerhards2008-11-293-20/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| | * | | minor cleanupRainer Gerhards2008-11-292-1/+2
| | | | |
| | * | | security bugfix: $AllowedSender was not honored,Rainer Gerhards2008-11-293-20/+8
| | | | | | | | | | | | | | | | | | | | ...all senders were permitted instead
* | | | | Merge branch 'beta'Rainer Gerhards2008-11-263-3/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | bugfix: imklog did not compile on freeBSDRainer Gerhards2008-11-243-3/+15
| | | | |
* | | | | Merge branch 'beta'Rainer Gerhards2008-11-181-2/+2
|\| | | |
| * | | | Merge branch 'v3-stable' into betaRainer Gerhards2008-11-181-2/+2
| |\| | |
| | * | | Merge branch 'v2-stable' into v3-stableRainer Gerhards2008-11-181-2/+2
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | bugfix: removed memory leak in ompgsqlKen2008-11-181-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | | * | removed unneccessary (and non-existing) headerRainer Gerhards2008-01-021-1/+1
| | | | |
| | | * | backported rsyslog v3 omgssapi - to provide forward compatibility from v2Rainer Gerhards2007-12-283-0/+783
| | | | | | | | | | | | | | | | | | | | | | | | | to v3. Will release as v1.21.2, because some field experience is needed before it becomes stable v2.
| | | * | applied some more cleanup provided by Michael BieblRainer Gerhards2007-12-191-2/+2
| | | | |
| | | * | code cleanups thanks to Michael BieblRainer Gerhards2007-12-181-2/+2
| | | | |
* | | | | Merge branch 'master' into nextmasterRainer Gerhards2008-10-221-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac