summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'beta'Andre Lorbach2012-06-281-1/+1
|\
| * Merge branch 'v6-stable' into betaCharlie Root2012-06-281-1/+1
| |\
| | * Added dragonfly to configure.acBartosz Kuzma2012-06-271-1/+1
| | |
* | | Merge branch 'beta'Rainer Gerhards2012-06-275-37/+8
|\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | cleanup: remove config scoping system left-overRainer Gerhards2012-06-272-30/+0
| | | | | | | | | | | | | | | this was an experiment in early v6 that did not work out. I forgot to remove this code when I undid it.
| * | improve invalid config command error messageRainer Gerhards2012-06-271-1/+2
| | |
| * | bugfix: $ActionName was not properly honoredRainer Gerhards2012-06-272-4/+4
| | | | | | | | | | | | Thanks to Abby Edwards for alerting us.
| * | preparing for 6.3.11v6.3.11Rainer Gerhards2012-06-183-3/+3
| | |
* | | Merge branch 'beta'Rainer Gerhards2012-06-152-12/+7
|\| |
| * | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-152-12/+7
| |\| | | | | | | | | | | | | | | | Conflicts: plugins/omudpspoof/omudpspoof.c tools/syslogd.c
| | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-154-13/+10
| | |\
| | | * bugfix: randomized IP option header in omudpspoof caused problemsRainer Gerhards2012-06-152-13/+5
| | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=327 Thanks to Rick Brown for helping to test out the patch.
| | | * adding pkgconfigdir definition to Makefile.am to help build properlyAbby Edwards2012-06-131-0/+2
| | | |
| | | * bugfix "$PreserveFQDN on" was not honored in some modulesRainer Gerhards2012-06-122-0/+3
| | | | | | | | | | | | | | | | | | | | Thanks to bodik for reporting this bug. ---------------------------------------------
* | | | bugfix: small static memory leak in expression based filtersRainer Gerhards2012-06-141-0/+1
| | | | | | | | | | | | | | | | function names were not freed upon config shutdown
* | | | Merge branch 'beta'Rainer Gerhards2012-06-141-1/+2
|\| | |
| * | | bugfix: small memory leak in imptcp (static after config read)Rainer Gerhards2012-06-141-1/+2
| | | |
* | | | Merge branch 'beta'Rainer Gerhards2012-06-1414-1/+1554
|\| | |
| * | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-1413-1/+1552
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | preparing for 6.2.2 releasev6.2.2Rainer Gerhards2012-06-133-3/+5
| | | |
| | * | added rpm spec files for rhel / centosAbby Edwards2012-06-1312-0/+1549
| | | |
| * | | adding pkgconfigdir definition to Makefile.am to help build properlyAbby Edwards2012-06-131-0/+2
| | | |
* | | | bump default omfile iobuffer size to 4kRainer Gerhards2012-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | (should originally have this value; larger value makes limited sense giving current batch sizes)
* | | | fixing memory leaks in expression-based filtersRainer Gerhards2012-06-143-0/+77
| | | | | | | | | | | | | | | | most recently added by re_match() function
* | | | re_match() function now also executesRainer Gerhards2012-06-131-4/+16
| | | | | | | | | | | | | | | | | | | | things now basically work. however, there is at least a (small) memory leak and the code needs to be further reviewed
* | | | milestone: regex is compiled from script based filterRainer Gerhards2012-06-124-3/+63
| | | |
* | | | cosmetic: merge remains in ChangeLog cleared upRainer Gerhards2012-06-121-3/+0
| | | |
* | | | Merge branch 'master-regexp'Rainer Gerhards2012-06-122-2/+18
|\ \ \ \
| * | | | first experiments with regexp'es in RainerScriptRainer Gerhards2012-05-292-2/+18
| | | | |
* | | | | Merge branch 'v5-beta'Rainer Gerhards2012-06-111-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * \ \ \ \ Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-113-5/+15
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Conflicts: ChangeLog
* | | | | | Merge branch 'beta'Rainer Gerhards2012-06-112-4/+38
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-112-4/+38
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-113-5/+15
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | | bugfix: "last message repeated n times" message was missing hostnameRainer Gerhards2012-06-113-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting
| | * | | | bugfix: did not compile under solaris due to $uptime property codeRainer Gerhards2012-06-082-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | For the time being, $uptime is not supported on Solaris
| | * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-067-34/+62
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
* | | | | | Merge branch 'beta'Rainer Gerhards2012-06-112-2/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | bugfix: expression-based filters with AND/OR could segfaultRainer Gerhards2012-06-112-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | due to a problem with boolean shortcut operations. From the user's perspective, the segfault is almost non-deterministic (it occurs when a shortcut is used). Thanks to Lars Peterson for providing the initial bug report and his support in solving it.
* | | | | | Merge branch 'beta'Rainer Gerhards2012-06-0610-53/+68
|\| | | | |
| * | | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-06-067-34/+62
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | Conflicts: runtime/modules.c
| | * | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-067-34/+62
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/modules.c
| | | * | | preparing for 5.8.12v5.8.12Rainer Gerhards2012-06-063-3/+3
| | | | | |
| | | * | | bugfix: property PROCID was empty instead of proper nilvalue if not presentRainer Gerhards2012-06-062-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If it is not present, it must have the nilvalue "-" as of RFC5424 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=332 Thanks to John N for reporting this issue.
| | | * | | bugfix: potential hang due to mutex deadlockRainer Gerhards2012-06-064-33/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=316 Thanks to Andreas Piesk for reporting&analyzing this bug as well as providing patches and other help in resolving it.
| | | * | | fixing memleak in recent group resolve patchRainer Gerhards2012-06-062-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | also added some error checking
| | | * | | call getgrnam_r repeatedly to get all group members.Alec Warner2012-06-061-3/+12
| | | | | |
| | | * | | add small delay (50ms) after sending shutdown messageRainer Gerhards2012-06-042-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There seem to be cases where the shutdown message is otherwise not processed, not even on an idle system. Thanks to Marcin for bringing this problem up.
| * | | | | Remove obsolete ommongodb build instructionsMiloslav Trmač2012-06-051-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The plugin now uses libmongo-client (which is configured using pkg-config) instead of the 10gen client, so the instructions to copy client source code no longer apply.
| * | | | | regression fix: last memleak bugfix caused abort in some situationsRainer Gerhards2012-06-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was introduced by the fix I did roughly an hour ago. Obviously, no released version is affected.