Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-27 | 1 | -0/+1 |
|\ | | | | | | | | | Conflicts: doc/imfile.html | ||||
| * | bugfix: in RFC5425 TLS, multiple wildcards in auth could cause segfault | Rainer Gerhards | 2013-06-27 | 1 | -0/+1 |
| | | |||||
* | | Added header in typedefs.h needed for building on ehel 5 | Andre Lorbach | 2013-06-27 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-25 | 1 | -2/+8 |
|\| | |||||
| * | lmsig_gt: remove no longer needed error message | Rainer Gerhards | 2013-06-25 | 1 | -2/+0 |
| | | | | | | | | This is now properly handled inside rsyslog core. | ||||
| * | bugfix: lmsig_gt abort on invalid configuration parameters | Risto Laanoja | 2013-06-25 | 1 | -2/+10 |
| | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=448 | ||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-25 | 4 | -4/+6 |
|\| | |||||
| * | build: fix issues on FreeBSD | Rainer Gerhards | 2013-06-25 | 3 | -3/+5 |
| | | | | | | | | | | The last fix was incomplete. Thanks to Christiano for testing and suggestions. | ||||
| * | typo fix ("listner" vs. "listener") | Michael Biebl | 2013-06-25 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-24 | 2 | -4/+32 |
|\| | | | | | | | | | Conflicts: ChangeLog | ||||
| * | $uptime property: fix mem leak and build problems on FreeBSD | Rainer Gerhards | 2013-06-24 | 1 | -3/+27 |
| | | |||||
| * | solve build problem on FreeBSD | Rainer Gerhards | 2013-06-24 | 1 | -1/+5 |
| | | | | | | | | Thanks to Christiano for reporting this problem. | ||||
* | | omrelp: emit error message on peer authentication failure | Rainer Gerhards | 2013-06-21 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-17 | 2 | -2/+18 |
|\| | |||||
| * | imjournal fix: put ratelimiter destruction in wrong entry point | Rainer Gerhards | 2013-06-17 | 1 | -1/+1 |
| | | | | | | | | No regression, this was in recently written, never-released code. | ||||
| * | implement new ratelimiting mode for imjournal | Rainer Gerhards | 2013-06-17 | 2 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | and make imjournal use it. The new mode is needed, as imjournal uses journal's timestamp as message generation time (which otherwise is when the message entered the system, and the ratelimiter uses this as current timestamp in order to save performance). It is debatable if imjournal is doing the right thing here. But it doesn't feel totally wrong. So let's safe that debate for later ;) | ||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-15 | 1 | -2/+2 |
|\| | |||||
| * | bugfix: prevent calling tellLostCnt() twice | Tomas Heinrich | 2013-06-12 | 1 | -1/+1 |
| | | |||||
| * | bugfix: prevent another endless loop in the ratelimiter | Tomas Heinrich | 2013-06-12 | 1 | -1/+1 |
| | | | | | | | | | | | | The message that reports how many messages were lost due to ratelimiting was sent before reseting the state that led to it. If it itself got ratelimited, this could lead to an endless loop. | ||||
* | | add BSD-specific syslog facilities | Rainer Gerhards | 2013-06-12 | 1 | -0/+2 |
| | | | | | | | | | | | | * "console" * "bsd_security" - this is called "security" under BSD, but that name was unfortunately already taken by some standard facility. So I | ||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-10 | 1 | -2/+2 |
|\| | | | | | | | | | Conflicts: ChangeLog | ||||
| * | bugfix: prevent an endless loop in the ratelimiter | Tomas Heinrich | 2013-06-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | If messages are being dropped because of ratelimiting, an internal message is generated to inform about this fact. This should happen only uppon the firs occurance but the counter that tracks the number of dropped messages was incremented only after sending the message. If the message itself gets ratelimited, an endless loop spins out of control. Thanks to Jerry James for notifying about this. | ||||
* | | Merge branch 'nextmaster' | Rainer Gerhards | 2013-06-06 | 11 | -87/+640 |
|\ \ | |/ |/| | | | | | Conflicts: ChangeLog | ||||
| * | fix handling of unbounded blocks | Rainer Gerhards | 2013-05-16 | 1 | -1/+2 |
| | | |||||
| * | fix regression on unencrypted queue files | Rainer Gerhards | 2013-05-16 | 1 | -0/+2 |
| | | |||||
| * | cleanup | Rainer Gerhards | 2013-05-16 | 3 | -7/+6 |
| | | |||||
| * | complete handle multiple blocks in encrypted queue files | Rainer Gerhards | 2013-05-16 | 6 | -37/+146 |
| | | |||||
| * | properly handle padding bytes when reading queue files | Rainer Gerhards | 2013-05-16 | 1 | -5/+10 |
| | | |||||
| * | enable ability to read existing encrypted queue file | Rainer Gerhards | 2013-05-15 | 2 | -3/+28 |
| | | |||||
| * | clean up crypto provider state files on queue file rollover | Rainer Gerhards | 2013-05-15 | 5 | -4/+29 |
| | | |||||
| * | do not try to write to read-open encryption state file | Rainer Gerhards | 2013-05-15 | 2 | -5/+7 |
| | | |||||
| * | clean up crypto provider state files on queue file close | Rainer Gerhards | 2013-05-15 | 6 | -2/+40 |
| | | |||||
| * | fix invalid function prototypes | Rainer Gerhards | 2013-05-13 | 1 | -2/+2 |
| | | | | | | | | regression from yet-unreleased enhancement (RELP IP address setting) | ||||
| * | Merge branch 'master' into nextmaster | Rainer Gerhards | 2013-05-13 | 3 | -8/+7 |
| |\ | |||||
| * | | basic queue file encryption | Rainer Gerhards | 2013-05-13 | 7 | -22/+248 |
| | | | |||||
| * | | enable shuffling of crypto parameters down through queue definition | Rainer Gerhards | 2013-05-10 | 4 | -27/+99 |
| | | | |||||
| * | | extend crypto provider interface so that it can support queue subsystem | Rainer Gerhards | 2013-05-08 | 2 | -17/+44 |
| | | | |||||
| * | | Merge branch 'master' into nextmaster | Rainer Gerhards | 2013-05-08 | 2 | -0/+7 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | Add configurable local client IP | Axel Rau | 2013-05-06 | 2 | -0/+22 |
| | | | | |||||
* | | | | bugfix: $template statement with multiple spaces lead to invalid tpl name | Rainer Gerhards | 2013-05-27 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If multiple spaces were used in front of the template name, all but one of them became actually part of the template name. So $template a,"..." would be name " a", and as such "a" was not available, e.g. in *.* /var/log/file;a This is a legacy config problem. As it was unreported for many years, no backport of the fix to old versions will happen. This is a long-standing bug that was only recently reported by forum user mc-sim. Reference: http://kb.monitorware.com/post23448.html | ||||
* | | | | Remove redundat cflags and links to libraries | Tomas Heinrich | 2013-05-20 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | This prevents linking with libee, liblognorm and libgcrypt when not necessary. | ||||
* | | | | Don't #include libestr and libee headers when not necessary | Tomas Heinrich | 2013-05-20 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | Through msg.h, many unrelated components needlessly required LIBEE_CFLAGS. | ||||
* | | | | bugfix: potential hang *in debug mode* on rsyslogd termination | Rainer Gerhards | 2013-05-15 | 1 | -7/+10 |
| | | | | |||||
* | | | | bugfix: .logsig files had tlv16 indicator bit at wrong offset | Rainer Gerhards | 2013-05-14 | 2 | -3/+3 |
| | | | | |||||
* | | | | cosmetic: reduce compiler warning | Marius Tomaschewski | 2013-05-14 | 1 | -1/+1 |
| |_|/ |/| | | | | | | | | | | | | | | init variable that does not really need to be initialized, as it is immediately overwritten - but the compiler is not smart enough to see that | ||||
* | | | bugfix: invalid addressing in string class (recent regression) | Rainer Gerhards | 2013-05-13 | 3 | -8/+7 |
| |/ |/| | |||||
* | | bugfix: segfault on startup if a disk queue was configure without file name | Rainer Gerhards | 2013-05-08 | 2 | -0/+7 |
|/ | | | | | Now this triggers an error message and the queue is changed to linkedList type. | ||||
* | Merge branch 'v7-stable' | Rainer Gerhards | 2013-05-06 | 1 | -1/+5 |
|\ | |||||
| * | bugfix: potential segfault on startup when builtin module was specified in ↵ | Rainer Gerhards | 2013-05-06 | 1 | -1/+5 |
| | | | | | | | | | | | | module() statement. Thanks to Marius Tomaschewski for reporting the bug. | ||||
* | | build: fix build if libgcrypt support is disabled | Michael Biebl | 2013-04-26 | 1 | -1/+1 |
| | | | | | | | | | | | | We don't want to hard-code `libgcrypt-config --libs` at various. Also, make sure LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS are correctly substituted. |