summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
* | | Don't require the trailing space in @cee: cookieMiloslav Trmač2012-10-111-1/+1
* | | added deprecated note to omrulesetRainer Gerhards2012-10-111-0/+6
* | | 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
* | | 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
| * | | imfile: implement support for input()Rainer Gerhards2012-09-271-3/+78
| * | | milestone: port imfile to v6 config systemRainer Gerhards2012-09-262-149/+279
| * | | imrelp: implement support for input()Rainer Gerhards2012-09-261-10/+76
| * | | imudp: implement support for input()Rainer Gerhards2012-09-262-9/+84
| * | | imptcp: implement support for input()Rainer Gerhards2012-09-262-15/+119
| * | | imtcp: implement support for input()Rainer Gerhards2012-09-261-10/+89
| * | | Implement input() support in imuxsockRainer Gerhards2012-09-261-10/+119
| * | | Merge branch 'v6-stable' into v6-devel-inputRainer Gerhards2012-09-261-0/+7
| |\| |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-261-0/+7
|\ \ \ \
| * \ \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-261-0/+7
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-261-0/+7
| | |\|
| | | * enable DNS resolution in imrelpApollon Oikonomopoulos2012-09-261-0/+7
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-0/+0
| |\| |
| | * | preparing for 6.4.2 releaseRainer Gerhards2012-09-201-0/+0
| * | | bugfix: small memory leak in imdiagRainer Gerhards2012-09-201-0/+1
* | | | Handle JSON value "null" instead of crashingMiloslav Trmač2012-09-241-1/+3
* | | | Remove unnecessary config options in imkmsgMilan Bartos2012-09-242-87/+2
* | | | Made imkmsg parse the messages instead of creating string to be parsed later.Milan Bartos2012-09-243-76/+45