summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'beta'masterRainer Gerhards2012-10-191-2/+2
|\
| * Merge branch 'v6-stable' into betaRainer Gerhards2012-10-191-2/+2
| |\
| | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-191-2/+2
| | |\
| | | * fix epoll-enabled code to use correct data member for pointersRainer Gerhards2012-10-191-2/+2
* | | | Merge branch 'beta'Rainer Gerhards2012-10-191-5/+0
|\| | |
| * | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-191-5/+0
| |\| |
| | * | bugfix: imuxsock did not properly honor $LocalHostIPIFRainer Gerhards2012-10-191-5/+0
* | | | Merge branch 'beta'Rainer Gerhards2012-10-181-1/+1
|\| | |
| * | | build: Drop unused include pathMichael Biebl2012-10-181-1/+1
* | | | Merge branch 'master-newtemplate'Rainer Gerhards2012-10-181-5/+5
|\ \ \ \
| * | | | refactor tpl processor so that date is queried once per templateRainer Gerhards2012-10-101-5/+5
* | | | | imklog: add paramter "keepkerneltimestamp"Rainer Gerhards2012-10-173-13/+18
* | | | | Merge branch 'beta'Rainer Gerhards2012-10-172-3/+5
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-172-3/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-172-3/+5
| | |\ \ \ | | | | |/ | | | |/|
| | | * | imklog: use memmove instead of memcpy (solaris)Marius Tomaschewski2012-10-171-1/+1
| | | * | imklog: use memmove to remove kernel timestampMarius Tomaschewski2012-10-171-1/+1
| | | * | imklog: skip leading spaces in kernel timestampMarius Tomaschewski2012-10-171-1/+3
* | | | | Merge branch 'beta'Rainer Gerhards2012-10-161-8/+2
|\| | | |
| * | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-161-8/+2
| |\| | |
| | * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-161-8/+2
| | |\| |
| | | * | bugfix: imuxsock truncated head of received messageRainer Gerhards2012-10-161-8/+2
| | | * | fix problem with cutting first 16 characters from message with bAnnotate on m...Milan Bartos2012-10-101-1/+5
| | * | | change lumberjack cookie to "@cee" from "@cee "Rainer Gerhards2012-10-111-1/+1
* | | | | Merge branch 'beta'Rainer Gerhards2012-10-111-1/+1
|\| | | |
| * | | | Don't require the trailing space in @cee: cookieMiloslav Trmač2012-10-111-1/+1
* | | | | Merge branch 'beta'Rainer Gerhards2012-10-111-0/+6
|\| | | | | |_|_|/ |/| | |
| * | | added deprecated note to omrulesetRainer Gerhards2012-10-111-0/+6
* | | | Merge branch 'beta'Rainer Gerhards2012-10-042-6/+0
|\| | |
| * | | re-delete cust1.c plugin dummy fileRainer Gerhards2012-10-041-0/+0
| * | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-041-6/+0
| |\| |
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-041-6/+0
| | |\|
| | | * remove cust1 dummy plugin from build systemRainer Gerhards2012-10-041-6/+0
* | | | omlibdbi improvementsRainer Gerhards2012-10-041-26/+125
|/ / /
* | | get rid of compiler warningRainer Gerhards2012-10-021-4/+0
* | | cleanupRainer Gerhards2012-10-021-3/+0
* | | mmjsonparse: also add MSG part of message if CEE-parsing failsRainer Gerhards2012-10-021-10/+10
* | | Change mmjsonparse so non-json messages doesn't get lost from ceelogMilan Bartos2012-10-021-0/+9
* | | implement imtcp "permittedPeers" module-global parameterRainer Gerhards2012-10-011-4/+20
* | | implement string arrays for config objectsRainer Gerhards2012-10-011-18/+35
* | | somewhat better debug outputRainer Gerhards2012-09-282-2/+6
* | | Merge branch 'v6-devel'Rainer Gerhards2012-09-283-46/+205
|\ \ \
| * | | imtcp: implement support for module() parametersRainer Gerhards2012-09-281-38/+135
| * | | imptcp: implement support for module() parametersRainer Gerhards2012-09-271-7/+70
| * | | fix whitespace issueRainer Gerhards2012-09-271-1/+0
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-276-207/+908
|\| | |
| * | | bugfix: config errors did not always cause statement to failRainer Gerhards2012-09-271-7/+2
| * | | imfile: implement support for module parameters via module() stmtRainer Gerhards2012-09-271-9/+77
| * | | yet another nitfix...Rainer Gerhards2012-09-271-1/+1
| * | | nitfixRainer Gerhards2012-09-271-2/+2