1 files changed, 20 insertions, 20 deletions

diff --git a/plugins/imklog/bsd.c b/plugins/imklog/bsd.c
index 17d4bead..cddc6737 100644
--- a/plugins/imklog/bsd.c
+++ b/plugins/imklog/bsd.c
@@ -73,7 +73,7 @@ static int	fklog = -1;	/* kernel log fd */
  * rgerhards, 2011-06-24
  */
 static void
-submitSyslog(int pri, uchar *buf)
+submitSyslog(modConfData_t *pModConf, int pri, uchar *buf)
 {
 	long secs;
 	long usecs;
@@ -85,7 +85,7 @@ submitSyslog(int pri, uchar *buf)
 	struct timeval tv;
 	struct timeval *tp = NULL;
 
-	if(!bParseKernelStamp)
+	if(!pModConf->bParseKernelStamp)
 		goto done;
 
 	if(buf[3] != '[')
@@ -122,7 +122,7 @@ submitSyslog(int pri, uchar *buf)
 
 	/* we have a timestamp */
 	DBGPRINTF("kernel timestamp is %ld %ld\n", secs, usecs);
-	if(!bKeepKernelStamp) {
+	if(!pModConf->bKeepKernelStamp) {
 		bufsize= strlen((char*)buf);
 		memmove(buf+3, buf+i, bufsize - i + 1);
 	}
@@ -151,44 +151,44 @@ done:
 }
 #else	/* now comes the BSD "code" (just a shim) */
 static void
-submitSyslog(int pri, uchar *buf)
+submitSyslog(modConfData_t *pModConf, int pri, uchar *buf)
 {
 	Syslog(pri, buf, NULL);
 }
 #endif	/* #ifdef LINUX */
 
 
-static uchar *GetPath(void)
+static uchar *GetPath(modConfData_t *pModConf)
 {
-	return pszPath ? pszPath : (uchar*) _PATH_KLOG;
+	return pModConf->pszPath ? pModConf->pszPath : (uchar*) _PATH_KLOG;
 }
 
 /* open the kernel log - will be called inside the willRun() imklog
  * entry point. -- rgerhards, 2008-04-09
  */
 rsRetVal
-klogWillRun(void)
+klogWillRun(modConfData_t *pModConf)
 {
 	char errmsg[2048];
 	int r;
 	DEFiRet;
 
-	fklog = open((char*)GetPath(), O_RDONLY, 0);
+	fklog = open((char*)GetPath(pModConf), O_RDONLY, 0);
 	if (fklog < 0) {
 		imklogLogIntMsg(RS_RET_ERR_OPEN_KLOG, "imklog: cannot open kernel log(%s): %s.",
-			GetPath(), rs_strerror_r(errno, errmsg, sizeof(errmsg)));
+			GetPath(pModConf), rs_strerror_r(errno, errmsg, sizeof(errmsg)));
 		ABORT_FINALIZE(RS_RET_ERR_OPEN_KLOG);
 	}
 
 #	ifdef OS_LINUX
 	/* Set level of kernel console messaging.. */
-	if(console_log_level != -1) {
-		r = klogctl(8, NULL, console_log_level);
+	if(pModConf->console_log_level != -1) {
+		r = klogctl(8, NULL, pModConf->console_log_level);
 		if(r != 0) {
 			imklogLogIntMsg(LOG_WARNING, "imklog: cannot set console log level: %s",
 				rs_strerror_r(errno, errmsg, sizeof(errmsg)));
 			/* make sure we do not try to re-set! */
-			console_log_level = -1;
+			pModConf->console_log_level = -1;
 		}
 	}
 #	endif	/* #ifdef OS_LINUX */
@@ -201,7 +201,7 @@ finalize_it:
 /* Read kernel log while data are available, split into lines.
  */
 static void
-readklog(void)
+readklog(modConfData_t *pModConf)
 {
 	char *p, *q;
 	int len, i;
@@ -243,18 +243,18 @@ readklog(void)
 
 		for (p = (char*)pRcv; (q = strchr(p, '\n')) != NULL; p = q + 1) {
 			*q = '\0';
-			submitSyslog(LOG_INFO, (uchar*) p);
+			submitSyslog(pModConf, LOG_INFO, (uchar*) p);
 		}
 		len = strlen(p);
 		if (len >= iMaxLine - 1) {
-			submitSyslog(LOG_INFO, (uchar*)p);
+			submitSyslog(pModConf, LOG_INFO, (uchar*)p);
 			len = 0;
 		}
 		if(len > 0)
 			memmove(pRcv, p, len + 1);
 	}
 	if (len > 0)
-		submitSyslog(LOG_INFO, pRcv);
+		submitSyslog(pModConf, LOG_INFO, pRcv);
 
 	if(pRcv != NULL && (size_t) iMaxLine >= sizeof(bufRcv) - 1)
 		free(pRcv);
@@ -264,14 +264,14 @@ readklog(void)
 /* to be called in the module's AfterRun entry point
  * rgerhards, 2008-04-09
  */
-rsRetVal klogAfterRun(void)
+rsRetVal klogAfterRun(modConfData_t *pModConf)
 {
         DEFiRet;
 	if(fklog != -1)
 		close(fklog);
 #	ifdef OS_LINUX
 	/* Turn on logging of messages to console, but only if a log level was speficied */
-	if(console_log_level != -1)
+	if(pModConf->console_log_level != -1)
 		klogctl(7, NULL, 0);
 #	endif
         RETiRet;
@@ -283,10 +283,10 @@ rsRetVal klogAfterRun(void)
  * "message pull" mechanism.
  * rgerhards, 2008-04-09
  */
-rsRetVal klogLogKMsg(void)
+rsRetVal klogLogKMsg(modConfData_t *pModConf)
 {
         DEFiRet;
-	readklog();
+	readklog(pModConf);
 	RETiRet;
 }