summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--plugins/omsnmp/omsnmp.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 737a9e9e..8ab49b93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 6.3.7 [DEVEL] 2012-01-31
+Version 6.3.7 [DEVEL] 2012-02-01
- imported refactored v5.9.6 imklog linux driver, now combined with BSD
driver
- bugfix: rsyslog aborted during startup if there is an error in loading
diff --git a/plugins/omsnmp/omsnmp.c b/plugins/omsnmp/omsnmp.c
index 80230789..30daf963 100644
--- a/plugins/omsnmp/omsnmp.c
+++ b/plugins/omsnmp/omsnmp.c
@@ -106,8 +106,7 @@ typedef struct configSettings_s {
SNMP_TRAP_ENTERPRISESPECIFIC (6)
*/
} configSettings_t;
-
-SCOPING_SUPPORT; /* must be set AFTER configSettings_t is defined */
+static configSettings_t cs;
BEGINinitConfVars /* (re)set config variables to default values */
CODESTARTinitConfVars
@@ -512,9 +511,9 @@ ENDqueryEtryPt
BEGINmodInit()
CODESTARTmodInit
-SCOPINGmodInit
*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
CODEmodInit_QueryRegCFSLineHdlr
+ initConfVars();
CHKiRet(objUse(errmsg, CORE_COMPONENT));
CHKiRet(omsdRegCFSLineHdlr( (uchar *)"actionsnmptransport", 0, eCmdHdlrGetWord, NULL, &cs.pszTransport, STD_LOADABLE_MODULE_ID));