4 files changed, 7 insertions, 4 deletions
diff --git a/plugins/imklog/bsd.c b/plugins/imklog/bsd.c
index cecf21c4..0a4c7cd4 100644
--- a/plugins/imklog/bsd.c
+++ b/plugins/imklog/bsd.c
@@ -75,6 +75,7 @@
 
 #include "rsyslog.h"
 #include "imklog.h"
+#include "debug.h"
 
 /* globals */
 static int	fklog = -1;	/* /dev/klog */
@@ -132,7 +133,7 @@ readklog(void)
 	if((size_t) iMaxLine < sizeof(bufRcv) - 1) {
 		pRcv = bufRcv;
 	} else {
-		if((pRcv = (uchar*) malloc(sizeof(uchar) * (iMaxLine + 1))) == NULL)
+		if((pRcv = (uchar*) MALLOC(sizeof(uchar) * (iMaxLine + 1))) == NULL)
 			iMaxLine = sizeof(bufRcv) - 1; /* better this than noting */
 	}
 
diff --git a/plugins/imklog/imklog.c b/plugins/imklog/imklog.c
index 4b7473e3..4112687a 100644
--- a/plugins/imklog/imklog.c
+++ b/plugins/imklog/imklog.c
@@ -57,6 +57,7 @@
 #include "unicode-helper.h"
 
 MODULE_TYPE_INPUT
+MODULE_TYPE_NOKEEP
 
 /* Module static data */
 DEF_IMOD_STATIC_DATA
@@ -110,7 +111,6 @@ enqMsg(uchar *msg, uchar* pszTag, int iFacility, int iSeverity)
 	MsgSetTAG(pMsg, pszTag, ustrlen(pszTag));
 	pMsg->iFacility = LOG_FAC(iFacility);
 	pMsg->iSeverity = LOG_PRI(iSeverity);
-	pMsg->bParseHOSTNAME = 0;
 	CHKiRet(submitMsg(pMsg));
 
 finalize_it:
diff --git a/plugins/imklog/ksym.c b/plugins/imklog/ksym.c
index ca708ba6..ebaec011 100644
--- a/plugins/imklog/ksym.c
+++ b/plugins/imklog/ksym.c
@@ -122,6 +122,7 @@
 #include "imklog.h"
 #include "ksyms.h"
 #include "module.h"
+#include "debug.h"
 
 
 int num_syms = 0;
@@ -523,7 +524,7 @@ static int AddSymbol(unsigned long address, char *symbol)
 		return(0);
 
 	/* Then the space for the symbol. */
-	sym_array[num_syms].name = (char *) malloc(strlen(symbol)*sizeof(char) + 1);
+	sym_array[num_syms].name = (char *) MALLOC(strlen(symbol)*sizeof(char) + 1);
 	if ( sym_array[num_syms].name == NULL )
 		return(0);
 	
diff --git a/plugins/imklog/ksym_mod.c b/plugins/imklog/ksym_mod.c
index be5fdee9..82978892 100644
--- a/plugins/imklog/ksym_mod.c
+++ b/plugins/imklog/ksym_mod.c
@@ -106,6 +106,7 @@
 #include "rsyslog.h"
 #include "imklog.h"
 #include "ksyms.h"
+#include "debug.h"
 
 #define KSYMS  "/proc/kallsyms"
 
@@ -289,7 +290,7 @@ struct Module *AddModule(module)
         struct Module *mp;
 
         if ( num_modules == 0 ) {
-                sym_array_modules = (struct Module *)malloc(sizeof(struct Module));
+                sym_array_modules = (struct Module *)MALLOC(sizeof(struct Module));
 
                 if ( sym_array_modules == NULL )
                 {