summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'beta' into master-moduleRainer Gerhards2012-06-296-38/+7
|\ | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imklog/imklog.c plugins/imklog/imklog.h
| * Merge branch 'beta' of git+ssh://git.adiscon.com/git/rsyslog into betaRainer Gerhards2012-06-291-1/+1
| |\
| | * Merge branch 'beta' of git+ssh://git.adiscon.com/git/rsyslog into betaAndre Lorbach2012-06-280-0/+0
| | |\
| | | * Merge branch 'v6-stable' into betaCharlie Root2012-06-281-1/+1
| | | |\
| | * | \ Merge branch 'v6-stable' into betaAndre Lorbach2012-06-281-1/+1
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Added dragonfly to configure.acBartosz Kuzma2012-06-271-1/+1
| | | |
| * | | imklog: cleanup of no longer used codeRainer Gerhards2012-06-292-32/+0
| |/ /
| * | 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
| | |
* | | imklog: support for module() global config parameters addedRainer Gerhards2012-06-292-58/+116
| | |
* | | immark: support for module() global config parameters addedRainer Gerhards2012-06-272-4/+67
| | |
* | | imuxsock: support for module() global config parameters addedRainer Gerhards2012-06-271-47/+128
| | |
* | | $actionname was not properly set via legacy directiveRainer Gerhards2012-06-271-4/+0
| | |
* | | provide support to dynamically enable/disable legacy conf commandRainer Gerhards2012-06-265-24/+55
| | | | | | | | | | | | most important to prevent clashes with new style settings
* | | imudp: support for module() global config parameters addedRainer Gerhards2012-06-262-64/+71
| | |
* | | impstats: support for module() global config parameters addedRainer Gerhards2012-06-261-25/+103
| | |
* | | modules: call new-style entry point only when new-style stmt is usedRainer Gerhards2012-06-261-2/+4
| | | | | | | | | | | | | | | This provides a way for modules to differentiate between old- and new- style config, so that they can react accordingly.
* | | omudpspoof: support for module() global config parameters addedRainer Gerhards2012-06-251-6/+132
| | |
* | | omudpspoof: remove actually not existing compresion level paramRainer Gerhards2012-06-251-5/+0
| | | | | | | | | | | | | | | | | | | | | This seems to be a copy&paste problem from the initial implementation. The parameter was never documented (how could it have been? ;)), so this causes no problems. In fact, it also did nothing except setting a few never-used variables ;)
* | | omuxsock: support for module() global config parameters addedRainer Gerhards2012-06-251-4/+128
| | |
* | | doc: typo fixRainer Gerhards2012-06-251-1/+1
| | |
* | | ompipe: fix copy&paste name errorsRainer Gerhards2012-06-251-3/+3
| | |
* | | omfwd: support for module() global config parameters addedRainer Gerhards2012-06-251-8/+127
| | |
* | | ompipe: support for module() global config parameters addedRainer Gerhards2012-06-252-5/+107
| | |
* | | a bit more cleanupRainer Gerhards2012-06-251-5/+2
| | |
* | | cleanup & fix of mini-leakRainer Gerhards2012-06-252-5/+3
| | |
* | | implemented freeCnf() module interface & fixed some mem leaksRainer Gerhards2012-06-2512-37/+90
| | | | | | | | | | | | | | | | | | | | | | | | The interface was actually not present in older versions, even though some modules already used it. The implementation was now done, and not in 6.3/6.4 because the resulting memory leak was ultra-slim and the new interface handling has some potential to seriously break things. Not the kind of thing you want to add in late beta state, if avoidable.
* | | milestone: module() config statement basically worksRainer Gerhards2012-06-218-41/+220
| | | | | | | | | | | | some nits to iron out, only omfile actually support module params
* | | milestone: module() can load module in legacy modeRainer Gerhards2012-06-206-13/+65
| | |
* | | 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
| | | |