Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Implement RainerScript ruleset() statement | Rainer Gerhards | 2012-09-28 | 1 | -0/+1 |
| | |||||
* | fix screwed-up ChangeLog | Rainer Gerhards | 2012-09-28 | 1 | -12/+8 |
| | |||||
* | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-27 | 1 | -0/+14 |
|\ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c | ||||
| * | bugfix: config errors did not always cause statement to fail | Rainer Gerhards | 2012-09-27 | 1 | -0/+2 |
| | | | | | | | | This could lead to startup with invalid parameters. | ||||
| * | imfile: implement support for module parameters via module() stmt | Rainer Gerhards | 2012-09-27 | 1 | -0/+3 |
| | | |||||
| * | Merge branch 'v6-stable' into v6-devel-input | Rainer Gerhards | 2012-09-26 | 1 | -0/+2 |
| |\ | |||||
* | | | preparing for 7.1.5v7.1.5 | Rainer Gerhards | 2012-09-26 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-26 | 1 | -0/+2 |
|\ \ \ | |||||
| * \ \ | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-26 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-26 | 1 | -0/+2 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c | ||||
| | | * | enable DNS resolution in imrelp | Apollon Oikonomopoulos | 2012-09-26 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-21 | 1 | -0/+4 |
| |\| | | |||||
* | | | | doc: add recent changes to ChangeLog | Rainer Gerhards | 2012-09-24 | 1 | -0/+4 |
| | | | | |||||
* | | | | Merge branch 'v6-stable' into master-newruleset | Rainer Gerhards | 2012-09-21 | 1 | -0/+4 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: grammar/lexer.l | ||||
| * | | | bugfix: some valid legacy PRI filters were flagged as errornous | Rainer Gerhards | 2012-09-21 | 1 | -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() function | Rainer Gerhards | 2012-09-20 | 1 | -0/+5 |
| | | | | |||||
* | | | | Implement RainerScript field() function | Rainer Gerhards | 2012-09-20 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-20 | 1 | -0/+5 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-20 | 1 | -0/+5 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | doc: add last bugfix to ChangeLog | Rainer Gerhards | 2012-09-20 | 1 | -0/+5 |
| | | | | |||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-20 | 1 | -1/+3 |
|\| | | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-20 | 1 | -1/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | preparing for 6.4.2 releasev6.4.2 | Rainer Gerhards | 2012-09-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
| | | | | |||||
| * | | | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-19 | 1 | -0/+2 |
|\| | | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-19 | 1 | -0/+2 |
| |\| | | |||||
| | * | | bugfix: potential abort, if action queue could not be properly started | Rainer Gerhards | 2012-09-19 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | This most importantly could happen due to configuration errors. | ||||
* | | | | preparing for 7.1.4 releasev7.1.4 | Rainer Gerhards | 2012-09-19 | 1 | -3/+5 |
| | | | | |||||
* | | | | bugfix: debug output indicated improper queue type | Rainer Gerhards | 2012-09-19 | 1 | -0/+1 |
| | | | | |||||
* | | | | bugfix: omfile action did not respect "template" parameter | Rainer Gerhards | 2012-09-19 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | ... and used default template in all cases | ||||
* | | | | Implement ability for CEE-based properties to be stored in disk queues | Rainer Gerhards | 2012-09-19 | 1 | -1/+2 |
| | | | | |||||
* | | | | doc: announce new features in ChangeLog | Rainer Gerhards | 2012-09-19 | 1 | -0/+2 |
| | | | | |||||
* | | | | bugfix: MsgDup() did not copy CEE structure | Rainer Gerhards | 2012-09-19 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | This function was called at various places, most importantly during "last messages repeated n times" processing and omruleset. If CEE(JSON) data was present, it was lost as part of the copy process. | ||||
* | | | | preparing for 7.1.3 releasev7.1.3 | Rainer Gerhards | 2012-09-17 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-17 | 1 | -0/+3 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: template.c | ||||
| * | | | bugfix: small memory leaks in template() statements | Rainer Gerhards | 2012-09-17 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | these were one-time memory leaks during startup, so they did NOT grow during runtime | ||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-13 | 1 | -0/+36 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | fix ChangeLog | Rainer Gerhards | 2012-09-13 | 1 | -3/+15 |
| | | | | | | | | | | | | | | | | got messed-up during merge :-( | ||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-13 | 1 | -0/+15 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog grammar/rainerscript.c grammar/rainerscript.h runtime/rule.c | ||||
| | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-13 | 1 | -0/+4 |
| | |\| | | | | | | | | | | | | | | | | | Conflicts: runtime/rule.c | ||||
| | | * | bugfix: invalid property name in property-filter could cause abort | Rainer Gerhards | 2012-09-13 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | ...if action chaining (& operator) was used http://bugzilla.adiscon.com/show_bug.cgi?id=355 Thanks to pilou@gmx.com for the bug report | ||||
| | * | | bugfix: missing support for escape sequences in RainerScript | Rainer Gerhards | 2012-09-13 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only \' was supported. Now the usual set is supported. Note that v5 used \x as escape where x was any character (e.g. "\n" meant "n" and NOT LF). This also means there is some incompatibility to v5 for well-know sequences. Better break it now than later. | ||||
| | * | | nit: correct messed-up ChangeLog | Rainer Gerhards | 2012-09-12 | 1 | -3/+5 |
| | | | | |||||
* | | | | preparing for 7.1.2 releasev7.1.2 | Rainer Gerhards | 2012-09-12 | 1 | -0/+9 |
| | | | | |||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-12 | 1 | -0/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: grammar/grammar.y grammar/lexer.l | ||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-12 | 1 | -0/+4 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-12 | 1 | -0/+6 |
| | |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | | * | remove unused variables (if SCM_CREDENTIALS is not available) | Cristian Ionescu-Idbohrn | 2012-09-12 | 1 | -0/+4 |
| | | | | |||||
* | | | | preparing for 7.1.1 releasev7.1.1 | Rainer Gerhards | 2012-09-11 | 1 | -1/+6 |
| | | | |