diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-01 14:34:56 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-01 14:34:56 +0200 |
| commit | 6322343eca1084b509386a94c1bcf2ca819f1220 (patch) | |
| tree | cd873a34a4df087c3411de951c40a26f64f7d0ec /runtime/rsyslog.c | |
| parent | e6aeb1b995d6629ff04fd0f6068be2e9ffe9ca42 (diff) | |
| parent | 7bfa03bdc0b73647ffdbe4b73e5c1649af665fbf (diff) | |
| download | rsyslog-6322343eca1084b509386a94c1bcf2ca819f1220.tar.gz rsyslog-6322343eca1084b509386a94c1bcf2ca819f1220.tar.xz rsyslog-6322343eca1084b509386a94c1bcf2ca819f1220.zip | |
Merge branch 'master' into v5-devel
Diffstat (limited to 'runtime/rsyslog.c')
| -rw-r--r-- | runtime/rsyslog.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/rsyslog.c b/runtime/rsyslog.c index 6f732f0e..443d0f41 100644 --- a/runtime/rsyslog.c +++ b/runtime/rsyslog.c @@ -77,6 +77,7 @@ #include "conf.h" #include "glbl.h" #include "errmsg.h" +#include "prop.h" #include "rule.h" #include "ruleset.h" @@ -146,6 +147,8 @@ rsrtInit(char **ppErrObj, obj_if_t *pObjIF) * class immediately after it is initialized. And, of course, we load those classes * first that we use ourselfs... -- rgerhards, 2008-03-07 */ + if(ppErrObj != NULL) *ppErrObj = "prop"; + CHKiRet(propClassInit(NULL)); if(ppErrObj != NULL) *ppErrObj = "glbl"; CHKiRet(glblClassInit(NULL)); if(ppErrObj != NULL) *ppErrObj = "datetime"; |