Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Simplify | Rainer Gerhards | 2012-09-20 | 1 | -4/+1 | |
| | | | ||||||
| * | | Added missing iRet handler code into CheckConnection() in netstrm.c | Andre Lorbach | 2012-09-20 | 1 | -1/+4 | |
| | | | ||||||
* | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-20 | 2 | -0/+8 | |
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| * | | doc: add last bugfix to ChangeLog | Rainer Gerhards | 2012-09-20 | 1 | -0/+5 | |
| | | | ||||||
| * | | Fix missing Sysklogd template | Milan Bartos | 2012-09-20 | 1 | -0/+3 | |
| | | | | | | | | | | | | modified: runtime/rsconf.c | |||||
* | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-20 | 2 | -1/+2 | |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * | | preparing for 6.4.2 releasev6.4.2 | Rainer Gerhards | 2012-09-20 | 4 | -3/+3 | |
| | | | ||||||
| * | | testbench: do not run tests requiring root privs if non-root | Rainer Gerhards | 2012-09-20 | 2 | -0/+8 | |
| | | | ||||||
| * | | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 2 | -0/+2 | |
| | | | ||||||
* | | | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 2 | -0/+2 | |
| | | | ||||||
* | | | testbench: do not run tests requiring root privs if non-root | Rainer Gerhards | 2012-09-20 | 2 | -0/+8 | |
| | | | ||||||
* | | | bugfix: small memory leak in imdiag | Rainer Gerhards | 2012-09-20 | 1 | -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 list | Rainer Gerhards | 2012-09-20 | 1 | -1/+4 | |
| | | | ||||||
* | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-19 | 3 | -2/+19 | |
|\| | | ||||||
| * | | bugfix: potential abort, if action queue could not be properly started | Rainer Gerhards | 2012-09-19 | 3 | -2/+19 | |
| | | | | | | | | | | | | This most importantly could happen due to configuration errors. | |||||
* | | | Free configuration objects after use | Miloslav Trmač | 2012-09-17 | 1 | -1/+2 | |
| | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
* | | | Fix other small memory leaks in template() processing | Rainer Gerhards | 2012-09-17 | 1 | -4/+7 | |
| | | | ||||||
* | | | bugfix: small memory leaks in template() statements | Rainer Gerhards | 2012-09-17 | 2 | -3/+12 | |
| | | | | | | | | | | | | | | | these were one-time memory leaks during startup, so they did NOT grow during runtime | |||||
* | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-14 | 5 | -3/+23 | |
|\| | | | | | | | | | | | | | | Conflicts: runtime/rule.c | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-14 | 1 | -1/+1 | |
| |\| | ||||||
| | * | Debug logging slightly improved | Rainer Gerhards | 2012-09-14 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix length calculation for script string constants | Rainer Gerhards | 2012-09-14 | 1 | -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 test | Rainer Gerhards | 2012-09-14 | 1 | -1/+1 | |
| | | | ||||||
| * | | Add test for script-based contains filter to testbench | Rainer Gerhards | 2012-09-14 | 3 | -0/+20 | |
| | | | ||||||
* | | | fix ChangeLog | Rainer Gerhards | 2012-09-13 | 1 | -3/+15 | |
| | | | | | | | | | | | | got messed-up during merge :-( | |||||
* | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-13 | 6 | -80/+254 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog grammar/rainerscript.c grammar/rainerscript.h runtime/rule.c | |||||
| * | | Fixing string unescaping (new code from this morning's commit) | Rainer Gerhards | 2012-09-13 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-13 | 2 | -78/+87 | |
| |\| | | | | | | | | | | | | | Conflicts: runtime/rule.c | |||||
| | * | bugfix: invalid property name in property-filter could cause abort | Rainer Gerhards | 2012-09-13 | 2 | -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 RainerScript | Rainer Gerhards | 2012-09-13 | 5 | -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 ChangeLog | Rainer Gerhards | 2012-09-12 | 1 | -3/+5 | |
| | | | ||||||
* | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-12 | 2 | -8/+10 | |
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-12 | 2 | -5/+11 | |
| |\| | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| | * | remove unused variables (if SCM_CREDENTIALS is not available) | Cristian Ionescu-Idbohrn | 2012-09-12 | 2 | -1/+9 | |
| | | | ||||||
| | * | imuxsock: remove incorrect socket option call | Cristian Ionescu-Idbohrn | 2012-09-12 | 1 | -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-stable | Rainer Gerhards | 2012-09-11 | 1 | -3/+1 | |
| |\| | ||||||
| | * | fix compile problem on FreeBSD | Brad Davis | 2012-09-11 | 1 | -3/+1 | |
| | | | ||||||
* | | | forward-compatibility patch for $ruleset processing | Rainer Gerhards | 2012-09-12 | 2 | -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. | |||||
* | | | Add missing prototype for tplToJSON() | Rainer Gerhards | 2012-09-10 | 1 | -0/+2 | |
| | | | ||||||
* | | | 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-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. | |||||
* | | | switch field default to "mandatory" and implement that mode | Rainer Gerhards | 2012-08-30 | 3 | -14/+19 | |
| | | | ||||||
* | | | add capability to specify "optional" attribute for list-type templates, too | Rainer Gerhards | 2012-08-29 | 1 | -0/+5 | |
| | | | ||||||
* | | | Add support for optional fields | Miloslav Trmač | 2012-08-29 | 3 | -0/+10 | |
| | | | ||||||
* | | | default outname for $!<property> is now without $! prefix | Rainer Gerhards | 2012-08-29 | 4 | -31/+42 | |
| | | | | | | | | | | | | also some type cleanup and simplification | |||||
* | | | milestone: ommongodb supports templates & JSON passing API in place | Rainer Gerhards | 2012-08-29 | 2 | -15/+10 | |
| | | | ||||||
* | | | adapted Mirek's changes to new JSON passing mode | Rainer Gerhards | 2012-08-29 | 4 | -50/+27 | |
| | | | | | | | | | | | | | | | now the complete code (JSON passing & ommongodb) could be tested and passed the module tests made during development |