diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-10 18:41:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-10 18:41:43 +0200 |
| commit | 7c0f8bf6c1413ab10015f656104cc3a42bea8907 (patch) | |
| tree | cfdd82d9cca0ce4a9d29b64966a1b32442c85df5 /tools/syslogd.c | |
| parent | 9fd578a8683813fe461b0b303ad23b9ee4f56ebc (diff) | |
| parent | d3bb43798c95f9d95f9e031387f4aedd814c34ab (diff) | |
| download | rsyslog-7c0f8bf6c1413ab10015f656104cc3a42bea8907.tar.gz rsyslog-7c0f8bf6c1413ab10015f656104cc3a42bea8907.tar.bz2 rsyslog-7c0f8bf6c1413ab10015f656104cc3a42bea8907.zip | |
Merge branch 'master-newruleset'
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 219b41ab..a30fb464 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -119,7 +119,6 @@ #include "batch.h" #include "unicode-helper.h" #include "ruleset.h" -#include "rule.h" #include "net.h" #include "prop.h" #include "rsconf.h" @@ -134,7 +133,6 @@ DEFobjCurrIf(datetime) /* TODO: make go away! */ DEFobjCurrIf(conf) DEFobjCurrIf(module) DEFobjCurrIf(errmsg) -DEFobjCurrIf(rule) DEFobjCurrIf(ruleset) DEFobjCurrIf(prop) DEFobjCurrIf(parser) @@ -1453,8 +1451,6 @@ InitGlobalClasses(void) CHKiRet(objUse(module, CORE_COMPONENT)); pErrObj = "datetime"; CHKiRet(objUse(datetime, CORE_COMPONENT)); - pErrObj = "rule"; - CHKiRet(objUse(rule, CORE_COMPONENT)); pErrObj = "ruleset"; CHKiRet(objUse(ruleset, CORE_COMPONENT)); pErrObj = "conf"; @@ -1508,7 +1504,6 @@ GlobalClassExit(void) objRelease(prop, CORE_COMPONENT); objRelease(conf, CORE_COMPONENT); objRelease(ruleset, CORE_COMPONENT); - objRelease(rule, CORE_COMPONENT); parserClassExit(); /* this is hack, currently core_modules do not get this automatically called */ rsconfClassExit(); /* this is hack, currently core_modules do not get this automatically called */ objRelease(datetime, CORE_COMPONENT); |