summaryrefslogtreecommitdiffstats
path: root/ChangeLog
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-stable' into betaRainer Gerhards2012-10-041-0/+1
|\ | | | | | | | | Conflicts: plugins/cust1/Makefile.am
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-041-0/+1
| |\
| | * remove cust1 dummy plugin from build systemRainer Gerhards2012-10-041-0/+1
| | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for identifying this as the culprit for several build-related issues. The plugin is a placeholder, and was not used for quite some while. It is definitely not worth the effort to keep it along. If needed, can be quickly created.
* | | doc: add missing files to distribution tarballRainer Gerhards2012-10-041-0/+3
| | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem.
* | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-041-0/+1
|\| |
| * | bugfix: comments inside objects (e.g. action()) were not properly handledRainer Gerhards2012-10-041-0/+1
| | |
* | | prepare for 7.1.8 releasev7.1.8Rainer Gerhards2012-10-021-4/+4
| | |
* | | add "parser" parameter to ruleset(), so that parser chain can be configuredRainer Gerhards2012-10-021-0/+2
| | |
* | | Merge branch 'v6-devel'Rainer Gerhards2012-10-021-0/+1
|\ \ \
| * | | integrate logctl into build processRainer Gerhards2012-10-021-0/+1
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-10-021-0/+2
|\| | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-021-0/+2
| |\| |
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-021-0/+2
| | |\|
| | | * bugfix: fixed wrong bufferlength for snprintf in tcpflood.cAndre Lorbach2012-09-281-0/+2
| | | | | | | | | | | | | | | | | | | | The problem occured when using the -f (dynafiles) option, and caused some tests to fail.
* | | | minor: mention better doc in ChangeLogRainer Gerhards2012-10-021-0/+1
| | | |
* | | | implement "continue" RainerScript statementRainer Gerhards2012-10-011-0/+1
| | | |
* | | | bugfix: ruleset(){} directive errornously changed default rulesetRainer Gerhards2012-10-011-0/+5
| | | | | | | | | | | | | | | | | | | | much like the $ruleset legacy conf statement. This potentially lead to statements being assigned to the wrong ruleset.
* | | | preparing for 7.1.7 releasev7.1.7Rainer Gerhards2012-10-011-1/+1
| | | |
* | | | implement RainerScript "call" statementRainer Gerhards2012-10-011-0/+1
| | | |
* | | | implement imtcp "permittedPeers" module-global parameterRainer Gerhards2012-10-011-0/+2
| | | |
* | | | Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-281-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | preparing for 7.1.6 releasev7.1.6Rainer Gerhards2012-09-281-1/+5
| | | | |
* | | | | implement RainerScript array-based string comparison operationsRainer Gerhards2012-09-281-0/+3
|/ / / /
* | | | Implement RainerScript ruleset() statementRainer Gerhards2012-09-281-0/+1
| | | |
* | | | fix screwed-up ChangeLogRainer Gerhards2012-09-281-12/+8
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-271-0/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c
| * | | bugfix: config errors did not always cause statement to failRainer Gerhards2012-09-271-0/+2
| | | | | | | | | | | | | | | | This could lead to startup with invalid parameters.
| * | | imfile: implement support for module parameters via module() stmtRainer Gerhards2012-09-271-0/+3
| | | |
| * | | Merge branch 'v6-stable' into v6-devel-inputRainer Gerhards2012-09-261-0/+2
| |\| |
* | | | preparing for 7.1.5v7.1.5Rainer Gerhards2012-09-261-3/+3
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-261-0/+2
|\ \ \ \
| * \ \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-261-0/+2
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-261-0/+2
| | |\| | | | | | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c
| | | * enable DNS resolution in imrelpApollon Oikonomopoulos2012-09-261-0/+2
| | | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-211-0/+4
| |\| |
* | | | doc: add recent changes to ChangeLogRainer Gerhards2012-09-241-0/+4
| | | |
* | | | Merge branch 'v6-stable' into master-newrulesetRainer Gerhards2012-09-211-0/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: grammar/lexer.l
| * | | bugfix: some valid legacy PRI filters were flagged as errornousRainer Gerhards2012-09-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=358 This happend to filters of the style "local0,local1.*", where the multiple facilities were comma-separated.
* | | | Implement RainerScript prifield() functionRainer Gerhards2012-09-201-0/+5
| | | |
* | | | Implement RainerScript field() functionRainer Gerhards2012-09-201-0/+3
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-201-0/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-0/+5
| |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | doc: add last bugfix to ChangeLogRainer Gerhards2012-09-201-0/+5
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-201-1/+3
|\| | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | preparing for 6.4.2 releasev6.4.2Rainer Gerhards2012-09-201-1/+1
| | | |
| | * | bugfix: config validation run did not always return correct return stateRainer Gerhards2012-09-201-0/+1
| | | |
| * | | bugfix: config validation run did not always return correct return stateRainer Gerhards2012-09-201-0/+1
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-191-0/+2
|\| | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-191-0/+2
| |\| |