summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | another small cleanupRainer Gerhards2012-09-121-1/+0
| | | |
* | | | bugfix: abort when invalid property name was configuredRainer Gerhards2012-09-122-1/+7
| | | |
* | | | cleanupRainer Gerhards2012-09-121-1/+1
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-123-6/+10
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: grammar/grammar.y grammar/lexer.l
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-122-8/+10
| |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-122-5/+11
| | |\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * remove unused variables (if SCM_CREDENTIALS is not available)Cristian Ionescu-Idbohrn2012-09-122-1/+9
| | | |
| | | * imuxsock: remove incorrect socket option callCristian Ionescu-Idbohrn2012-09-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SCM_CREDENTIALS is not a socket option; its value is usually 0x2 which on most archs corresponds to socket option SO_REUSEADDR, but on mips-arch there is no socket option with value 0x2 and SO_REUSEADDR = 0x4, so the call will fail with ENOPROTOOPT 'Protocol not available'; skip it. There does not seem any other special setsockopt call is needed anyway, besides the above. In addition Jonny Törnbom commented: SCM_CREDENTIALS is a control message type, not a socket option, so using setsockopt(...SCM_CREDENTIALS...) is potentially dangerous and wrong and should be deleted from the code. (SCM_CREDENTIALS is used in conjuction with SO_PASSCRED which is the socket option to use.)
| * | | forward-compatibility patch for $ruleset processingRainer Gerhards2012-09-122-0/+5
| | | | | | | | | | | | | | | | | | | | v7 needs a different handling, it's easer in the long term if we introduce this in v6 as well. Non-intrusive change.
* | | | new ruleengine: properly handle $ruleset directiveRainer Gerhards2012-09-123-4/+9
| | | |
* | | | new ruleengine: fixed action handling in regard to filtersRainer Gerhards2012-09-124-78/+76
| | | | | | | | | | | | | | | | This was not yet adapted to the new "active" structure.
* | | | new ruleengine: bugfix, messages were processed multiple timesRainer Gerhards2012-09-121-10/+2
| | | |
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-09-111-3/+1
|\ \ \ \ | | |/ / | |/| |
| * | | 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
|\| | | | | | |_|_|/ / |/| | | |