Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | imuxsock: use a default ratelimiter if none else applies | Rainer Gerhards | 2012-10-23 | 1 | -1/+9 |
| | |||||
* | Merge branch 'tmp-ratelimit' into master-ratelimit | Rainer Gerhards | 2012-10-23 | 5 | -13/+25 |
|\ | |||||
| * | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-23 | 5 | -13/+25 |
| |\ | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-23 | 4 | -8/+17 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | | * | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-10-22 | 2 | -5/+11 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html template.c | ||||
| | | | * | preparing for 6.6.0v6.6.0 | Rainer Gerhards | 2012-10-22 | 5 | -7/+10 |
| | | | | | |||||
| | | | * | Merge branch 'v6-beta' into v6-stable | Rainer Gerhards | 2012-10-22 | 88 | -935/+7279 |
| | | | |\ | |||||
| | | | | * | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 |
| | | | | |\ | |||||
| | | | | * | | doc: add imported bugfix to ChangeLog | Rainer Gerhards | 2012-10-19 | 1 | -0/+3 |
| | | | | | | | |||||
| | | | | * | | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 2 | -5/+1 |
| | | | | |\ \ | |||||
| | | | | * \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-17 | 6 | -45/+22 |
| | | | | |\ \ \ | |||||
| | | | | * \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-16 | 2 | -9/+11 |
| | | | | |\ \ \ \ | |||||
| | | | | * \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-11 | 2 | -1/+7 |
| | | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | | preparing for 6.5.1 releasev6.5.1 | Rainer Gerhards | 2012-10-11 | 3 | -3/+3 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | prepare for 7.20 stable release & minor thingsv7.2.0 | Rainer Gerhards | 2012-10-22 | 5 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most important real code chane is the initialization of the epoll control set. This should just be cosmetic (valgrind warnings), as all data we actually use already was properly initialized. | ||||
| | | * | | | | | | | | testbench: -c option no longer exists | Rainer Gerhards | 2012-10-22 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | bugfix: segfault on startup when modules using MSG_PASSING mode are used | Rainer Gerhards | 2012-10-23 | 2 | -1/+5 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'beta-newgrammar' | Rainer Gerhards | 2012-10-22 | 2 | -3/+7 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | | * | | | | | | | | | permit action-like statements (stop, call, ...) in action lists | Rainer Gerhards | 2012-10-22 | 2 | -3/+5 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | re-enable deprecated warings for omdiscard/omruleset | Rainer Gerhards | 2012-10-22 | 2 | -8/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge for action list functionality will follow soon | ||||
| | * | | | | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-22 | 4 | -9/+10 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | disable deprecated warnings in omdiscard/omruleset | Rainer Gerhards | 2012-10-22 | 2 | -0/+8 |
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... because action-like statements in action lists are not supported in 7.1. This will be available in 7.3, but it is too late to do this in 7.1. So we disable the warnings and re-enable them in 7.3. Functionality- wise, this is no problem at all as the legacy constructs are still fully supported. Thanks to forum user "canadaboy" for mentioning this problem. | ||||
* | | / / / / / / / / | nit: valgrind-testaid was accidentely enabled in testbench | Rainer Gerhards | 2012-10-23 | 1 | -1/+1 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | remove "last message repeated n times" from rsyslog output part | Rainer Gerhards | 2012-10-23 | 7 | -232/+26 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'beta' into master-ratelimit | Rainer Gerhards | 2012-10-22 | 2 | -9/+2 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | doc: remove BSD blocks from rsyslog.conf manpage | Rainer Gerhards | 2012-10-22 | 1 | -8/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for mentioning this. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=364 | ||||
| * | | | | | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge branch 'v5-stable' into v6-stablev6.4.3.unfinished | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | | * | | | | | | | doc: v3 compatibility doc lists invalid config directive | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=365 | ||||
* | | | | | | | | | | ratelimit: add default ratelimiter | Rainer Gerhards | 2012-10-19 | 1 | -4/+14 |
| | | | | | | | | | | |||||
* | | | | | | | | | | cleanup | Rainer Gerhards | 2012-10-19 | 1 | -38/+0 |
| | | | | | | | | | | |||||
* | | | | | | | | | | imklog, impstats: support for new rate-limiting API added | Rainer Gerhards | 2012-10-19 | 2 | -6/+5 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-19 | 24 | -230/+282 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 |
| | |\| | | | | | | | |||||
| | | * | | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 |
| | | |\| | | | | | | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/nsdpoll_ptcp.c | ||||
| | | | * | | | | | fix epoll-enabled code to use correct data member for pointers | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | doc: improve module doc | Florian Riedl | 2012-10-19 | 1 | -26/+42 |
| | | | | | | | | | |||||
| * | | | | | | | | prepare for 7.3.1 releasev7.3.1 | Rainer Gerhards | 2012-10-19 | 3 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-19 | 2 | -7/+5 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | | | | | doc: add imported bugfix to ChangeLog | Rainer Gerhards | 2012-10-19 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plus some cleanup | ||||
| | * | | | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-19 | 2 | -5/+1 |
| | |\| | | | | | | |||||
| | | * | | | | | | bugfix: imuxsock did not properly honor $LocalHostIPIF | Rainer Gerhards | 2012-10-19 | 2 | -5/+1 |
| | | | |_|_|_|/ | | | |/| | | | | |||||
| * | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-18 | 5 | -63/+9 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | | | | preparing for 7.1.12 releasev7.1.12 | Rainer Gerhards | 2012-10-18 | 3 | -3/+5 |
| | | | | | | | | |||||
| | * | | | | | | build: Remove vestiges of the cust1 plugin | Michael Biebl | 2012-10-18 | 1 | -1/+0 |
| | | | | | | | | |||||
| | * | | | | | | build: Drop unused include path | Michael Biebl | 2012-10-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | build: Drop unused CNF_LIBS variable | Michael Biebl | 2012-10-18 | 2 | -3/+2 |
| | | | | | | | | |||||
| | * | | | | | | build: Use pkg-config to check for libcurl | Michael Biebl | 2012-10-18 | 1 | -19/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | curl has shipped that file since 2004. | ||||
| | * | | | | | | build: Use pkg-config to check for libuuid | Michael Biebl | 2012-10-18 | 1 | -16/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e2fsprogs resp. util-linux(-ng) have shipped that file since at least 2009. |