Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add new tool "logctl" to access lumberjack logs in MongoDB | Ulrike Gerhards | 2012-10-02 | 1 | -0/+456 |
| | |||||
* | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-02 | 2 | -1/+3 |
|\ | |||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-02 | 1 | -2/+2 |
| |\ | |||||
| | * | minor: disable debug support in complex1.sh test | Rainer Gerhards | 2012-10-02 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-02 | 3 | -3/+5 |
| |\| | |||||
| | * | cleanup | Rainer Gerhards | 2012-10-02 | 1 | -1/+1 |
| | | | |||||
| | * | bugfix: fixed wrong bufferlength for snprintf in tcpflood.c | Andre Lorbach | 2012-09-28 | 3 | -3/+5 |
| | | | | | | | | | | | | | | | The problem occured when using the -f (dynafiles) option, and caused some tests to fail. | ||||
* | | | Merge branch 'v6-devel-input' into v6-devel | Rainer Gerhards | 2012-09-28 | 8 | -153/+578 |
|\ \ \ | |||||
| * | | | doc: update module doc to new config format | Florian Riedl | 2012-09-28 | 5 | -107/+373 |
| | | | | |||||
| * | | | imtcp: implement support for module() parameters | Rainer Gerhards | 2012-09-28 | 1 | -38/+135 |
| | | | | |||||
| * | | | imptcp: implement support for module() parameters | Rainer Gerhards | 2012-09-27 | 1 | -7/+70 |
| | | | | |||||
| * | | | fix whitespace issue | Rainer Gerhards | 2012-09-27 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge branch 'v6-devel-input' into v6-devel | Rainer Gerhards | 2012-09-27 | 16 | -244/+1173 |
|\| | | | |||||
| * | | | Do not load module if it had errorneous parameters | Rainer Gerhards | 2012-09-27 | 3 | -12/+58 |
| | | | | |||||
| * | | | cosmetic: remove irrelevant compiler warning | Rainer Gerhards | 2012-09-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | v7 does not even have this code any longer | ||||
| * | | | bugfix: config errors did not always cause statement to fail | Rainer Gerhards | 2012-09-27 | 4 | -28/+114 |
| | | | | | | | | | | | | | | | | This could lead to startup with invalid parameters. | ||||
| * | | | imfile: implement support for module parameters via module() stmt | Rainer Gerhards | 2012-09-27 | 2 | -9/+80 |
| | | | | |||||
| * | | | yet another nitfix... | Rainer Gerhards | 2012-09-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | nitfix | Rainer Gerhards | 2012-09-27 | 1 | -2/+2 |
| | | | | |||||
| * | | | imfile: implement support for input() | Rainer Gerhards | 2012-09-27 | 1 | -3/+78 |
| | | | | |||||
| * | | | milestone: port imfile to v6 config system | Rainer Gerhards | 2012-09-26 | 2 | -149/+279 |
| | | | | |||||
| * | | | imrelp: implement support for input() | Rainer Gerhards | 2012-09-26 | 1 | -10/+76 |
| | | | | |||||
| * | | | imudp: implement support for input() | Rainer Gerhards | 2012-09-26 | 2 | -9/+84 |
| | | | | |||||
| * | | | imptcp: implement support for input() | Rainer Gerhards | 2012-09-26 | 2 | -15/+119 |
| | | | | |||||
| * | | | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -2/+0 |
| | | | | |||||
| * | | | imtcp: implement support for input() | Rainer Gerhards | 2012-09-26 | 1 | -10/+89 |
| | | | | |||||
| * | | | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -3/+0 |
| | | | | |||||
| * | | | Implement input() support in imuxsock | Rainer Gerhards | 2012-09-26 | 1 | -10/+119 |
| | | | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel-input | Rainer Gerhards | 2012-09-26 | 2 | -0/+9 |
| |\| | | |||||
| * | | | input stmt: add core engine plumbing | Rainer Gerhards | 2012-09-26 | 5 | -1/+96 |
| | | | | |||||
| * | | | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -2/+0 |
| | | | | |||||
* | | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-26 | 2 | -0/+9 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-26 | 2 | -0/+9 |
| |\| | | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c | ||||
| | * | enable DNS resolution in imrelp | Apollon Oikonomopoulos | 2012-09-26 | 2 | -0/+9 |
| | | | |||||
* | | | minor cleanup | Rainer Gerhards | 2012-09-25 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-23 | 1 | -7/+0 |
|\| | | | | | | | | | | | | | | Conflicts: runtime/glbl.c | ||||
| * | | Remove no longer needed function | Rainer Gerhards | 2012-09-23 | 1 | -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-devel | Rainer Gerhards | 2012-09-21 | 2 | -1/+5 |
|\| | | |||||
| * | | Implemented different grammar for pri filters | Rainer Gerhards | 2012-09-21 | 1 | -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 errornous | Rainer Gerhards | 2012-09-21 | 2 | -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-devel | Rainer Gerhards | 2012-09-20 | 1 | -1/+1 |
|\| | | |||||
| * | | 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 |
| | | |