summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* minor: disable debug support in complex1.sh testRainer Gerhards2012-10-021-2/+2
|
* cleanupRainer Gerhards2012-10-021-1/+1
|
* bugfix: fixed wrong bufferlength for snprintf in tcpflood.cAndre Lorbach2012-09-283-3/+5
| | | | | The problem occured when using the -f (dynafiles) option, and caused some tests to fail.
* enable DNS resolution in imrelpApollon Oikonomopoulos2012-09-262-0/+9
|
* Debug logging slightly improvedRainer Gerhards2012-09-141-1/+1
|
* bugfix: invalid property name in property-filter could cause abortRainer Gerhards2012-09-132-56/+67
| | | | | | ...if action chaining (& operator) was used http://bugzilla.adiscon.com/show_bug.cgi?id=355 Thanks to pilou@gmx.com for the bug report
* remove unused variables (if SCM_CREDENTIALS is not available)Cristian Ionescu-Idbohrn2012-09-122-1/+9
|
* imuxsock: remove incorrect socket option callCristian Ionescu-Idbohrn2012-09-121-4/+0
| | | | | | | | | | | | | | | | SCM_CREDENTIALS is not a socket option; its value is usually 0x2 which on most archs corresponds to socket option SO_REUSEADDR, but on mips-arch there is no socket option with value 0x2 and SO_REUSEADDR = 0x4, so the call will fail with ENOPROTOOPT 'Protocol not available'; skip it. There does not seem any other special setsockopt call is needed anyway, besides the above. In addition Jonny Törnbom commented: SCM_CREDENTIALS is a control message type, not a socket option, so using setsockopt(...SCM_CREDENTIALS...) is potentially dangerous and wrong and should be deleted from the code. (SCM_CREDENTIALS is used in conjuction with SO_PASSCRED which is the socket option to use.)
* fix compile problem on FreeBSDBrad Davis2012-09-111-3/+1
|
* Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableRainer Gerhards2012-08-253-30/+48
|\ | | | | | | | | Conflicts: template.c
| * change template.[ch] to ASL 2.0, removing a GPLv3-only patchRainer Gerhards2012-08-253-30/+48
| | | | | | | | | | see template.c file header for details Note that this functionality was almost never used in practice
* | preparing for 5.10.0 releasev5.10.0Rainer Gerhards2012-08-224-4/+11
| |
* | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-221-2/+6
|\| | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * preparing for 5.8.13 releasev5.8.13Rainer Gerhards2012-08-223-3/+3
| |
| * nit: forward-compatible default ruleset name as used in next versionRainer Gerhards2012-08-221-1/+1
| |
* | small bugfix: stream timeout API use was incorrectRainer Gerhards2012-08-221-2/+2
| | | | | | | | Thanks to Andre Lorbach for mentioning this.
* | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-226-18/+119
|\| | | | | | | | | Conflicts: runtime/ruleset.c
| * bugfix: multiple main queues with same queue file name were not detectedRainer Gerhards2012-08-223-3/+48
| | | | | | | | | | | | This lead to queue file corruption. While the root cause is a config error, it is a bug that this important and hard to find config error was not detected by rsyslog.
| * nitfix: remove quirck in new debug message codeRainer Gerhards2012-08-011-4/+2
| |
| * more elaborate debug logging for object deserializerRainer Gerhards2012-08-011-0/+39
| |
| * undo last queue patch - caused a regressionRainer Gerhards2012-08-012-5/+1
| | | | | | | | some more elaborate patch is needed and will be provided
| * bugfix: potential abort if output plugin logged message during shutdownRainer Gerhards2012-08-012-7/+28
| | | | | | | | | | | | | | note that none of the rsyslog-provided plugins does this Thanks to bodik and Rohit Prasad for alerting us on this bug and analyzing it. fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=347
| * bugfix: DA queue fixed handling of bad queue files.Andre Lorbach2012-07-312-1/+5
| |
| * bugfix: strm class could abort under some circumstancesRainer Gerhards2012-07-241-6/+4
| | | | | | | | | | ... it could pass a NULL pointer to unlink. Depending on OS implementation, this could (or could not...) lead to a segfault.
| * bugfix: DA queue could cause abortRainer Gerhards2012-07-242-3/+6
| | | | | | | | | | ...due to invalid mutex synchronisation in DA worker. In case of idle queue, mutex was incorrectly locked.
* | changed TRUE/FALSE to RSTRUE/RSFALSERainer Gerhards2012-08-2214-46/+45
| | | | | | | | This is done to prevent name claches with libraries.
* | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-154-13/+10
|\|
| * bugfix: randomized IP option header in omudpspoof caused problemsRainer Gerhards2012-06-152-13/+5
| | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=327 Thanks to Rick Brown for helping to test out the patch.
| * adding pkgconfigdir definition to Makefile.am to help build properlyAbby Edwards2012-06-131-0/+2
| |
| * bugfix "$PreserveFQDN on" was not honored in some modulesRainer Gerhards2012-06-122-0/+3
| | | | | | | | | | Thanks to bodik for reporting this bug. ---------------------------------------------
* | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-113-5/+15
|\| | | | | | | | | Conflicts: ChangeLog
| * bugfix: "last message repeated n times" message was missing hostnameRainer Gerhards2012-06-113-5/+13
| | | | | | | | Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting
* | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-067-34/+62
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/modules.c
| * preparing for 5.8.12v5.8.12Rainer Gerhards2012-06-063-3/+3
| |
| * bugfix: property PROCID was empty instead of proper nilvalue if not presentRainer Gerhards2012-06-062-1/+5
| | | | | | | | | | | | If it is not present, it must have the nilvalue "-" as of RFC5424 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=332 Thanks to John N for reporting this issue.
| * bugfix: potential hang due to mutex deadlockRainer Gerhards2012-06-064-33/+18
| | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=316 Thanks to Andreas Piesk for reporting&analyzing this bug as well as providing patches and other help in resolving it.
| * fixing memleak in recent group resolve patchRainer Gerhards2012-06-062-3/+9
| | | | | | | | also added some error checking
| * call getgrnam_r repeatedly to get all group members.Alec Warner2012-06-061-3/+12
| |
| * add small delay (50ms) after sending shutdown messageRainer Gerhards2012-06-042-0/+9
| | | | | | | | | | | | There seem to be cases where the shutdown message is otherwise not processed, not even on an idle system. Thanks to Marcin for bringing this problem up.
* | doc: mentioning imported bugfix in ChangeLogRainer Gerhards2012-06-011-0/+7
| |
* | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-014-13/+26
|\| | | | | | | | | Conflicts: runtime/queue.c
| * some better code to handle queue congestionRainer Gerhards2012-06-011-10/+15
| | | | | | | | | | This is a minor optimization to spare some cycles if the timeout is set to immediate discard
| * bugfix: delayble source could block action queue, ...Rainer Gerhards2012-06-012-1/+8
| | | | | | | | | | | | | | | | | | even if there was a disk queue associated with it. The root cause of this problem was that it makes no sense to delay messages once they arrive in the action queue - the "input" that is being held in that case is the main queue worker, what makes no sense. Thanks to Marcin for alerting us on this problem and providing instructions to reproduce it.
| * cosmetic: slightly improved debug outputRainer Gerhards2012-05-311-2/+2
| |
* | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-295-3/+27
|\|
| * bugfix: if debug message could end up in log file when forkingTomas Heinrich2012-05-294-3/+13
| | | | | | | | | | | | | | | | | | | | | | if rsyslog was set to auto-background (thus fork, the default) and debug mode to stdout was enabled, debug messages ended up in the first log file opened. Currently, stdout logging is completely disabled in forking mode (but writing to the debug log file is still possible). This is a change in behaviour, which is under review. If it causes problems to you, please let us know. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * bugfix/omudpspoof: problems, including abort, happend when run on multiple ↵Rainer Gerhards2012-05-142-0/+14
| | | | | | | | | | | | | | threads. Root cause is that libnet is not thread-safe. Omudpspoof now guards libnet calls with their own mutex.
* | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-101-0/+9
|\| | | | | | | | | Conflicts: ChangeLog
| * bugfix: disk queue was not persisted on shutdown, regression of fix toRainer Gerhards2012-05-102-12/+12
| | | | | | | | | | | | | | | | http://bugzilla.adiscon.com/show_bug.cgi?id=299 The new code also handles the case of shutdown of blocking light and full delayable sources somewhat smarter and permits, assuming sufficient timouts, to persist message up to the max queue capacity. Also some nits in debug instrumentation have been fixed.
* | bugfix: disk queue was not persisted on shutdown, regression of fix toRainer Gerhards2012-05-102-11/+13
| | | | | | | | | | | | | | | | http://bugzilla.adiscon.com/show_bug.cgi?id=299 The new code also handles the case of shutdown of blocking light and full delayable sources somewhat smarter and permits, assuming sufficient timouts, to persist message up to the max queue capacity. Also some nits debug instrumentation have been fixed.