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.

1 files changed, 1 insertions, 3 deletions

diff --git a/syslogd.c b/syslogd.c
index cd8476d4..778fd713 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 */