summaryrefslogtreecommitdiffstats
path: root/syslogd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-07 12:53:12 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-07 12:53:12 +0200
commit2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7 (patch)
treeba1953678dcacb485e76f6df408b87e0c7e929b1 /syslogd.c
parentc34ef852ee583de6e335f02d78f917b7d4da8062 (diff)
parent2f8fb81bd4cfcc69049b767139389af023d1eef6 (diff)
downloadrsyslog-2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7.zip
rsyslog-2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7.tar.gz
rsyslog-2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7.tar.xz
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog Makefile.am configure.ac doc/status.html rsyslog.conf.5 syslogd.c
Diffstat (limited to 'syslogd.c')
-rw-r--r--syslogd.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/syslogd.c b/syslogd.c
index 9d4c778..803e523 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -2930,6 +2930,7 @@ GlobalClassExit(void)
objRelease(conf, CORE_COMPONENT);
objRelease(expr, CORE_COMPONENT);
objRelease(vm, CORE_COMPONENT);
+ objRelease(var, CORE_COMPONENT);
objRelease(datetime, CORE_COMPONENT);
/* TODO: implement the rest of the deinit */
@@ -2955,10 +2956,7 @@ GlobalClassExit(void)
CHKiRet(templateInit());
#endif
/* dummy "classes */
-dbgprintf("pre strExit()\n");
strExit();
-dbgprintf("post strExit()\n");
-
#if 0
CHKiRet(objGetObjInterface(&obj)); /* this provides the root pointer for all other queries */
@@ -3033,7 +3031,6 @@ int realMain(int argc, char **argv)
if (isupper((int) *p))
*p = (char)tolower((int)*p);
-
CHKiRet_Hdlr(InitGlobalClasses()) {
fprintf(stderr, "rsyslogd initializiation failed - global classes could not be initialized.\n"
"Did you do a \"make install\"?\n"