summaryrefslogtreecommitdiffstats
path: root/syslogd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-07 14:27:41 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-07 14:27:41 +0200
commit5139502b0e20f667fdcccfeebc6a93b1effc407a (patch)
tree6255423ab23226e7825069908c2acc45d4245528 /syslogd.c
parent8a28324ed4ee674b6f38ae02a96c3e5db3800b32 (diff)
parent3f36ac250f0a0d7b037b79b599694d0c7d13f039 (diff)
downloadrsyslog-5139502b0e20f667fdcccfeebc6a93b1effc407a.zip
rsyslog-5139502b0e20f667fdcccfeebc6a93b1effc407a.tar.gz
rsyslog-5139502b0e20f667fdcccfeebc6a93b1effc407a.tar.xz
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/rsyslog_ng_comparison.html doc/status.html msg.c rsyslog.conf.5 rsyslog.h rsyslogd.8 syslogd.c Conflicts were due to patch being multiple times applied in CVS import.
Diffstat (limited to 'syslogd.c')
-rw-r--r--syslogd.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/syslogd.c b/syslogd.c
index cd8476d..778fd71 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -2921,6 +2921,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 */
@@ -2946,10 +2947,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 */