- added "debug" command to debug environment settings

- changed the object/interface system to use a new way of calling, giving
    up the numerical object ID. This was necessary as we needed more
    extensibility for third-party modules (which don't play at all with the
    previous fixed object ID). This is stage work for the object loader.
    Please note that I needed to change the object (de)serializer, I can't
    outrule that I have introduced bugs there.

1 files changed, 8 insertions, 7 deletions

diff --git a/syslogd.c b/syslogd.c
index 2f7ba0f2..cf2b85e7 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -3576,9 +3576,6 @@ static rsRetVal InitGlobalClasses(void)
 	DEFiRet;
 
 	CHKiRet(objClassInit()); /* *THIS* *MUST* always be the first class initilizer being called! */
-	/* dummy "classes" */
-	CHKiRet(confClassInit());
-	CHKiRet(actionClassInit());
 
 	/* real ones */
 	CHKiRet(msgClassInit());
@@ -3587,19 +3584,23 @@ static rsRetVal InitGlobalClasses(void)
 	CHKiRet(wtpClassInit());
 	CHKiRet(queueClassInit());
 	CHKiRet(vmstkClassInit());
+	//TODO: currently done in objClassInit CHKiRet(varClassInit());
+	CHKiRet(sysvarClassInit());
 	CHKiRet(vmClassInit());
 	CHKiRet(vmopClassInit());
 	CHKiRet(vmprgClassInit());
-	CHKiRet(sysvarClassInit());
-	CHKiRet(varClassInit());
 	CHKiRet(ctok_tokenClassInit());
 	CHKiRet(ctokClassInit());
 	CHKiRet(exprClassInit());
 
+	/* dummy "classes" */
+	CHKiRet(confClassInit());
+	CHKiRet(actionClassInit());
+
 	/* request objects we use */
 	CHKiRet(objGetObjInterface(&obj)); /* this provides the root pointer for all other queries */
-	CHKiRet(objUse(expr));
-	CHKiRet(objUse(vm));
+	CHKiRet(obj.UseObj((uchar*)"expr", NULL, (void*) &expr));
+	CHKiRet(obj.UseObj((uchar*)"vm", NULL, (void*) &vm));
 
 finalize_it:
 	RETiRet;