summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| | |
* | | Merge branch 'c7' into tmpRainer Gerhards2013-04-094-3/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/queue.c
| * | | make imrelp properly terminate on system shutdownRainer Gerhards2013-04-091-1/+4
| | | | | | | | | | | | | | | | it didn't do so if it was inside a retry loop
| * | | add output module interface to facilitate cooperative shutdownRainer Gerhards2013-04-084-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | ... in more complex cases (where receiving SIGTTIN is not sufficient). See also: http://blog.gerhards.net/2013/04/rsyslog-output-plugin-wrangling.html
* | | | Merge branch 'c7'Rainer Gerhards2013-04-081-1/+3
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | omrelp: add support for RainerScript-based configurationRainer Gerhards2013-04-081-1/+3
| | |/ | |/|
* | | Merge branch 'v7-stable'Rainer Gerhards2013-04-081-5/+18
|\| | | |/ |/| | | | | | | Conflicts: grammar/rainerscript.c runtime/ruleset.c
| * bugfix: nested if/prifilt conditions did not work properlyRainer Gerhards2013-04-041-4/+17
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=415
* | cleanupRainer Gerhards2013-03-291-2/+0
| |
* | Merge branch 'v7-stable-info'Rainer Gerhards2013-03-291-5/+12
|\ \ | | | | | | | | | | | | | | | Conflicts: ChangeLog template.c
| * | permit substring extraction relative to end-of-string in templatesRainer Gerhards2013-03-291-5/+12
| |/
* | 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-263-125/+278
| |
* | imudp: support user-selectable inputnameRainer Gerhards2013-03-261-2/+1
| |
* | Merge branch 'master-gt'Rainer Gerhards2013-03-254-165/+358
|\ \
| * | rsgtsig: finish implementation of 'extend' modeRainer Gerhards2013-03-253-15/+70
| | | | | | | | | | | | | | | | | | | | | | | | 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-233-24/+97
| | | | | | | | | | | | | | | | | | | | | ... 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: refactor 'verify' mode to use new tlv file read functionsRainer Gerhards2013-03-231-206/+24
| | |
| * | rsgtutil: refactor 'show-sigblock-params" modeRainer Gerhards2013-03-231-19/+8
| | |
| * | logsig: refactor 'dump' mode in rsgtutilRainer Gerhards2013-03-232-20/+277
| | | | | | | | | | | | | | | 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-222-23/+44
|\ \ \ | |/ / |/| |
| * | Merge branch 'v7-stable'Rainer Gerhards2013-03-222-23/+44
| |\|
| | * Merge branch 'v6-stable' into v7-stableRainer Gerhards2013-03-222-23/+44
| | |\
| | | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-222-23/+44
| | | |\
| | | | * yet another update of the systemd files we need to carry...Rainer Gerhards2013-03-221-21/+42
| | | | |
| | | | * build-sys: Fix "update-systemd" targetMichael Biebl2013-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | The urls have changed.
* | | | | Merge branch 'master' into master-gtRainer Gerhards2013-03-2215-79/+334
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac runtime/rsyslog.h
| * | | | Merge branch 'v7-stable'Rainer Gerhards2013-03-211-37/+135
| |\| | |
| | * | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2013-03-211-37/+135
| | |\| |
| | | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-211-37/+135
| | | |\|
| | | | * update systemd files to match current systemd sourceRainer Gerhards2013-03-211-37/+135
| | | | |
| * | | | Fix for glob(3)s that lack GLOB_NOMAGICMartin Carpenter2013-03-212-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | | imfile: now detects file change when rsyslog was inactiveRainer Gerhards2013-03-202-25/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previosly, this case could not be detected, so if a file was overwritten or rotated away while rsyslog was stopped, some data was missing. This is now detected and the new file being forwarded right from the beginning. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=228
| * | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogRainer Gerhards2013-03-201-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | bugfix: build on non-linux platforms failedRainer Gerhards2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The previous fix for this was incomplete.
| * | | | | Merge branch 'v7-stable' into tmpRainer Gerhards2013-03-201-13/+15
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Merge branch 'v6-stable' into tmpRainer Gerhards2013-03-202-14/+16
| | |\| |
| | | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-201-13/+15
| | | |\|
| | | | * bugfix: get rid of potential endless loop in doGetGID()Tomas Heinrich2013-03-201-13/+15
| | | | |
| * | | | bugfix: solve compile problems on non-Linux platformsRainer Gerhards2013-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for alerting us on this issue.
| * | | | Merge branch 'v7-stable'Rainer Gerhards2013-03-182-0/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/debug.h tools/syslogd.c
| | * | | debug system improvement & bug fix for init system status (see below)Rainer Gerhards2013-03-152-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - rsyslogd startup information is now properly conveyed back to init when privileges are beging dropped Actually, we have moved termination of the parent in front of the priv drop. So it shall work now in all cases. See code comments in commit for more details. - If forking, the parent now waits for a maximum of 60 seconds for termination by the child - improved debugging support in forked (auto-backgrounding) mode The rsyslog debug log file is now continued to be written across the fork.
| * | | | Merge branch 'v6-stable'Rainer Gerhards2013-03-121-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-122-2/+4
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | Conflicts: action.c queue.c (some code moved from action.c --> queue.c)
| * | | | mmanon: complete ipv4 functionalityRainer Gerhards2013-03-043-0/+10
| | | | |
| * | | | mmanon: add ability to specify number of bits to be anonymizedRainer Gerhards2013-03-041-0/+2
| | | | |