summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | prepare for 7.3.11 releaseRainer Gerhards2013-04-232-2/+2
| | | | | |
| * | | | | omhiredis: add support for redis pipeline supportBrian Knox2013-04-173-36/+93
| | | | | |
| * | | | | imjournal: very slight optimizationRainer Gerhards2013-04-171-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... well, it's actually questionable if it is a real optimization or not ;)
| * | | | | Fix journal trusted fields translation.Milan Bartos2013-04-171-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | modified: plugins/imjournal/imjournal.c
| * | | | | Add support for persistenting journal stateMilan Bartos2013-04-171-6/+132
| | | | | | | | | | | | | | | | | | | | | | | | modified: plugins/imjournal/imjournal.c
| * | | | | Merge branch 'master' into master-imjournalRainer Gerhards2013-04-1782-441/+7332
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'v7-stable'Rainer Gerhards2013-04-172-2/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| | * \ \ \ \ \ Merge branch 'v7-stable'Rainer Gerhards2013-04-171-9/+78
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master-crypto'Rainer Gerhards2013-04-1720-16/+2134
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | | | | | | bugfix: $PreserveFQDN is not properly workingLouis Bouchard2013-04-172-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=426
| | | * | | | | | | add basic doc for encryption capabilityRainer Gerhards2013-04-154-2/+135
| | | | | | | | | |
| | | * | | | | | | logenc: add key-program support to rsyslog crypto providerRainer Gerhards2013-04-151-3/+20
| | | | | | | | | |
| | | * | | | | | | logenc: add capability to use key generation program to rscryutilRainer Gerhards2013-04-122-1/+137
| | | | | | | | | |
| | | * | | | | | | logenc: full support for keyfilesRainer Gerhards2013-04-124-43/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including their generation via rscrytool
| | | * | | | | | | logenc: support keyfiles in rscryutilRainer Gerhards2013-04-127-18/+164
| | | | | | | | | |
| | | * | | | | | | logenc: add parameters to select cipher algo and modeRainer Gerhards2013-04-126-49/+188
| | | | | | | | | |
| | | * | | | | | | logenc: rscryutil can now decrypt multi-block logfilesRainer Gerhards2013-04-125-29/+173
| | | | | | | | | |
| | | * | | | | | | logenc: milestone: rsyslog writes .encinfo side filesRainer Gerhards2013-04-116-19/+229
| | | | | | | | | |
| | | * | | | | | | cleanupRainer Gerhards2013-04-111-40/+0
| | | | | | | | | |
| | | * | | | | | | log encryption: check length of "key" parameterRainer Gerhards2013-04-113-4/+10
| | | | | | | | | |
| | | * | | | | | | Merge branch 'master' into master-cryptoRainer Gerhards2013-04-111-0/+2
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | log encryption: add rscrytool to decrypt log filesRainer Gerhards2013-04-058-32/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also add test parameter to be able to set key
| | | * | | | | | | | log encryption: initial PoC implementationRainer Gerhards2013-04-0512-10/+701
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rough baseline, needs to be extended for actual use.
| | | * | | | | | | | add configure check for libgcryptRainer Gerhards2013-04-021-0/+33
| | | | | | | | | | |
| | * | | | | | | | | doc: add recent patch to ChangeLogRainer Gerhards2013-04-131-0/+4
| | | | | | | | | | |
| | * | | | | | | | | bugfix: set correct default valueTomas Heinrich2013-04-131-1/+1
| | | | | | | | | | |
| | * | | | | | | | | bugfix: prevent a segfault if ratelimit condition is not metTomas Heinrich2013-04-133-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 Gerhards2013-04-122-1/+5
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | prepare for 7.3.10 releasev7.3.10Rainer Gerhards2013-04-103-3/+3
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2013-04-101-0/+4
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | doc: complete ChangeLogRainer Gerhards2013-04-101-1/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Update u_int8_t to uint8_tMartin Carpenter2013-04-101-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | doc: add recent patch to ChangeLogRainer Gerhards2013-04-091-0/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Utilize the new rsCStr*Strf() functionsTomas Heinrich2013-04-091-23/+9
| | | | | | | | | | | | |
| | * | | | | | | | | | | Check return code from gnutls_x509_crt_get_*_dnTomas Heinrich2013-04-091-20/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enlarge the supplied buffer if necessary.
| | * | | | | | | | | | | Add new string functions that take a printf-style fmtTomas Heinrich2013-04-092-0/+79
| | | | | | | | | | | | |
| | * | | | | | | | | | | bugfix in testbenchRainer Gerhards2013-04-091-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 tmpRainer Gerhards2013-04-0910-9/+63
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/queue.c
| | | * | | | | | | | | | | make imrelp properly terminate on system shutdownRainer Gerhards2013-04-094-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it didn't do so if it was inside a retry loop
| | | * | | | | | | | | | | add output module interface to facilitate cooperative shutdownRainer Gerhards2013-04-086-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 timeoutRainer Gerhards2013-04-084-3/+15
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'c7'Rainer Gerhards2013-04-084-46/+128
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | | | | | | | | | | omrelp: add support for RainerScript-based configurationRainer Gerhards2013-04-084-46/+128
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2013-04-085-76/+185
| | |\| | | | | | | | | | | | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: grammar/rainerscript.c runtime/ruleset.c
| | * | | | | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2013-04-041-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | cleanupRainer Gerhards2013-03-291-2/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'v7-stable-info'Rainer Gerhards2013-03-296-15/+56
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog template.c
| | | * | | | | | | | | | | permit substring extraction relative to end-of-string in templatesRainer Gerhards2013-03-296-15/+56
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | add RainerScript re_extract() functionRainer Gerhards2013-03-274-2/+114
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | bugfix: imuxsock aborted under some conditionsRainer Gerhards2013-03-272-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | regression from ratelimiting enhancements