From 4de5aa20bc9620562d93658858903aac86b1ce00 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 13 May 2011 14:11:34 +0200
Subject: mmsnmptrapd: doc bugfix and fix issue with config stmt handler

---
 doc/mmsnmptrapd.html              | 9 ++++++---
 plugins/mmsnmptrapd/mmsnmptrapd.c | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/doc/mmsnmptrapd.html b/doc/mmsnmptrapd.html
index e69bc241..5dfb392b 100644
--- a/doc/mmsnmptrapd.html
+++ b/doc/mmsnmptrapd.html
@@ -51,8 +51,11 @@ to control output modules are also available to mmsnmptrapd.
 <ul>
 <li><b>$mmsnmptrapdTag</b> [tagname]<br>
 tells the module which start string inside the tag to look for. The default is
-"snmptrap/"
-<li><b>$mmsnmptrapdSevertiyMapping</b> [severtiymap]<br>
+"snmptrap". Note that a slash is automatically added to this tag when it comes to
+matching incoming messages. It MUST not be given, except if two slashes are required
+for whatever reasons (so "tag/" results in a check for "tag//" at the start of
+the tag field).
+<li><b>$mmsnmptrapdSeverityMapping</b> [severtiymap]<br>
 This specifies the severity mapping table. It needs to be specified as a list. Note that
 due to the current config system <b>no whitespace</b> is supported inside the list, so be
 sure not to use any whitespace inside it.<br>
@@ -76,7 +79,7 @@ severities. The default tag is used.<br>
 # ... other module loads and listener setup ...
 *.* /path/to/file/with/orignalMessage  # this file receives *un*modified messages
 $mmsnmptrapdSeverityMapping warning/4,error/3
-*.* ::mmsnmptrapd:		       # *now* message is modified
+*.* :mmsnmptrapd:		       # *now* message is modified
 *.* /path/to/file/with/modifiedMessage # this file receives modified messages
 # ... rest of config ...
 </textarea>
diff --git a/plugins/mmsnmptrapd/mmsnmptrapd.c b/plugins/mmsnmptrapd/mmsnmptrapd.c
index 8f996832..9311d5c6 100644
--- a/plugins/mmsnmptrapd/mmsnmptrapd.c
+++ b/plugins/mmsnmptrapd/mmsnmptrapd.c
@@ -421,7 +421,7 @@ CODEmodInit_QueryRegCFSLineHdlr
 	cs.pszTagName = NULL;
 	cs.pszSeverityMapping = NULL;
 	
-	CHKiRet(omsdRegCFSLineHdlr((uchar *)"mmsnmptrapdtag", 0, eCmdHdlrInt,
+	CHKiRet(omsdRegCFSLineHdlr((uchar *)"mmsnmptrapdtag", 0, eCmdHdlrGetWord,
 				    NULL, &cs.pszTagName, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"mmsnmptrapdseveritymapping", 0, eCmdHdlrGetWord,
 				    NULL, &cs.pszSeverityMapping, STD_LOADABLE_MODULE_ID));
-- 
cgit v1.2.3