From d6b6b30c189bf8ea78b59b8b4d3008d1f89ef1b3 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 9 Aug 2011 11:48:52 +0200
Subject: added capability to emit config error location info for warnings

otherwise, omusrmsg's warning about new config format was not
accompanied by problem location.
---
 tools/omusrmsg.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tools/omusrmsg.c')

diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c
index 6d46813e..459e5fd6 100644
--- a/tools/omusrmsg.c
+++ b/tools/omusrmsg.c
@@ -273,6 +273,7 @@ ENDdoAction
 BEGINparseSelectorAct
 	uchar *q;
 	int i;
+	int bHadWarning = 0;
 CODESTARTparseSelectorAct
 CODE_STD_STRING_REQUESTparseSelectorAct(1)
 	   /* User names must begin with a gnu e-regex:
@@ -290,6 +291,7 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1)
 			   "action '%s' treated as ':omusrmsg:%s' - please "
 			   "change syntax, '%s' will not be supported in the future",
 			   p, p, p);
+			bHadWarning = 1;
 		}
 	}
 
@@ -325,6 +327,8 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1)
 			!= RS_RET_OK)
 			goto finalize_it;
 	}
+	if(iRet == RS_RET_OK && bHadWarning)
+		iRet = RS_RET_OK_WARN;
 CODE_STD_FINALIZERparseSelectorAct
 ENDparseSelectorAct
 
-- 
cgit