summaryrefslogtreecommitdiffstats
path: root/syslogd.c
diff options
context:
space:
mode:
Diffstat (limited to 'syslogd.c')
-rw-r--r--syslogd.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/syslogd.c b/syslogd.c
index 1f5d885c..c39e37cf 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -173,6 +173,10 @@
#include "vmop.h"
#include "vmprg.h"
+/* definitions for objects we access */
+DEFobjCurrIf(expr)
+
+
/* We define our own set of syslog defintions so that we
* do not need to rely on (possibly different) implementations.
* 2007-07-19 rgerhards
@@ -1002,7 +1006,7 @@ selectorDestruct(void *pVal)
rsCStrDestruct(&pThis->f_filterData.prop.pCSCompValue);
} else if(pThis->f_filter_type == FILTER_EXPR) {
if(pThis->f_filterData.f_expr != NULL)
- exprDestruct(&pThis->f_filterData.f_expr);
+ expr.Destruct(&pThis->f_filterData.f_expr);
}
llDestroy(&pThis->llActList);
@@ -3413,6 +3417,10 @@ static rsRetVal InitGlobalClasses(void)
DEFiRet;
CHKiRet(objClassInit()); /* *THIS* *MUST* always be the first class initilizer being called! */
+ /* dummy "classes" */
+ CHKiRet(confClassInit());
+
+ /* real ones */
CHKiRet(msgClassInit());
CHKiRet(strmClassInit());
CHKiRet(wtiClassInit());
@@ -3425,6 +3433,9 @@ static rsRetVal InitGlobalClasses(void)
CHKiRet(ctokClassInit());
CHKiRet(exprClassInit());
+ /* request objects we use */
+ CHKiRet(objUse(expr));
+
finalize_it:
RETiRet;
}