summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-devel'Rainer Gerhards2012-09-2714-241/+1181
|\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c
| * Merge branch 'v6-devel-input' into v6-develRainer Gerhards2012-09-2716-244/+1173
| |\
| | * Do not load module if it had errorneous parametersRainer Gerhards2012-09-273-12/+58
| | |
| | * cosmetic: remove irrelevant compiler warningRainer Gerhards2012-09-271-1/+1
| | | | | | | | | | | | v7 does not even have this code any longer
| | * bugfix: config errors did not always cause statement to failRainer Gerhards2012-09-274-28/+114
| | | | | | | | | | | | This could lead to startup with invalid parameters.
| | * imfile: implement support for module parameters via module() stmtRainer Gerhards2012-09-272-9/+80
| | |
| | * 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
| | |
| | * cleanupRainer Gerhards2012-09-261-2/+0
| | |
| | * imtcp: implement support for input()Rainer Gerhards2012-09-261-10/+89
| | |
| | * cleanupRainer Gerhards2012-09-261-3/+0
| | |
| | * Implement input() support in imuxsockRainer Gerhards2012-09-261-10/+119
| | |
| | * Merge branch 'v6-stable' into v6-devel-inputRainer Gerhards2012-09-262-0/+9
| | |\
| | * | input stmt: add core engine plumbingRainer Gerhards2012-09-265-1/+96
| | | |
| | * | cleanupRainer Gerhards2012-09-261-2/+0
| | | |
* | | | preparing for 7.1.5v7.1.5Rainer Gerhards2012-09-263-5/+5
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-263-1/+9
|\| | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-262-0/+9
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-262-0/+9
| | |\ | | | | | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c
| | | * enable DNS resolution in imrelpApollon Oikonomopoulos2012-09-262-0/+9
| | | |
| * | | minor cleanupRainer Gerhards2012-09-251-1/+0
| | | |
* | | | fix invalid free in PoC == optimizationRainer Gerhards2012-09-251-1/+3
| | | |
* | | | slight optimization of == in string comparisonsRainer Gerhards2012-09-251-9/+17
| | | |
* | | | detect unreachable statements and emit warning messageRainer Gerhards2012-09-251-0/+3
| | | |
* | | | fix invalid state handling during action executionRainer Gerhards2012-09-252-3/+3
| | | | | | | | | | | | | | | | could lead to execution of not-to-be-executed action. very recent regression.
* | | | Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-254-5/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/modules.c
| * | | | fix invalid free caused by optimized script executionRainer Gerhards2012-09-254-3/+7
| | | | |
| * | | | Handle JSON value "null" instead of crashingMiloslav Trmač2012-09-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Future json-c versions will handle this transparently, for now we have to do it manually. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | | cosmetic: remove no-longer valid TODO itemRainer Gerhards2012-09-251-1/+0
| | | | |
* | | | | fix small memory leak during script optimizationRainer Gerhards2012-09-251-0/+2
| | | | |
* | | | | fix optimizer-introduced memleak in action destructionRainer Gerhards2012-09-253-63/+66
| | | | |
* | | | | Implement Script Optimizer: remove always-true PRIFILTRainer Gerhards2012-09-251-4/+44
| | | | |
* | | | | cleanup & better debug outputRainer Gerhards2012-09-243-33/+10
| | | | | | | | | | | | | | | | | | | | | | | | | - removed no longer needed function - debug log now contains action type for action objects
* | | | | Clean up implementation of omdiscard-->STOP optimizationRainer Gerhards2012-09-242-3/+13
| | | | |
* | | | | PoC: optimize omdicard --> STOPRainer Gerhards2012-09-243-3/+23
|/ / / /
* | | | doc: add recent changes to ChangeLogRainer Gerhards2012-09-241-0/+4
| | | |
* | | | Merge remote-tracking branch 'milan/imkmsg'Rainer Gerhards2012-09-247-0/+672
|\ \ \ \
| * | | | Documentation for new imkmsg moduleMilan Bartos2012-09-241-0/+48
| | | | | | | | | | | | | | | | | | | | new file: doc/imkmsg.html
| * | | | Remove unnecessary config options in imkmsgMilan Bartos2012-09-242-87/+2
| | | | | | | | | | | | | | | | | | | | | | | | | modified: plugins/imkmsg/imkmsg.c modified: plugins/imkmsg/kmsg.c
| * | | | Made imkmsg parse the messages instead of creating string to be parsed later.Milan Bartos2012-09-243-76/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: imkmsg.c modified: imkmsg.h modified: kmsg.c
| * | | | Modified comments.Milan Bartos2012-09-243-40/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: imkmsg.c modified: imkmsg.h modified: kmsg.c
| * | | | Added new module, imkmsg, for structured kernel logs from /dev/kmsg.Milan Bartos2012-09-246-0/+759
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is still in development, bute ready to be commited to master. modified: Makefile.am modified: configure.ac new file: plugins/imkmsg/Makefile.am new file: plugins/imkmsg/imkmsg.c new file: plugins/imkmsg/imkmsg.h new file: plugins/imkmsg/kmsg.c
* | | | | doc: Improve template system docRainer Gerhards2012-09-241-51/+151
|/ / / /
* | | | Fiddeling a bit with the template docFlorian Riedl2012-09-241-60/+111
| | | |
* | | | Merge branch 'v6-devel' into master-newrulesetRainer Gerhards2012-09-231-7/+0
|\| | |