summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-111-3/+1
| |\ \ \ | | | |/ | | |/|
| | * | fix compile problem on FreeBSDBrad Davis2012-09-111-3/+1
| | | |
* | | | doc nit: version in v7 compatibility docRainer Gerhards2012-09-111-1/+1
| | | |
* | | | minor nit: version nbr in doc main indexRainer Gerhards2012-09-111-1/+1
| | | |
* | | | preparing for 7.1.1 releasev7.1.1Rainer Gerhards2012-09-112-2/+7
| | | |
* | | | new ruleengine: properly remove BSD-style blocksRainer Gerhards2012-09-118-192/+124
| | | |
* | | | Fix length problem with _CMDLINEMilan Bartos2012-09-111-3/+3
| | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
* | | | correct library link orderRainer Gerhards2012-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | Thanks to Evgeny Turnaev for alerting us on the problem and providing hits to the solution.
* | | | Merge branch 'master-newruleset'Rainer Gerhards2012-09-1014-535/+719
|\ \ \ \
| * | | | new ruleengine: fix memory leaks & a little cleanupRainer Gerhards2012-09-102-8/+5
| | | | |
| * | | | new ruleengine: more cleanupRainer Gerhards2012-09-103-210/+3
| | | | |
| * | | | new ruleengine: cleanupRainer Gerhards2012-09-072-54/+0
| | | | |
| * | | | new ruleengine: properly freeing stmt treeRainer Gerhards2012-09-064-5/+53
| | | | |
| * | | | new ruleengine: restore action iterator functionalityRainer Gerhards2012-09-064-50/+41
| | | | |
| * | | | Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-064-8/+12
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-068-9/+40
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsconf.c
| * | | | | | new ruleengine: some cleanupRainer Gerhards2012-09-067-104/+4
| | | | | | |
| * | | | | | new ruleengine: implement rainerscript execution engineRainer Gerhards2012-09-065-3/+282
| | | | | | |
| * | | | | | switch ruleset.h to ASL 2.0Rainer Gerhards2012-09-041-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 constructedRainer Gerhards2012-09-043-6/+28
| | | | | | |
| * | | | | | new ruleengine: v6+ action object properly constructedRainer Gerhards2012-09-043-1/+20
| | | | | | |
| * | | | | | new ruleengine: PROP and PRI legacy filter structures properly createdRainer Gerhards2012-09-047-100/+155
| | | | | | |
| * | | | | | new ruleengine: skeleton for reading conf file in placeRainer Gerhards2012-09-045-37/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | code still does not work, actual functions not implemented
| * | | | | | new ruleengine: script block correctly builtRainer Gerhards2012-09-044-47/+83
| | | | | | |
| * | | | | | Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-044-38/+48
| |\ \ \ \ \ \
| * | | | | | | new ruleengine: add &-operator (legacy action list)Rainer Gerhards2012-09-043-7/+11
| | | | | | | |
| * | | | | | | new ruleengine: first code for stmt handlingRainer Gerhards2012-09-044-21/+110
| | | | | | | |
| * | | | | | | new ruleengine: first shot at grammarRainer Gerhards2012-09-032-15/+27
| | | | | | | |
* | | | | | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-101-0/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Add missing prototype for tplToJSON()Rainer Gerhards2012-09-101-0/+2
| | | | | | | |
* | | | | | | | bugfix: string-generating templates caused abort if CEE field could not be foundRainer Gerhards2012-09-102-3/+16
| | | | | | | |
* | | | | | | | imuxsock: use CEE root for trusted propertiesRainer Gerhards2012-09-101-1/+4
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | ... in order to keep in line with current lumberjack schema
* | | | | | | preparing for 7.1.0v7.1.0Rainer Gerhards2012-09-063-3/+5
| | | | | | |
* | | | | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-062-5/+7
|\| | | | | | | |_|_|/ / / |/| | | | |
| * | | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-062-5/+7
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | preparing for 6.4.1 releasev6.4.1Rainer Gerhards2012-09-064-7/+9
| | | | | |
* | | | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-069-11/+56
|\| | | | | | |_|_|/ / |/| | | |
| * | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-069-11/+56
| |\| | |
| | * | | Fixed TCP CheckConnection handling in omfwd.c.Andre Lorbach2012-08-257-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 handlingRainer Gerhards2012-08-283-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 countingMiloslav Trmač2012-09-041-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 arraysMiloslav Trmač2012-09-041-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | | Don't leak property nameMiloslav Trmač2012-09-041-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | | Free configuration objects after useMiloslav Trmač2012-09-041-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | | Don't store uninitialized data in trusted JSON propertiesMiloslav Trmač2012-09-041-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-041-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-041-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" propertyMiloslav Trmač2012-09-041-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 nullMiloslav Trmač2012-09-041-6/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | | bugfix: specifying json root in a template lead to abortRainer Gerhards2012-09-031-5/+13
| |_|/ / |/| | | | | | | | | | | Thanks to Miloslav Trmač for alerting us of this problem.