| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-25 | 13 | -15/+22 |
| |\ | |||||
| | * | build: fix issues on FreeBSD | Rainer Gerhards | 2013-06-25 | 3 | -3/+5 |
| | | | | | | | | | | | The last fix was incomplete. Thanks to Christiano for testing and suggestions. | ||||
| | * | doc: update ChangeLog | Rainer Gerhards | 2013-06-25 | 1 | -0/+2 |
| | | | |||||
| | * | typo fix ("listner" vs. "listener") | Michael Biebl | 2013-06-25 | 8 | -10/+10 |
| | | | |||||
| | * | imtcp: permit parameter name with typo for backward compatibility | Rainer Gerhards | 2013-06-25 | 1 | -1/+3 |
| | | | |||||
| | * | imtcp: fix typo in config parameter name | Michael Biebl | 2013-06-25 | 1 | -2/+2 |
| | | | |||||
| | * | bugfix: potential segfault on rsyslog termination in imudp | Rainer Gerhards | 2013-06-25 | 2 | -1/+2 |
| | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=456 | ||||
| * | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-24 | 5 | -11/+15 |
| |\| | |||||
| | * | bugfix: RainerScript object required parameters were not properly checked | Rainer Gerhards | 2013-06-24 | 4 | -10/+14 |
| | | | | | | | | | this clould result to segfaults on startup if parameters were missing. | ||||
| | * | bugfix: omrelp "template" parameter is NOT required | Rainer Gerhards | 2013-06-24 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-24 | 4 | -5/+44 |
| |\| | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | $uptime property: fix mem leak and build problems on FreeBSD | Rainer Gerhards | 2013-06-24 | 2 | -3/+29 |
| | | | |||||
| | * | solve build problem on FreeBSD | Rainer Gerhards | 2013-06-24 | 1 | -1/+5 |
| | | | | | | | | | Thanks to Christiano for reporting this problem. | ||||
| | * | impstats: solve build problem on FreeBSD | Rainer Gerhards | 2013-06-24 | 2 | -0/+9 |
| | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=458 | ||||
| * | | mmfields: add "jsonRoot" parameter | Rainer Gerhards | 2013-06-24 | 3 | -7/+28 |
| | | | |||||
| * | | doc: link mmfields doc to rest of doc set | Rainer Gerhards | 2013-06-23 | 1 | -0/+2 |
| | | | | | | | | | ...forgotten in last commit ;) | ||||
| * | | doc: add mmfields module | Rainer Gerhards | 2013-06-23 | 1 | -0/+80 |
| | | | |||||
| * | | doc: document tls.authMode parameter | Rainer Gerhards | 2013-06-21 | 2 | -0/+26 |
| | | | |||||
| * | | omrelp: add tls.authmode parameter | Rainer Gerhards | 2013-06-21 | 1 | -0/+12 |
| | | | |||||
| * | | omrelp: add tls.authmode parameter | Rainer Gerhards | 2013-06-21 | 1 | -0/+12 |
| | | | |||||
| * | | doc: imrelp & omrelp improvements | Rainer Gerhards | 2013-06-21 | 2 | -6/+32 |
| | | | | | | | | | among others, fix doc done for wrong module... | ||||
| * | | omrelp: disable action on auth failure | Rainer Gerhards | 2013-06-21 | 1 | -6/+11 |
| | | | | | | | | | For almost all cases, it makes no sense to try to reconnect. | ||||
| * | | omrelp: emit error message on peer authentication failure | Rainer Gerhards | 2013-06-21 | 3 | -2/+13 |
| | | | |||||
| * | | doc: add new imrelp parameter | Rainer Gerhards | 2013-06-20 | 1 | -0/+17 |
| | | | |||||
| * | | imrelp: emit error message on authentication error | Rainer Gerhards | 2013-06-20 | 1 | -0/+9 |
| | | | |||||
| * | | minor cleanup | Rainer Gerhards | 2013-06-20 | 1 | -5/+0 |
| | | | |||||
| * | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-20 | 1 | -7/+7 |
| |\| | |||||
| | * | imptcp: improve doc | Rainer Gerhards | 2013-06-20 | 1 | -6/+6 |
| | | | |||||
| | * | doc bugfix: invalid parameter name | Rainer Gerhards | 2013-06-20 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-20 | 1 | -1/+1 |
| |\| | |||||
| | * | Add missing test | Michael Biebl | 2013-06-20 | 1 | -1/+1 |
| | | | | | | | | | | | Fixes ./configure: line 18474: xno: command not found | ||||
| * | | omrelp: add permittedPeer handling (authorization) | Rainer Gerhards | 2013-06-20 | 1 | -1/+24 |
| | | | |||||
| * | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-19 | 1 | -1/+1 |
| |\| | |||||
| | * | doc: imjournal doc correction | Tomas Heinrich | 2013-06-19 | 1 | -1/+1 |
| | | | |||||
| * | | doc: add omprog improvement to ChangeLog | Rainer Gerhards | 2013-06-19 | 1 | -0/+1 |
| | | | |||||
| * | | Updated omprog documentation | Andre Lorbach | 2013-06-19 | 1 | -2/+28 |
| | | | |||||
| * | | Added support for command line parameters in "binary" config setting of omprog. | Andre Lorbach | 2013-06-18 | 1 | -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 Lorbach | 2013-06-18 | 973 | -0/+149590 |
| |\ \ | |||||
| | * | | imrelp: support for setting permitted peers (client authentication) added | Rainer Gerhards | 2013-06-18 | 2 | -1/+24 |
| | | | | |||||
| | * | | imrelp: add support for impstats | Rainer Gerhards | 2013-06-18 | 2 | -1/+31 |
| | | | | |||||
| | * | | imrelp: switch to newer-style librelp interface | Rainer Gerhards | 2013-06-18 | 1 | -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. | ||||
| | * | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-17 | 1 | -38/+34 |
| | |\| | |||||
| | | * | doc: remove duplicate omfile descriptions | Rainer Gerhards | 2013-06-17 | 1 | -38/+34 |
| | | | | | | | | | | | | | | | | always bears the risk that one or another is not maintained when an update happpens | ||||
| | * | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-17 | 2 | -2/+3 |
| | |\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | | * | prepare for 7.4.1 releasev7.4.1 | Rainer Gerhards | 2013-06-17 | 3 | -3/+3 |
| | | | | |||||
| | | * | imjournal: rate limiter was destructed too early | Rainer Gerhards | 2013-06-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Too quick hacking, obviously, one too late, one too early, now it should fit ;) Thanks to Tomas Heinrich for pointing this out. | ||||
| | * | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-17 | 3 | -3/+22 |
| | |\| | |||||
| | | * | imjournal fix: put ratelimiter destruction in wrong entry point | Rainer Gerhards | 2013-06-17 | 2 | -2/+2 |
| | | | | | | | | | | | | | No regression, this was in recently written, never-released code. | ||||
| | | * | implement new ratelimiting mode for imjournal | Rainer Gerhards | 2013-06-17 | 3 | -1/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and make imjournal use it. The new mode is needed, as imjournal uses journal's timestamp as message generation time (which otherwise is when the message entered the system, and the ratelimiter uses this as current timestamp in order to save performance). It is debatable if imjournal is doing the right thing here. But it doesn't feel totally wrong. So let's safe that debate for later ;) | ||||
| | * | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-17 | 1 | -2/+2 |
| | |\| | |||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |