Merge branch 'beta'

Conflicts:

	ChangeLog
	configure.ac
	doc/ommail.html
	queue.c

1 files changed, 2 insertions, 1 deletions

diff --git a/obj.c b/obj.c
index 1a99aeaa..7a4435ea 100644
--- a/obj.c
+++ b/obj.c
@@ -85,6 +85,7 @@
 #include "stream.h"
 #include "modules.h"
 #include "errmsg.h"
+#include "cfsysline.h"
 
 /* static data */
 DEFobjCurrIf(obj) /* we define our own interface, as this is expected by some macros! */
@@ -1326,7 +1327,7 @@ objClassInit(modInfo_t *pModInfo)
 
 	/* init classes we use (limit to as few as possible!) */
 	CHKiRet(errmsgClassInit(pModInfo));
-	CHKiRet(cfsyslineInit(pModInfo));
+	CHKiRet(cfsyslineInit());
 	CHKiRet(varClassInit(pModInfo));
 	CHKiRet(moduleClassInit(pModInfo));
 	CHKiRet(objUse(var, CORE_COMPONENT));