summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | input stmt: add core engine plumbingRainer Gerhards2012-09-265-1/+96
| * | | cleanupRainer Gerhards2012-09-261-2/+0
* | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-262-0/+9
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-262-0/+9
| |\|
| | * enable DNS resolution in imrelpApollon Oikonomopoulos2012-09-262-0/+9
* | | minor cleanupRainer Gerhards2012-09-251-1/+0
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-231-7/+0
|\| |
| * | Remove no longer needed functionRainer Gerhards2012-09-231-5/+0
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-212-1/+5
|\| |
| * | Implemented different grammar for pri filtersRainer Gerhards2012-09-211-1/+1
| * | bugfix: some valid legacy PRI filters were flagged as errornousRainer Gerhards2012-09-212-1/+5
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-1/+1
|\| |
| * | SimplifyRainer Gerhards2012-09-201-4/+1
| * | Added missing iRet handler code into CheckConnection() in netstrm.cAndre Lorbach2012-09-201-1/+4
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-202-0/+8
|\| |
| * | doc: add last bugfix to ChangeLogRainer Gerhards2012-09-201-0/+5
| * | Fix missing Sysklogd templateMilan Bartos2012-09-201-0/+3
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-202-1/+2
|\| |
| * | preparing for 6.4.2 releasev6.4.2Rainer Gerhards2012-09-204-3/+3
| * | testbench: do not run tests requiring root privs if non-rootRainer Gerhards2012-09-202-0/+8
| * | bugfix: config validation run did not always return correct return stateRainer Gerhards2012-09-202-0/+2
* | | bugfix: config validation run did not always return correct return stateRainer Gerhards2012-09-202-0/+2
* | | testbench: do not run tests requiring root privs if non-rootRainer Gerhards2012-09-202-0/+8
* | | bugfix: small memory leak in imdiagRainer Gerhards2012-09-201-0/+1
* | | doc: add new functions to RainerScript function listRainer Gerhards2012-09-201-1/+4
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-193-2/+19
|\| |
| * | bugfix: potential abort, if action queue could not be properly startedRainer Gerhards2012-09-193-2/+19
* | | Free configuration objects after useMiloslav Trmač2012-09-171-1/+2
* | | Fix other small memory leaks in template() processingRainer Gerhards2012-09-171-4/+7
* | | bugfix: small memory leaks in template() statementsRainer Gerhards2012-09-172-3/+12
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-145-3/+23
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-141-1/+1
| |\|
| | * Debug logging slightly improvedRainer Gerhards2012-09-141-1/+1
| * | Fix length calculation for script string constantsRainer Gerhards2012-09-141-2/+2
| * | Fix new testbench testRainer Gerhards2012-09-141-1/+1
| * | Add test for script-based contains filter to testbenchRainer Gerhards2012-09-143-0/+20
* | | fix ChangeLogRainer Gerhards2012-09-131-3/+15
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-136-80/+254
|\| |
| * | Fixing string unescaping (new code from this morning's commit)Rainer Gerhards2012-09-131-1/+1
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-132-78/+87
| |\|
| | * bugfix: invalid property name in property-filter could cause abortRainer Gerhards2012-09-132-56/+67
| * | bugfix: missing support for escape sequences in RainerScriptRainer Gerhards2012-09-135-2/+162
| * | nit: correct messed-up ChangeLogRainer Gerhards2012-09-121-3/+5
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-122-8/+10
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-122-5/+11
| |\|
| | * remove unused variables (if SCM_CREDENTIALS is not available)Cristian Ionescu-Idbohrn2012-09-122-1/+9
| | * imuxsock: remove incorrect socket option callCristian Ionescu-Idbohrn2012-09-121-4/+0
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-111-3/+1
| |\|
| | * fix compile problem on FreeBSDBrad Davis2012-09-111-3/+1
* | | forward-compatibility patch for $ruleset processingRainer Gerhards2012-09-122-0/+5