Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | bugfix: build problems on Solaris | John Lyman | 2013-04-25 | 1 | -1/+1 |
| | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=436 | ||||
* | | fix invalid include dependency in encryption support | Rainer Gerhards | 2013-04-24 | 1 | -1/+1 |
| | | |||||
* | | cleanup | Rainer Gerhards | 2013-04-24 | 5 | -16/+4 |
| | | |||||
* | | omelasticsearch: _id field support for bulk operations | Jérôme Renard | 2013-04-24 | 1 | -8/+8 |
| | | | | | | | | | | | | also max number of templates for plugin use has been increased to five closes: http://bugzilla.adiscon.com/show_bug.cgi?id=392 | ||||
* | | platform compatibility enhancement: solve compile issue with libgcrypt | Rainer Gerhards | 2013-04-24 | 1 | -0/+2 |
| | | | | | | | | do not use GCRY_CIPHER_MODE_AESWRAP where not available | ||||
* | | bugfix: block size limit was not properly honored | Rainer Gerhards | 2013-04-23 | 1 | -0/+1 |
| | | |||||
* | | bugfix: potential segfault in guardtime signature provider | Rainer Gerhards | 2013-04-23 | 1 | -1/+1 |
| | | | | | | | | | | it could segfault if an error was reported by the GuardTime API, because an invalid free could happen then | ||||
* | | some minor additions to 7.3.11v7.3.11 | Rainer Gerhards | 2013-04-23 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master-crypto' | Rainer Gerhards | 2013-04-17 | 10 | -8/+1162 |
|\ \ | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | logenc: add key-program support to rsyslog crypto provider | Rainer Gerhards | 2013-04-15 | 1 | -3/+20 |
| | | | |||||
| * | | logenc: add capability to use key generation program to rscryutil | Rainer Gerhards | 2013-04-12 | 1 | -0/+129 |
| | | | |||||
| * | | logenc: full support for keyfiles | Rainer Gerhards | 2013-04-12 | 1 | -4/+26 |
| | | | | | | | | | | | | including their generation via rscrytool | ||||
| * | | logenc: support keyfiles in rscryutil | Rainer Gerhards | 2013-04-12 | 4 | -7/+88 |
| | | | |||||
| * | | logenc: add parameters to select cipher algo and mode | Rainer Gerhards | 2013-04-12 | 4 | -25/+102 |
| | | | |||||
| * | | logenc: rscryutil can now decrypt multi-block logfiles | Rainer Gerhards | 2013-04-12 | 3 | -4/+7 |
| | | | |||||
| * | | logenc: milestone: rsyslog writes .encinfo side files | Rainer Gerhards | 2013-04-11 | 6 | -19/+229 |
| | | | |||||
| * | | cleanup | Rainer Gerhards | 2013-04-11 | 1 | -40/+0 |
| | | | |||||
| * | | log encryption: check length of "key" parameter | Rainer Gerhards | 2013-04-11 | 3 | -4/+10 |
| | | | |||||
| * | | log encryption: add rscrytool to decrypt log files | Rainer Gerhards | 2013-04-05 | 4 | -20/+47 |
| | | | | | | | | | | | | also add test parameter to be able to set key | ||||
| * | | log encryption: initial PoC implementation | Rainer Gerhards | 2013-04-05 | 9 | -7/+629 |
| | | | | | | | | | | | | rough baseline, needs to be extended for actual use. | ||||
* | | | bugfix: prevent a segfault if ratelimit condition is not met | Tomas Heinrich | 2013-04-13 | 2 | -1/+15 |
| | | | | | | | | | | | | | | | | | | Move the severity-check logic inside the ratelimiter and add a new function ratelimitSetSeverity() to manipulate the treshold. Currently only utilized by the imuxsock module. | ||||
* | | | Utilize the new rsCStr*Strf() functions | Tomas Heinrich | 2013-04-09 | 1 | -23/+9 |
| | | |