Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | prepare for 7.3.11 release | Rainer Gerhards | 2013-04-23 | 2 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | omhiredis: add support for redis pipeline support | Brian Knox | 2013-04-17 | 3 | -36/+93 | |
| | | | | | | ||||||
| * | | | | | imjournal: very slight optimization | Rainer Gerhards | 2013-04-17 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... well, it's actually questionable if it is a real optimization or not ;) | |||||
| * | | | | | Fix journal trusted fields translation. | Milan Bartos | 2013-04-17 | 1 | -8/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | modified: plugins/imjournal/imjournal.c | |||||
| * | | | | | Add support for persistenting journal state | Milan Bartos | 2013-04-17 | 1 | -6/+132 | |
| | | | | | | | | | | | | | | | | | | | | | | | | modified: plugins/imjournal/imjournal.c | |||||
| * | | | | | Merge branch 'master' into master-imjournal | Rainer Gerhards | 2013-04-17 | 82 | -441/+7332 | |
| |\ \ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'v7-stable' | Rainer Gerhards | 2013-04-17 | 2 | -2/+2 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | |||||
| | * \ \ \ \ \ | Merge branch 'v7-stable' | Rainer Gerhards | 2013-04-17 | 1 | -9/+78 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'master-crypto' | Rainer Gerhards | 2013-04-17 | 20 | -16/+2134 | |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| | | * | | | | | | | bugfix: $PreserveFQDN is not properly working | Louis Bouchard | 2013-04-17 | 2 | -0/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=426 | |||||
| | | * | | | | | | | add basic doc for encryption capability | Rainer Gerhards | 2013-04-15 | 4 | -2/+135 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | 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 | 2 | -1/+137 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | logenc: full support for keyfiles | Rainer Gerhards | 2013-04-12 | 4 | -43/+179 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including their generation via rscrytool | |||||
| | | * | | | | | | | logenc: support keyfiles in rscryutil | Rainer Gerhards | 2013-04-12 | 7 | -18/+164 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | logenc: add parameters to select cipher algo and mode | Rainer Gerhards | 2013-04-12 | 6 | -49/+188 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | logenc: rscryutil can now decrypt multi-block logfiles | Rainer Gerhards | 2013-04-12 | 5 | -29/+173 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | 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 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | Merge branch 'master' into master-crypto | Rainer Gerhards | 2013-04-11 | 1 | -0/+2 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | log encryption: add rscrytool to decrypt log files | Rainer Gerhards | 2013-04-05 | 8 | -32/+386 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also add test parameter to be able to set key | |||||
| | | * | | | | | | | | log encryption: initial PoC implementation | Rainer Gerhards | 2013-04-05 | 12 | -10/+701 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rough baseline, needs to be extended for actual use. | |||||
| | | * | | | | | | | | add configure check for libgcrypt | Rainer Gerhards | 2013-04-02 | 1 | -0/+33 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | doc: add recent patch to ChangeLog | Rainer Gerhards | 2013-04-13 | 1 | -0/+4 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | bugfix: set correct default value | Tomas Heinrich | 2013-04-13 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | bugfix: prevent a segfault if ratelimit condition is not met | Tomas Heinrich | 2013-04-13 | 3 | -5/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | * | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-04-12 | 2 | -1/+5 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | prepare for 7.3.10 releasev7.3.10 | Rainer Gerhards | 2013-04-10 | 3 | -3/+3 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-04-10 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | doc: complete ChangeLog | Rainer Gerhards | 2013-04-10 | 1 | -1/+3 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Update u_int8_t to uint8_t | Martin Carpenter | 2013-04-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | doc: add recent patch to ChangeLog | Rainer Gerhards | 2013-04-09 | 1 | -0/+2 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Utilize the new rsCStr*Strf() functions | Tomas Heinrich | 2013-04-09 | 1 | -23/+9 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Check return code from gnutls_x509_crt_get_*_dn | Tomas Heinrich | 2013-04-09 | 1 | -20/+35 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enlarge the supplied buffer if necessary. | |||||
| | * | | | | | | | | | | | Add new string functions that take a printf-style fmt | Tomas Heinrich | 2013-04-09 | 2 | -0/+79 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | bugfix in testbench | Rainer Gerhards | 2013-04-09 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I initially thought the testbench had found some regression, but it turned out that a bugfix fixed a situation that the testbench had (invalidly) relied on. I have now adapted the testbench to how things really need to be. | |||||
| | * | | | | | | | | | | | Merge branch 'c7' into tmp | Rainer Gerhards | 2013-04-09 | 10 | -9/+63 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/queue.c | |||||
| | | * | | | | | | | | | | | make imrelp properly terminate on system shutdown | Rainer Gerhards | 2013-04-09 | 4 | -4/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it didn't do so if it was inside a retry loop | |||||
| | | * | | | | | | | | | | | add output module interface to facilitate cooperative shutdown | Rainer Gerhards | 2013-04-08 | 6 | -2/+35 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... in more complex cases (where receiving SIGTTIN is not sufficient). See also: http://blog.gerhards.net/2013/04/rsyslog-output-plugin-wrangling.html | |||||
| | | * | | | | | | | | | | | omrelp: add ability to specify session timeout | Rainer Gerhards | 2013-04-08 | 4 | -3/+15 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge branch 'c7' | Rainer Gerhards | 2013-04-08 | 4 | -46/+128 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| | | * | | | | | | | | | | | omrelp: add support for RainerScript-based configuration | Rainer Gerhards | 2013-04-08 | 4 | -46/+128 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-04-08 | 5 | -76/+185 | |
| | |\| | | | | | | | | | | | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: grammar/rainerscript.c runtime/ruleset.c | |||||
| | * | | | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-04-04 | 1 | -0/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | cleanup | Rainer Gerhards | 2013-03-29 | 1 | -2/+0 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Merge branch 'v7-stable-info' | Rainer Gerhards | 2013-03-29 | 6 | -15/+56 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog template.c | |||||
| | | * | | | | | | | | | | | permit substring extraction relative to end-of-string in templates | Rainer Gerhards | 2013-03-29 | 6 | -15/+56 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | add RainerScript re_extract() function | Rainer Gerhards | 2013-03-27 | 4 | -2/+114 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | bugfix: imuxsock aborted under some conditions | Rainer Gerhards | 2013-03-27 | 2 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | regression from ratelimiting enhancements |