Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-11 | 1 | -3/+1 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | fix compile problem on FreeBSD | Brad Davis | 2012-09-11 | 1 | -3/+1 | |
| | | | | ||||||
* | | | | doc nit: version in v7 compatibility doc | Rainer Gerhards | 2012-09-11 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | minor nit: version nbr in doc main index | Rainer Gerhards | 2012-09-11 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | preparing for 7.1.1 releasev7.1.1 | Rainer Gerhards | 2012-09-11 | 2 | -2/+7 | |
| | | | | ||||||
* | | | | new ruleengine: properly remove BSD-style blocks | Rainer Gerhards | 2012-09-11 | 8 | -192/+124 | |
| | | | | ||||||
* | | | | Fix length problem with _CMDLINE | Milan Bartos | 2012-09-11 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c | |||||
* | | | | correct library link order | Rainer Gerhards | 2012-09-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Thanks to Evgeny Turnaev for alerting us on the problem and providing hits to the solution. | |||||
* | | | | Merge branch 'master-newruleset' | Rainer Gerhards | 2012-09-10 | 14 | -535/+719 | |
|\ \ \ \ | ||||||
| * | | | | new ruleengine: fix memory leaks & a little cleanup | Rainer Gerhards | 2012-09-10 | 2 | -8/+5 | |
| | | | | | ||||||
| * | | | | new ruleengine: more cleanup | Rainer Gerhards | 2012-09-10 | 3 | -210/+3 | |
| | | | | | ||||||
| * | | | | new ruleengine: cleanup | Rainer Gerhards | 2012-09-07 | 2 | -54/+0 | |
| | | | | | ||||||
| * | | | | new ruleengine: properly freeing stmt tree | Rainer Gerhards | 2012-09-06 | 4 | -5/+53 | |
| | | | | | ||||||
| * | | | | new ruleengine: restore action iterator functionality | Rainer Gerhards | 2012-09-06 | 4 | -50/+41 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into master-newruleset | Rainer Gerhards | 2012-09-06 | 4 | -8/+12 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' into master-newruleset | Rainer Gerhards | 2012-09-06 | 8 | -9/+40 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsconf.c | |||||
| * | | | | | | new ruleengine: some cleanup | Rainer Gerhards | 2012-09-06 | 7 | -104/+4 | |
| | | | | | | | ||||||
| * | | | | | | new ruleengine: implement rainerscript execution engine | Rainer Gerhards | 2012-09-06 | 5 | -3/+282 | |
| | | | | | | | ||||||
| * | | | | | | switch ruleset.h to ASL 2.0 | Rainer Gerhards | 2012-09-04 | 1 | -15/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a single contribution from varmojfekoj, and that has been removed some time ago. So I am the sole copyright holder and can change the license. | |||||
| * | | | | | | new ruleengine: legacy action object properly constructed | Rainer Gerhards | 2012-09-04 | 3 | -6/+28 | |
| | | | | | | | ||||||
| * | | | | | | new ruleengine: v6+ action object properly constructed | Rainer Gerhards | 2012-09-04 | 3 | -1/+20 | |
| | | | | | | | ||||||
| * | | | | | | new ruleengine: PROP and PRI legacy filter structures properly created | Rainer Gerhards | 2012-09-04 | 7 | -100/+155 | |
| | | | | | | | ||||||
| * | | | | | | new ruleengine: skeleton for reading conf file in place | Rainer Gerhards | 2012-09-04 | 5 | -37/+46 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | code still does not work, actual functions not implemented | |||||
| * | | | | | | new ruleengine: script block correctly built | Rainer Gerhards | 2012-09-04 | 4 | -47/+83 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' into master-newruleset | Rainer Gerhards | 2012-09-04 | 4 | -38/+48 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | new ruleengine: add &-operator (legacy action list) | Rainer Gerhards | 2012-09-04 | 3 | -7/+11 | |
| | | | | | | | | ||||||
| * | | | | | | | new ruleengine: first code for stmt handling | Rainer Gerhards | 2012-09-04 | 4 | -21/+110 | |
| | | | | | | | | ||||||
| * | | | | | | | new ruleengine: first shot at grammar | Rainer Gerhards | 2012-09-03 | 2 | -15/+27 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-10 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| * | | | | | | | Add missing prototype for tplToJSON() | Rainer Gerhards | 2012-09-10 | 1 | -0/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | bugfix: string-generating templates caused abort if CEE field could not be found | Rainer Gerhards | 2012-09-10 | 2 | -3/+16 | |
| | | | | | | | | ||||||
* | | | | | | | | imuxsock: use CEE root for trusted properties | Rainer Gerhards | 2012-09-10 | 1 | -1/+4 | |
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | ... in order to keep in line with current lumberjack schema | |||||
* | | | | | | | preparing for 7.1.0v7.1.0 | Rainer Gerhards | 2012-09-06 | 3 | -3/+5 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-06 | 2 | -5/+7 | |
|\| | | | | | | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-06 | 2 | -5/+7 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| | * | | | | preparing for 6.4.1 releasev6.4.1 | Rainer Gerhards | 2012-09-06 | 4 | -7/+9 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-06 | 9 | -11/+56 | |
|\| | | | | | |_|_|/ / |/| | | | | ||||||
| * | | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-06 | 9 | -11/+56 | |
| |\| | | | ||||||
| | * | | | Fixed TCP CheckConnection handling in omfwd.c. | Andre Lorbach | 2012-08-25 | 7 | -9/+30 | |
| | | | | | | | | | | | | | | | | | | | | Interface needed to be changed in lower stream classes. Syslog TCP Sending is now resumed properly. | |||||
| | * | | | bugfix: omusrsmsg incorrect return state & config warning handling | Rainer Gerhards | 2012-08-28 | 3 | -2/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During config file processing, Omusrmsg often incorrectly returned a warning status, even when no warning was present (caused by uninitialized variable). Also, the core handled warning messages incorrectly, and treated them as errors. As a result, omusrmsg (most often) could not properly be loaded. Note that this only occurs with legacy config action syntax. This was a regression caused by an incorrect merge in to the 6.3.x codebase. Thanks to Stefano Mason for alerting us of this bug. | |||||
* | | | | | Fix reference counting | Miloslav Trmač | 2012-09-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adding a JSON object to the template output, make sure to increment its reference count. Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
* | | | | | Don't leak configuration value arrays | Miloslav Trmač | 2012-09-04 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
* | | | | | Don't leak property name | Miloslav Trmač | 2012-09-04 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
* | | | | | Free configuration objects after use | Miloslav Trmač | 2012-09-04 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
* | | | | | Don't store uninitialized data in trusted JSON properties | Miloslav Trmač | 2012-09-04 | 1 | -9/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing error handling. Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
* | | | | | Don't overload length as error code indicator in getTrusted* | Miloslav Trmač | 2012-09-04 | 1 | -12/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the return value to signal errors instead of overloading *lenProp == 0. Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
* | | | | | Fix a memory leak in "outname" | Miloslav Trmač | 2012-09-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In all cases, the variable already contains a newly allocated copy. Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
* | | | | | Free a temporary object for the "name" property | Miloslav Trmač | 2012-09-04 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a memory leak. Another option is to use cstrConstructFromESStr, but that would change semantics of NUL handling. Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
* | | | | | Set value of a mandatory JSON field to null | Miloslav Trmač | 2012-09-04 | 1 | -6/+1 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
* | | | | | bugfix: specifying json root in a template lead to abort | Rainer Gerhards | 2012-09-03 | 1 | -5/+13 | |
| |_|/ / |/| | | | | | | | | | | | Thanks to Miloslav Trmač for alerting us of this problem. |