From cb2a78b30bf55fd3d356cad7048b9e70968dbb95 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 29 Jun 2012 12:42:08 +0200
Subject: imklog: support for module() global config parameters added

---
 plugins/imklog/imklog.h | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'plugins/imklog/imklog.h')

diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h
index 7f6c810a..a9b22b4f 100644
--- a/plugins/imklog/imklog.h
+++ b/plugins/imklog/imklog.h
@@ -31,16 +31,19 @@
 
 /* we need to have the modConf type present in all submodules */
 struct modConfData_s {
+	/* DEAD */
 	int dbgPrintSymbols;
 	int symbols_twice;
 	int use_syscall;
 	int symbol_lookup;
-	int bPermitNonKernel;
+	char *symfile; 
+	/* end DEAD */
+	rsconf_t *pConf;
 	int iFacilIntMsg;
 	uchar *pszPath;
 	int console_log_level;
-	char *symfile; 
-	rsconf_t *pConf;
+	sbool bPermitNonKernel;
+	sbool configSetViaV2Method;
 };
 
 /* interface to "drivers"
@@ -54,21 +57,6 @@ rsRetVal klogWillRun(modConfData_t *pModConf);
 rsRetVal klogAfterRun(modConfData_t *pModConf);
 int klogFacilIntMsg();
 
-/* the following data members may be accessed by the "drivers"
- * I admit this is not the cleanest way to doing things, but I honestly
- * believe it is appropriate for the job that needs to be done.
- * rgerhards, 2008-04-09
- */
-#if 0
-extern int symbols_twice;
-extern int use_syscall;
-extern int symbol_lookup;
-extern char *symfile; 
-extern int console_log_level;
-extern int dbgPrintSymbols;
-extern uchar *pszPath;
-#endif
-
 /* the functions below may be called by the drivers */
 rsRetVal imklogLogIntMsg(int priority, char *fmt, ...) __attribute__((format(printf,2, 3)));
 rsRetVal Syslog(int priority, uchar *msg, struct timeval *tp);
-- 
cgit v1.2.3