summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Implement input() support in imuxsockRainer Gerhards2012-09-261-10/+119
|
* Merge branch 'v6-stable' into v6-devel-inputRainer 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
| | |
* | | input stmt: add core engine plumbingRainer Gerhards2012-09-265-1/+96
| | |
* | | cleanupRainer Gerhards2012-09-261-2/+0
| | |
* | | minor cleanupRainer Gerhards2012-09-251-1/+0
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-231-7/+0
|\| | | | | | | | | | | | | | Conflicts: runtime/glbl.c
| * | Remove no longer needed functionRainer Gerhards2012-09-231-5/+0
| | | | | | | | | | | | | | | | | | Thanks to Andreas Stieger from Novell/SUSE for alerting us. This function was introduced as part of the new config system, but never was actually used (aka "not needed").
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-212-1/+5
|\| |
| * | Implemented different grammar for pri filtersRainer Gerhards2012-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The method introduced by the previous commit caused issues in v7 as it was too generic. Most importantly, it permitted simple words (like "stop") to (invalidly) be detected as pri filters. Now, the grammar is close to the initial one, and each pri filter must at least have a comma or a period inside it, which does not conflict with simple words.
| * | bugfix: some valid legacy PRI filters were flagged as errornousRainer Gerhards2012-09-212-1/+5
| | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-1/+1
|\| |
| * | SimplifyRainer Gerhards2012-09-201-4/+1
| | |
| * | Added missing iRet handler code into CheckConnection() in netstrm.cAndre Lorbach2012-09-201-1/+4
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-202-0/+8
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | doc: add last bugfix to ChangeLogRainer Gerhards2012-09-201-0/+5
| | |
| * | Fix missing Sysklogd templateMilan Bartos2012-09-201-0/+3
| | | | | | | | | | | | modified: runtime/rsconf.c
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-202-1/+2
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | preparing for 6.4.2 releasev6.4.2Rainer Gerhards2012-09-204-3/+3
| | |
| * | testbench: do not run tests requiring root privs if non-rootRainer Gerhards2012-09-202-0/+8
| | |
| * | bugfix: config validation run did not always return correct return stateRainer Gerhards2012-09-202-0/+2
| | |
* | | bugfix: config validation run did not always return correct return stateRainer Gerhards2012-09-202-0/+2
| | |
* | | testbench: do not run tests requiring root privs if non-rootRainer Gerhards2012-09-202-0/+8
| | |
* | | bugfix: small memory leak in imdiagRainer Gerhards2012-09-201-0/+1
| | | | | | | | | | | | | | | This does not have any practical problems associated with it, EXCECPT that it caused almost all valgrind testbench tests to fail.
* | | doc: add new functions to RainerScript function listRainer Gerhards2012-09-201-1/+4
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-193-2/+19
|\| |
| * | bugfix: potential abort, if action queue could not be properly startedRainer Gerhards2012-09-193-2/+19
| | | | | | | | | | | | This most importantly could happen due to configuration errors.
* | | Free configuration objects after useMiloslav Trmač2012-09-171-1/+2
| | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | Fix other small memory leaks in template() processingRainer Gerhards2012-09-171-4/+7
| | |
* | | bugfix: small memory leaks in template() statementsRainer Gerhards2012-09-172-3/+12
| | | | | | | | | | | | | | | these were one-time memory leaks during startup, so they did NOT grow during runtime
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-145-3/+23
|\| | | | | | | | | | | | | | Conflicts: runtime/rule.c
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-141-1/+1
| |\|
| | * Debug logging slightly improvedRainer Gerhards2012-09-141-1/+1
| | |
| * | Fix length calculation for script string constantsRainer Gerhards2012-09-141-2/+2
| | | | | | | | | | | | | | | | | | This could lead to various problems, like if-filters not working. Note this is a regression from yesterdays escape fix, so there exist no released version with this problem.
| * | Fix new testbench testRainer Gerhards2012-09-141-1/+1
| | |
| * | Add test for script-based contains filter to testbenchRainer Gerhards2012-09-143-0/+20
| | |
* | | fix ChangeLogRainer Gerhards2012-09-131-3/+15
| | | | | | | | | | | | got messed-up during merge :-(
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-136-80/+254
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog grammar/rainerscript.c grammar/rainerscript.h runtime/rule.c
| * | Fixing string unescaping (new code from this morning's commit)Rainer Gerhards2012-09-131-1/+1
| | |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-132-78/+87
| |\| | | | | | | | | | | | | Conflicts: runtime/rule.c
| | * bugfix: invalid property name in property-filter could cause abortRainer Gerhards2012-09-132-56/+67
| | | | | | | | | | | | | | | | | | ...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 RainerScriptRainer Gerhards2012-09-135-2/+162
| | | | | | | | | | | | | | | | | | | | | 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 ChangeLogRainer Gerhards2012-09-121-3/+5
| | |
* | | 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.)
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-111-3/+1
| |\|
| | * fix compile problem on FreeBSDBrad Davis2012-09-111-3/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 16:12:40 +0000