summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | Merge branch 'v7-stable'Rainer Gerhards2013-06-171-38/+34
| |\|
| | * doc: remove duplicate omfile descriptionsRainer Gerhards2013-06-171-38/+34
| | | | | | | | | | | | | | | always bears the risk that one or another is not maintained when an update happpens
| * | Merge branch 'v7-stable'Rainer Gerhards2013-06-172-2/+3
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * prepare for 7.4.1 releasev7.4.1Rainer Gerhards2013-06-173-3/+3
| | |
| | * imjournal: rate limiter was destructed too earlyRainer Gerhards2013-06-171-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 Gerhards2013-06-173-3/+22
| |\|
| | * imjournal fix: put ratelimiter destruction in wrong entry pointRainer Gerhards2013-06-172-2/+2
| | | | | | | | | | | | No regression, this was in recently written, never-released code.
| | * implement new ratelimiting mode for imjournalRainer Gerhards2013-06-173-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 Gerhards2013-06-171-2/+2
| |\|
| | * doc: legacy parameter description in imjournal slightly wrongRainer Gerhards2013-06-171-2/+2
| | |
| * | Merge branch 'v7-stable'Rainer Gerhards2013-06-172-9/+41
| |\|
| | * doc cleanupRainer Gerhards2013-06-171-5/+5
| | |
| | * Add IgnorePreviousMessages option to imjournal.Milan Bartos2013-06-172-9/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option specifies whether imjournal should ignore messages that are currently in journal. This option is only used when there is no StateFile to avoid message loss. modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c Conflicts: doc/imjournal.html plugins/imjournal/imjournal.c
| * | Merge branch 'v7-stable'Rainer Gerhards2013-06-171-25/+18
| |\| | | | | | | | | | | | | Conflicts: doc/imjournal.html
| | * doc: improve imjournal docRainer Gerhards2013-06-171-17/+19
| | | | | | | | | | | | most importantly, convert sample to new-style config format
| | * fix imjournal doc after merging patchRainer Gerhards2013-06-171-11/+2
| | | | | | | | | | | | | | | ... was changed in the interim, so the result of the merge was sub-optimal ;)
| | * Merge branch 'tmp' into v7-stableRainer Gerhards2013-06-172-3/+14
| | |\ | | | | | | | | | | | | | | | | Conflicts: plugins/imjournal/imjournal.c
| | | * Rename legacy imjournal configs to have "imjournal" prepended.Milan Bartos2013-06-172-3/+14
| | | | | | | | | | | | | | | | | | | | modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c
| * | | Merge branch 'tmp'Rainer Gerhards2013-06-172-3/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imjournal/imjournal.c
| | * | | Rename legacy imjournal configs to have "imjournal" prepended.Milan Bartos2013-06-172-3/+14
| | | |/ | | |/| | | | | | | | | | | | | modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c
| * | | Merge branch 'v7-stable'Rainer Gerhards2013-06-160-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | doc bugfix: DynaFileCacheSize description in omfile was wrongRainer Gerhards2013-06-161-2/+6
| | | | | | | | | | | | | | | | thanks to David Lang for alerting me.
| | * | doc: add journal presentation link to omjournal docRainer Gerhards2013-06-161-0/+3
| | | |
| * | | doc bugfix: DynaFileCacheSize description in omfile was wrongRainer Gerhards2013-06-161-2/+6
| | | | | | | | | | | | | | | | thanks to David Lang for alerting me.
| * | | doc: add journal presentation link to omjournal docRainer Gerhards2013-06-161-0/+3
| | | |
| * | | Merge branch 'v7-stable'Rainer Gerhards2013-06-161-8/+56
| |\| |
| | * | doc: improve imjournal doc and add ratelimiting paramtersRainer Gerhards2013-06-161-8/+56
| | | |