summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* fixed compile problem from epoll_create patchRainer Gerhards2011-03-141-1/+1
|
* Fall back to epoll_create() if epoll_create1() is not availableMichael Biebl2011-03-142-10/+16
| | | | | | | | | epoll_create1() was introduced in Linux kernel 2.6.27. If rsyslog was compiled on a newer kernel but run on a kernel older than 2.6.27, remote syslog fails. Apply a runtime check for epoll_create1() and fall back to epoll_create() in this case. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617996
* bugfix: minor memory leak in omlibdbi (< 1k per instance and run)Rainer Gerhards2011-03-101-1/+8
| | | | | also testbench improvement (omlibdbi now also receives a couple of tests if we have a life MySQL server).
* bugfix: pmaixforwarded from fails to buildMichael Biebl2011-03-101-0/+1
| | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-03-091-1/+1
|\
| * Merge branch 'v4-stable' into tmpRainer Gerhards2011-03-091-1/+1
| |\
| | * bugfix: omlibdbi did not use password from rsyslog.conRainer Gerhards2011-03-091-1/+1
| | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203
* | | bugfix: (regression) omhdfs did no longer compileRainer Gerhards2011-03-091-0/+1
| | |
* | | forgot to backport imdiag mem leak fix -- now doneRainer Gerhards2011-03-061-0/+4
| | |
* | | fixed small regression from gnutls fd leak fixRainer Gerhards2011-03-063-0/+3
| | |
* | | Merge branch 'v5-beta-gtls-fix' into v5-betaRainer Gerhards2011-03-0631-0/+31
|\ \ \
| * | | added work-around for bug in gtls, which causes fd leak when using TLSBojan Smojver2011-02-2331-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | fixed compile problems on SolarisRainer Gerhards2011-02-231-0/+4
|/ / /
* | | the last fix introduced another regression, fixed nowRainer Gerhards2011-02-221-5/+8
| | | | | | | | | | | | | | | The previous fix left variable lenMsg in an inconsistent state when sanitization actually happend. This could lead to message truncation.
* | | bugfix: imuxsock does not sanitization at all (regression)Rainer Gerhards2011-02-221-4/+5
| | | | | | | | | | | | | | | This also causes problems when NUL characters are present inside the message (as is the case with spamd).
* | | fixed dumb but important typo in code...Rainer Gerhards2011-02-211-1/+1
| | | | | | | | | | | | thanks to Michael Biebl for alterting me
* | | bugfix: imuxsock did no longer remove trailing LFRainer Gerhards2011-02-211-0/+4
| | | | | | | | | | | | | | | | | | | | | This was a regression from the imuxsock partial rewrite. Happened because the message is no longer run through the standard parsers. Now imuxsock does this sanitization itself. bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=224
* | | enhance: imfile did not yet support multiple rulesets, now addedRainer Gerhards2011-02-181-0/+34
| | | | | | | | | | | | | | | | | | we do this directly in the beta because a) it does not affect existing functionality and b) one may argue that this missing functionality is close to a bug.
* | | bugfix: very long running actions could prevent shutdown under some ↵Rainer Gerhards2011-02-111-3/+3
| | | | | | | | | | | | | | | | | | circumstances This has now been solved, at least for common situations.
* | | fixed some compile issues in recent systemd patchRainer Gerhards2011-02-111-2/+2
| | |
* | | Improved systemd socket activation supportMarius Tomaschewski2011-02-111-44/+45
| | | | | | | | | | | | | | | | | | Support for multiple unix sockets and activation in forking mode Signed-off-by: Marius Tomaschewski <mt@suse.de>
* | | bugfix in pmsnareDavid Lang2011-02-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | when removing text from the message, decrement the length when you increment the pointer through the message. there were a number of places where this was missed. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | enhanced imfile to support non-cancel input terminationRainer Gerhards2011-02-101-6/+16
| | |
* | | pmcisconames: bugfix for short timestampsDavid Lang2011-02-101-4/+23
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | added pmsnare parser moduleDavid Lang2011-02-082-0/+241
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | added pmaixforwardedfrom message parserDavid Lang2011-02-012-0/+175
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | added $OMMySQLConfigFile/$OMMySQLConfigSection config directivesAriel P2011-01-311-0/+39
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v5-devel-david-imfile' into v5-develRainer Gerhards2011-01-261-1/+7
|\ \ \
| * | | enhanced imfile to support multi-line messagesDavid Lang2011-01-251-1/+7
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | pmciscomsg: fixed some problemsDavid Lang2011-01-251-4/+9
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | added pmcisconames (uncompiled & untested)David Lang2011-01-132-0/+161
|/ / / | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v5.6.2-newimudp' into v5-devel-newimudpRainer Gerhards2011-01-102-2/+137
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imudp/imudp.c threads.c
| * | | improved imudp real-time scheduling support & bugfixDražen Kačar2011-01-102-1/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The original code had quite some issues, which are fixed by this commit. Also we do more error checking now. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | Merge branch 'v4-devel' into v5-devel-newimudpRainer Gerhards2011-01-101-42/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imudp/imudp.c
| * | | | imudp: removing new scheduling priority setting codeRainer Gerhards2011-01-101-42/+0
| | | | | | | | | | | | | | | | | | | | | | | | | as it had too many implications. This will now be part of v5 only.
| * | | | added support for systems without epoll_create1()Rainer Gerhards2010-12-171-1/+19
| | | | |
* | | | | Merge branch 'v4-devel' into v5-develRainer Gerhards2010-12-172-4/+56
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html doc/manual.html plugins/imudp/imudp.c runtime/msg.h tools/syslogd.c
| * | | | added $IMUDPSchedulingPolicy and $IMUDPSchedulingPriority config settingsRainer Gerhards2010-12-171-0/+42
| | | | |
| * | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-12-161-3/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: runtime/parser.c
| * | | | Fix a potential missing '\0' on too long strings.Luis Fernando Muñoz Mejías2010-11-301-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By implementing a trivial strlcpy it's much easier to detect string truncations and react to them. This also gives a noticeable speedup in buffer handling (can be HUGE), since strlcpy() doesn't clear all the buffer entry before writing data. Converted all uses of strncpy() into strlcpy(). Also, we don't need to check for some null pointers, as there are no malloc-like operations in the doAction loop.
* | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2010-12-172-3/+3
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-12-161-3/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-161-3/+1
| | | | |
| * | | | bugfix: unitialized variable could cause issues under extreme conditionsRainer Gerhards2010-12-161-0/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | plus some minor nits. This was found after a clang static code analyzer analysis (great tool, and special thanks to Marcin for telling me about it!)
* | | | Merge branch 'v5-beta' into v5-develRainer Gerhards2010-11-252-1/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html plugins/imfile/imfile.c runtime/rsyslog.h
| * | | streamlined epoll_create() code a little bitRainer Gerhards2010-11-251-2/+5
| | | |
| * | | fixed compile problem in imptcp if no epoll_create1() is presentDavid Hill2010-11-251-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | Merge branch 'v5.6.0a' into v5-stableRainer Gerhards2010-11-251-3/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| | * | | imfile improvementsRainer Gerhards2010-10-271-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added the $InputFilePersistStateInterval config directive to imfile - changed imfile so that the state file is never deleted (makes imfile more robust in regard to fatal failures)
| * | | | provide clear error message if platform does not support imptcpRainer Gerhards2010-11-051-0/+7
| | | | |