Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-27 | 6 | -207/+908 |
|\ | |||||
| * | bugfix: config errors did not always cause statement to fail | Rainer Gerhards | 2012-09-27 | 1 | -7/+2 |
| * | imfile: implement support for module parameters via module() stmt | Rainer Gerhards | 2012-09-27 | 1 | -9/+77 |
| * | 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 |
| * | imtcp: implement support for input() | Rainer Gerhards | 2012-09-26 | 1 | -10/+89 |
| * | 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 | 1 | -0/+7 |
| |\ | |||||
* | \ | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-26 | 1 | -0/+7 |
|\ \ \ | |||||
| * \ \ | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-26 | 1 | -0/+7 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-26 | 1 | -0/+7 |
| | |\ | |||||
| | | * | enable DNS resolution in imrelp | Apollon Oikonomopoulos | 2012-09-26 | 1 | -0/+7 |
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-20 | 1 | -0/+0 |
| |\| | | |||||
| | * | | preparing for 6.4.2 releasev6.4.2 | Rainer Gerhards | 2012-09-20 | 1 | -0/+0 |
| * | | | bugfix: small memory leak in imdiag | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
* | | | | Handle JSON value "null" instead of crashing | Miloslav Trmač | 2012-09-24 | 1 | -1/+3 |
* | | | | Remove unnecessary config options in imkmsg | Milan Bartos | 2012-09-24 | 2 | -87/+2 |
* | | | | Made imkmsg parse the messages instead of creating string to be parsed later. | Milan Bartos | 2012-09-24 | 3 | -76/+45 |
* | | | | Modified comments. | Milan Bartos | 2012-09-24 | 3 | -40/+21 |
* | | | | Added new module, imkmsg, for structured kernel logs from /dev/kmsg. | Milan Bartos | 2012-09-24 | 4 | -0/+741 |
* | | | | bugfix: small memory leak in imdiag | Rainer Gerhards | 2012-09-19 | 1 | -0/+1 |
* | | | | preparing for 7.1.4 releasev7.1.4 | Rainer Gerhards | 2012-09-19 | 2 | -5/+5 |
* | | | | new ruleengine: implement template type "subtree" | Rainer Gerhards | 2012-09-18 | 1 | -5/+5 |
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-12 | 1 | -5/+5 |
|\| | | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-12 | 1 | -8/+6 |
| |\| | | |||||
| | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-12 | 1 | -5/+5 |
| | |\| | |||||
| | | * | remove unused variables (if SCM_CREDENTIALS is not available) | Cristian Ionescu-Idbohrn | 2012-09-12 | 1 | -1/+5 |
| | | * | imuxsock: remove incorrect socket option call | Cristian Ionescu-Idbohrn | 2012-09-12 | 1 | -4/+0 |
* | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-09-11 | 1 | -3/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | 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 |
| * | | | Remove a no-effect ", NULL"; | Miloslav Trmač | 2012-08-26 | 1 | -1/+1 |
* | | | | Fix length problem with _CMDLINE | Milan Bartos | 2012-09-11 | 1 | -3/+3 |
* | | | | imuxsock: use CEE root for trusted properties | Rainer Gerhards | 2012-09-10 | 1 | -1/+4 |
* | | | | Don't store uninitialized data in trusted JSON properties | Miloslav Trmač | 2012-09-04 | 1 | -9/+12 |
* | | | | Don't overload length as error code indicator in getTrusted* | Miloslav Trmač | 2012-09-04 | 1 | -12/+6 |
* | | | | Merge branch 'master' into v7-devel | Rainer Gerhards | 2012-08-29 | 3 | -43/+184 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | milestone: ommongodb supports templates & JSON passing API in place | Rainer Gerhards | 2012-08-29 | 1 | -15/+8 |
| * | | | adapted Mirek's changes to new JSON passing mode | Rainer Gerhards | 2012-08-29 | 2 | -47/+26 |
| * | | | Add template support: parse text, convert to BSON | Miloslav Trmač | 2012-08-29 | 2 | -8/+175 |
| * | | | Split MongoDB output into BSON creation and MongoDB interaction | Miloslav Trmač | 2012-08-29 | 1 | -24/+27 |
| * | | | bugfix: imtcp could abort on exit due to invalid free() | Rainer Gerhards | 2012-08-28 | 1 | -1/+0 |
* | | | | imuxsock: changed to use new JSON based system | Rainer Gerhards | 2012-08-27 | 1 | -48/+19 |
* | | | | minor cleanup | Rainer Gerhards | 2012-08-27 | 1 | -14/+0 |
* | | | | mmnormalize: switched to new JSON system | Rainer Gerhards | 2012-08-27 | 1 | -12/+24 |