summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* imrelp: properly initialize certifcate parametersRainer Gerhards2013-06-251-0/+3
|
* Merge branch 'v7-stable'Rainer Gerhards2013-06-252-2/+11
|\
| * lmsig_gt: remove no longer needed error messageRainer Gerhards2013-06-251-2/+0
| | | | | | | | This is now properly handled inside rsyslog core.
| * bugfix: lmsig_gt abort on invalid configuration parametersRisto Laanoja2013-06-252-2/+13
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=448
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-251-2/+0
|\|
| * imfile: remove redundant error mesageRainer Gerhards2013-06-251-2/+0
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-252-0/+2
|\|
| * testbench: "prevent" memleaks due to raceRainer Gerhards2013-06-251-0/+1
| | | | | | | | | | | | | | | | | | | | imdiag may not have enough time to properly terminate when the shutdown request is made. Thus we give it a little headroom. Note that this does not address a real issue inside the code - at most, it looks like a memory leak, but one where the whole process is immediately destructed. However, it is an annouance for the testbench. Note that the race may still occur based on circumstances, but now is much less likely.
| * debug: add memleak info to "make distcheck"Rainer Gerhards2013-06-251-0/+1
| | | | | | | | | | do --enable-valgrind to get better diagnostics in case of memory leaks
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-2513-15/+22
|\|
| * build: fix issues on FreeBSDRainer Gerhards2013-06-253-3/+5
| | | | | | | | | | The last fix was incomplete. Thanks to Christiano for testing and suggestions.
| * doc: update ChangeLogRainer Gerhards2013-06-251-0/+2
| |
| * typo fix ("listner" vs. "listener")Michael Biebl2013-06-258-10/+10
| |
| * imtcp: permit parameter name with typo for backward compatibilityRainer Gerhards2013-06-251-1/+3
| |
| * imtcp: fix typo in config parameter nameMichael Biebl2013-06-251-2/+2
| |
| * bugfix: potential segfault on rsyslog termination in imudpRainer Gerhards2013-06-252-1/+2
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=456
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-245-11/+15
|\|
| * bugfix: RainerScript object required parameters were not properly checkedRainer Gerhards2013-06-244-10/+14
| | | | | | | | this clould result to segfaults on startup if parameters were missing.
| * bugfix: omrelp "template" parameter is NOT requiredRainer Gerhards2013-06-241-1/+1
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-244-5/+44
|\| | | | | | | | | Conflicts: ChangeLog
| * $uptime property: fix mem leak and build problems on FreeBSDRainer Gerhards2013-06-242-3/+29
| |
| * solve build problem on FreeBSDRainer Gerhards2013-06-241-1/+5
| | | | | | | | Thanks to Christiano for reporting this problem.
| * impstats: solve build problem on FreeBSDRainer Gerhards2013-06-242-0/+9
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=458
* | mmfields: add "jsonRoot" parameterRainer Gerhards2013-06-243-7/+28
| |
* | doc: link mmfields doc to rest of doc setRainer Gerhards2013-06-231-0/+2
| | | | | | | | ...forgotten in last commit ;)
* | doc: add mmfields moduleRainer Gerhards2013-06-231-0/+80
| |
* | doc: document tls.authMode parameterRainer Gerhards2013-06-212-0/+26
| |
* | omrelp: add tls.authmode parameterRainer Gerhards2013-06-211-0/+12
| |
* | omrelp: add tls.authmode parameterRainer Gerhards2013-06-211-0/+12
| |
* | doc: imrelp & omrelp improvementsRainer Gerhards2013-06-212-6/+32
| | | | | | | | among others, fix doc done for wrong module...
* | omrelp: disable action on auth failureRainer Gerhards2013-06-211-6/+11
| | | | | | | | For almost all cases, it makes no sense to try to reconnect.
* | omrelp: emit error message on peer authentication failureRainer Gerhards2013-06-213-2/+13
| |
* | doc: add new imrelp parameterRainer Gerhards2013-06-201-0/+17
| |
* | imrelp: emit error message on authentication errorRainer Gerhards2013-06-201-0/+9
| |
* | minor cleanupRainer Gerhards2013-06-201-5/+0
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-201-7/+7
|\|
| * imptcp: improve docRainer Gerhards2013-06-201-6/+6
| |
| * doc bugfix: invalid parameter nameRainer Gerhards2013-06-201-1/+1
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-201-1/+1
|\|
| * Add missing testMichael Biebl2013-06-201-1/+1
| | | | | | | | | | Fixes ./configure: line 18474: xno: command not found
* | omrelp: add permittedPeer handling (authorization)Rainer Gerhards2013-06-201-1/+24
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-191-1/+1
|\|
| * doc: imjournal doc correctionTomas Heinrich2013-06-191-1/+1
| |
* | doc: add omprog improvement to ChangeLogRainer Gerhards2013-06-191-0/+1
| |
* | Updated omprog documentationAndre Lorbach2013-06-191-2/+28
| |
* | Added support for command line parameters in "binary" config setting of omprog.Andre Lorbach2013-06-181-16/+113
| | | | | | | | | | | | | | - Command line Parameter Support is only available with the new config format, here is a sample: action(type="omprog" binary="/path/omprog.py --option=value --option2=\"value 2\"") - Also fixed a seqfault wenn using the new config format and no template parameter was specified.
* | Merge remote branch 'upstream/master'Andre Lorbach2013-06-18973-0/+149590
|\ \
| * | imrelp: support for setting permitted peers (client authentication) addedRainer Gerhards2013-06-182-1/+24
| | |
| * | imrelp: add support for impstatsRainer Gerhards2013-06-182-1/+31
| | |
| * | imrelp: switch to newer-style librelp interfaceRainer Gerhards2013-06-181-2/+4
| | | | | | | | | | | | | | | | | | | | | This interface permits us to pass a user-pointer to librelp, which it will pass back to us on message reception. This is the foundation for some more advanced features that require access to imrelp's configration object.