Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | added $SpaceLFOnReceive config directive | Tomas Heinrich | 2012-01-10 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | |||||
| | * | | | Merge branch 'tmp' into v4-stable-tmp | Rainer Gerhards | 2012-01-10 | 1 | -0/+3 | |
| | |\| | | ||||||
| | | * | | added canned template for ultra-exact sysklogd file format | Tomas Heinrich | 2012-01-10 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the point is that LF will be translated to SP Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | |||||
* | | | | | Merge branch 'v5-stable' into master | Rainer Gerhards | 2012-01-18 | 1 | -1/+21 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.h configure.ac doc/manual.html plugins/immark/immark.c plugins/impstats/impstats.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c runtime/cfsysline.c runtime/cfsysline.h runtime/conf.c runtime/ctok.c runtime/ctok.h runtime/ctok_token.c runtime/ctok_token.h runtime/dnscache.h runtime/expr.c runtime/expr.h runtime/rule.c runtime/rule.h runtime/ruleset.h runtime/sysvar.c runtime/vm.h runtime/vmop.c runtime/vmop.h runtime/vmprg.c runtime/vmprg.h runtime/vmstk.c runtime/vmstk.h tools/omusrmsg.c | |||||
| * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-16 | 1 | -1/+21 | |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: tools/syslogd.c | |||||
| | * | | | FQDN hostname for multihomed host was not always set to the correct name | Tomas Heinrich | 2012-01-16 | 1 | -2/+22 | |
| | |/ / | | | | | | | | | | | | | | | | | | | | | ..if multiple aliases existed. Thanks to Tomas Heinreich for the patch. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | |||||
| | * | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2011-08-30 | 1 | -1/+1 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| | | * | | bugfix: off-by-one(two) bug in legacy syslog parser | Rainer Gerhards | 2011-08-10 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-09-26 | 1 | -1/+1 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/conf.c tools/omfile.c tools/omusrmsg.c | |||||
| * | | | | bugfix: rsyslogd -v always said 64 atomics were not present | mono_matsuko | 2011-09-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | |||||
* | | | | | added $InputRELPServerBindRuleset directive to specify rulesets for RELP | Rainer Gerhards | 2011-09-08 | 1 | -1/+2 | |
| | | | | | ||||||
* | | | | | removed compatibility mode as we expect people have adjusted their confs by now | Rainer Gerhards | 2011-07-12 | 1 | -234/+13 | |
| | | | | | ||||||
* | | | | | removed emergency config, do error reporting on fatal config file error | Rainer Gerhards | 2011-07-12 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | cleanup, removing now unused code | Rainer Gerhards | 2011-07-11 | 1 | -5/+0 | |
| | | | | | ||||||
* | | | | | milestone/[PARTWORK]: implemented comparison operations | Rainer Gerhards | 2011-07-08 | 1 | -1/+0 | |
| | | | | | ||||||
* | | | | | milestone:/[PARTWORK]: config is processed using new parser, except... | Rainer Gerhards | 2011-07-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | ... for "if" filters (more work to come, probably lots of more work... ;)) | |||||
* | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-06-21 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am tests/manytcp-too-few-tls.sh | |||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-06-21 | 1 | -1/+1 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh | |||||
| | * | | | | bugfix: problems in failover action handling | Rainer Gerhards | 2011-06-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!) | |||||
| * | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-05-09 | 1 | -1/+1 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/omfwd.c | |||||
| | * | | | | bugfix(minor): improper template function call in syslogd.c | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | added a first implementation of a DNS name cache | Rainer Gerhards | 2011-06-06 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this still has a couple of weaknesses, like no size limit, no expiration of entries, suboptimal algorithms -- but it should perform better than what we had previously. Implementation will be improved based on feedback during the next couple of releases | |||||
* | | | | | | regression fix: config validation code affected by recent changes | Rainer Gerhards | 2011-05-30 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | did not return with proper return value | |||||
* | | | | | | step: moved main message queue activation to after priv drop | Rainer Gerhards | 2011-04-27 | 1 | -12/+1 | |
| | | | | | | ||||||
* | | | | | | step: config-specific module list used during config processing | Rainer Gerhards | 2011-04-27 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | step: shuffled module-related code from syslogd.c to rsconf.c | Rainer Gerhards | 2011-04-27 | 1 | -217/+52 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ... plus some minor cleanup/code shuffle | |||||
* | | | | | | step: outchannel list integrated into main config object | Rainer Gerhards | 2011-04-26 | 1 | -41/+20 | |
| | | | | | | ||||||
* | | | | | | step: moved config validation code | Rainer Gerhards | 2011-04-26 | 1 | -20/+0 | |
| | | | | | | ||||||
* | | | | | | shuffled even more config code from syslgod to config handler | Rainer Gerhards | 2011-04-26 | 1 | -166/+1 | |
| | | | | | | ||||||
* | | | | | | step: config handler setting from syslogd.c moved to rsconf.c | Rainer Gerhards | 2011-04-21 | 1 | -351/+41 | |
| | | | | | | ||||||
* | | | | | | step: begun to create a "load" interface in rsconf | Rainer Gerhards | 2011-04-21 | 1 | -19/+23 | |
| | | | | | | ||||||
* | | | | | | step: slowly migrating config settings... ;) | Rainer Gerhards | 2011-04-19 | 1 | -54/+25 | |
| | | | | | | ||||||
* | | | | | | some more work was required on the ruleset modification | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | milestone: ruleset now supports rsconf_t | Rainer Gerhards | 2011-04-19 | 1 | -11/+11 | |
| | | | | | | ||||||
* | | | | | | milestone: conf obj interface now utilzes rsconf_t | Rainer Gerhards | 2011-04-19 | 1 | -13/+51 | |
| | | | | | | ||||||
* | | | | | | milestone: templates are now in config object | Rainer Gerhards | 2011-04-19 | 1 | -14/+24 | |
| | | | | | | ||||||
* | | | | | | renaming conf.* wasn't a good idea -- undoing | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | too many dependencies, things get cluttered (and merging probably gets problematic). Now new config will be "conf2". | |||||
* | | | | | | renamed conf.c to legacyconf.c to make room for new config system | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-31 | 1 | -1/+1 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c | |||||
| * | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-16 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am | |||||
| | * | | | | fixed a regression of last patch and some cleanup | Rainer Gerhards | 2011-03-16 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-03-11 | 1 | -0/+5 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh | |||||
| * | | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-08 | 1 | -0/+5 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tools/syslogd.c | |||||
| | * | | | | bugfix(kind of): tell users that config graph can currently not be generated | Rainer Gerhards | 2011-03-08 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232 | |||||
* | | | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-25 | 1 | -2/+1 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * | | | | | cosmetic: removing commented-out testing aid | Rainer Gerhards | 2011-02-25 | 1 | -1/+0 | |
| | | | | | | ||||||
| * | | | | | bugfix (minor): warning message suggested invalid compatibility mode | Rainer Gerhards | 2011-02-22 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-18 | 1 | -3/+2 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c | |||||
| * | | | | | cleanup: no longer parameter in iminternal system removed | Rainer Gerhards | 2011-02-16 | 1 | -3/+2 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-11 | 1 | -3/+36 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html |