summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | 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
| | * | | | | | | | | | | | logsig: minimal end-user docv7.3.9Rainer Gerhards2013-03-266-5/+112
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Check libsocket for getifaddrs()Martin Carpenter2013-03-261-1/+4
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | logsig: needed to refactor parts of the reader as wellRainer Gerhards2013-03-263-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the previous refactoring broke that code
| | * | | | | | | | | | | | logsig: refactor code to not reley on undocumented libgt partsRainer Gerhards2013-03-262-41/+59
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | logsig: fix memory leakRainer Gerhards2013-03-261-13/+29
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | logsig: handle error casesRainer Gerhards2013-03-264-126/+281
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | imudp: support user-selectable inputnameRainer Gerhards2013-03-264-27/+85
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master-gt'Rainer Gerhards2013-03-256-197/+504
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | doc: update rsgtutil man page with new --extend optionRainer Gerhards2013-03-251-1/+28
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | rsgtsig: finish implementation of 'extend' modeRainer Gerhards2013-03-254-28/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is tested as far as possible. However, the actual extend case can only be tested in about three weeks from now when the next publication is out. I have done module-testing with a mockup extend call, so chances are great the final test will be passed.
| | | * | | | | | | | | | | | rsgtutil/milestone: basic 'extend' mode implementationRainer Gerhards2013-03-234-37/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... done up until the point where I need to wait for the timestamps to become extendible. So doing a milestone commit to make sure the work is inside the archive. Actual writing of the extended timestamp is missing.
| | | * | | | | | | | | | | | rsgtutil: basic plumbing for extend modeRainer Gerhards2013-03-231-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | does not contain actual implementation
| | | * | | | | | | | | | | | rsgtutil: refactor 'verify' mode to use new tlv file read functionsRainer Gerhards2013-03-232-207/+27
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | rsgtutil: refactor 'show-sigblock-params" modeRainer Gerhards2013-03-231-19/+8
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | logsig: refactor 'dump' mode in rsgtutilRainer Gerhards2013-03-233-23/+281
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The way tlvrecords are processed is changed in order to provide better extensibility for further work.
| | | * | | | | | | | | | | | fix: librsgt.h was not put in distribution tarballRainer Gerhards2013-03-222-3/+4
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogRainer Gerhards2013-03-223-24/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v7-stable'Rainer Gerhards2013-03-223-24/+45
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'master-gt'Rainer Gerhards2013-03-2214-30/+3068
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | / / / / / / / / / / / | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | doc: add doc for rsgtutilRainer Gerhards2013-03-223-17/+55
| | | | | | | | | | | | | | |