diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-03-07 08:06:16 +0000 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-03-07 08:06:16 +0000 |
commit | fa67273c1644551b50919fa7879acfdc92e269bc (patch) | |
tree | 38e41ee526a4bcc19540047c56c93b2a7865ef36 /conf.c | |
parent | ae3e3e9cb1584b5cf7082c1b28c4cbbd48b1f664 (diff) | |
download | rsyslog-fa67273c1644551b50919fa7879acfdc92e269bc.tar.gz rsyslog-fa67273c1644551b50919fa7879acfdc92e269bc.tar.xz rsyslog-fa67273c1644551b50919fa7879acfdc92e269bc.zip |
- added RSYSLOGD_MODDIR environment variable
- added -M rsyslogd option (allows to specify module directory location)
- converted net.c into a loadable library plugin
Diffstat (limited to 'conf.c')
-rw-r--r-- | conf.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -70,6 +70,7 @@ DEFobjCurrIf(expr) DEFobjCurrIf(ctok) DEFobjCurrIf(module) DEFobjCurrIf(errmsg) +DEFobjCurrIf(net) /* The following global variables are used for building * tag and host selector lines during startup and config reload. @@ -296,7 +297,7 @@ doNameLine(uchar **pp, void* pVal) ochAddLine(szName, &p); break; case DIR_ALLOWEDSENDER: - addAllowedSenderLine(szName, &p); + net.addAllowedSenderLine(szName, &p); break; default:/* we do this to avoid compiler warning - not all * enum values call this function, so an incomplete list @@ -1170,6 +1171,7 @@ BEGINAbstractObjClassInit(conf, 1, OBJ_IS_CORE_MODULE) /* class, version - CHANG CHKiRet(objUse(ctok, CORE_COMPONENT)); CHKiRet(objUse(module, CORE_COMPONENT)); CHKiRet(objUse(errmsg, CORE_COMPONENT)); + CHKiRet(objUse(net, "net")); ENDObjClassInit(conf) /* vi:set ai: |