Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'beta' into master-module | Rainer Gerhards | 2012-06-29 | 6 | -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 beta | Rainer Gerhards | 2012-06-29 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'beta' of git+ssh://git.adiscon.com/git/rsyslog into beta | Andre Lorbach | 2012-06-28 | 0 | -0/+0 |
| | |\ | |||||
| | | * | Merge branch 'v6-stable' into beta | Charlie Root | 2012-06-28 | 1 | -1/+1 |
| | | |\ | |||||
| | * | \ | Merge branch 'v6-stable' into beta | Andre Lorbach | 2012-06-28 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | |||||
| | | * | Added dragonfly to configure.ac | Bartosz Kuzma | 2012-06-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | imklog: cleanup of no longer used code | Rainer Gerhards | 2012-06-29 | 2 | -32/+0 |
| |/ / | |||||
| * | | cleanup: remove config scoping system left-over | Rainer Gerhards | 2012-06-27 | 2 | -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 message | Rainer Gerhards | 2012-06-27 | 1 | -1/+2 |
| | | | |||||
| * | | bugfix: $ActionName was not properly honored | Rainer Gerhards | 2012-06-27 | 2 | -4/+4 |
| | | | | | | | | | | | | Thanks to Abby Edwards for alerting us. | ||||
| * | | preparing for 6.3.11v6.3.11 | Rainer Gerhards | 2012-06-18 | 3 | -3/+3 |
| | | | |||||
* | | | imklog: support for module() global config parameters added | Rainer Gerhards | 2012-06-29 | 2 | -58/+116 |
| | | | |||||
* | | | immark: support for module() global config parameters added | Rainer Gerhards | 2012-06-27 | 2 | -4/+67 |
| | | | |||||
* | | | imuxsock: support for module() global config parameters added | Rainer Gerhards | 2012-06-27 | 1 | -47/+128 |
| | | | |||||
* | | | $actionname was not properly set via legacy directive | Rainer Gerhards | 2012-06-27 | 1 | -4/+0 |
| | | | |||||
* | | | provide support to dynamically enable/disable legacy conf command | Rainer Gerhards | 2012-06-26 | 5 | -24/+55 |
| | | | | | | | | | | | | most important to prevent clashes with new style settings | ||||
* | | | imudp: support for module() global config parameters added | Rainer Gerhards | 2012-06-26 | 2 | -64/+71 |
| | | | |||||
* | | | impstats: support for module() global config parameters added | Rainer Gerhards | 2012-06-26 | 1 | -25/+103 |
| | | | |||||
* | | | modules: call new-style entry point only when new-style stmt is used | Rainer Gerhards | 2012-06-26 | 1 | -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 added | Rainer Gerhards | 2012-06-25 | 1 | -6/+132 |
| | | | |||||
* | | | omudpspoof: remove actually not existing compresion level param | Rainer Gerhards | 2012-06-25 | 1 | -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 added | Rainer Gerhards | 2012-06-25 | 1 | -4/+128 |
| | | | |||||
* | | | doc: typo fix | Rainer Gerhards | 2012-06-25 | 1 | -1/+1 |
| | | | |||||
* | | | ompipe: fix copy&paste name errors | Rainer Gerhards | 2012-06-25 | 1 | -3/+3 |
| | | | |||||
* | | | omfwd: support for module() global config parameters added | Rainer Gerhards | 2012-06-25 | 1 | -8/+127 |
| | | | |||||
* | | | ompipe: support for module() global config parameters added | Rainer Gerhards | 2012-06-25 | 2 | -5/+107 |
| | | | |||||
* | | | a bit more cleanup | Rainer Gerhards | 2012-06-25 | 1 | -5/+2 |
| | | | |||||
* | | | cleanup & fix of mini-leak | Rainer Gerhards | 2012-06-25 | 2 | -5/+3 |
| | | | |||||
* | | | implemented freeCnf() module interface & fixed some mem leaks | Rainer Gerhards | 2012-06-25 | 12 | -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 works | Rainer Gerhards | 2012-06-21 | 8 | -41/+220 |
| | | | | | | | | | | | | some nits to iron out, only omfile actually support module params | ||||
* | | | milestone: module() can load module in legacy mode | Rainer Gerhards | 2012-06-20 | 6 | -13/+65 |
| | | | |||||
* | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-15 | 2 | -12/+7 |
|\| | | |||||
| * | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-15 | 2 | -12/+7 |
| |\| | | | | | | | | | | | | | | | | Conflicts: plugins/omudpspoof/omudpspoof.c tools/syslogd.c | ||||
| | * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-06-15 | 4 | -13/+10 |
| | |\ | |||||
| | | * | bugfix: randomized IP option header in omudpspoof caused problems | Rainer Gerhards | 2012-06-15 | 2 | -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 properly | Abby Edwards | 2012-06-13 | 1 | -0/+2 |
| | | | | |||||
| | | * | bugfix "$PreserveFQDN on" was not honored in some modules | Rainer Gerhards | 2012-06-12 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | Thanks to bodik for reporting this bug. --------------------------------------------- | ||||
* | | | | bugfix: small static memory leak in expression based filters | Rainer Gerhards | 2012-06-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | function names were not freed upon config shutdown | ||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-14 | 1 | -1/+2 |
|\| | | | |||||
| * | | | bugfix: small memory leak in imptcp (static after config read) | Rainer Gerhards | 2012-06-14 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2012-06-14 | 14 | -1/+1554 |
|\| | | | |||||
| * | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-06-14 | 13 | -1/+1552 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | preparing for 6.2.2 releasev6.2.2 | Rainer Gerhards | 2012-06-13 | 3 | -3/+5 |
| | | | | |||||
| | * | | added rpm spec files for rhel / centos | Abby Edwards | 2012-06-13 | 12 | -0/+1549 |
| | | | | |||||
| * | | | adding pkgconfigdir definition to Makefile.am to help build properly | Abby Edwards | 2012-06-13 | 1 | -0/+2 |
| | | | | |||||
* | | | | bump default omfile iobuffer size to 4k | Rainer Gerhards | 2012-06-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | (should originally have this value; larger value makes limited sense giving current batch sizes) | ||||
* | | | | fixing memory leaks in expression-based filters | Rainer Gerhards | 2012-06-14 | 3 | -0/+77 |
| | | | | | | | | | | | | | | | | most recently added by re_match() function | ||||
* | | | | re_match() function now also executes | Rainer Gerhards | 2012-06-13 | 1 | -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 filter | Rainer Gerhards | 2012-06-12 | 4 | -3/+63 |
| | | | | |||||
* | | | | cosmetic: merge remains in ChangeLog cleared up | Rainer Gerhards | 2012-06-12 | 1 | -3/+0 |
| | | | |