summaryrefslogtreecommitdiffstats
path: root/tools/omusrmsg.c
diff options
context:
space:
mode:
authorAndre Lorbach <alorbach@adiscon.com>2011-08-10 11:24:38 +0200
committerAndre Lorbach <alorbach@adiscon.com>2011-08-10 11:24:38 +0200
commite90a380aacb0b7304bec004ea0208b121331dcd3 (patch)
treee54a672fc566b1028c671358e832191c87b76e40 /tools/omusrmsg.c
parentafb4f8e6a24398e7eeafb1f7e76189e0abbc430d (diff)
parentec1f816dae971ee66eff49bb07da352a524df0b6 (diff)
downloadrsyslog-e90a380aacb0b7304bec004ea0208b121331dcd3.tar.gz
rsyslog-e90a380aacb0b7304bec004ea0208b121331dcd3.tar.bz2
rsyslog-e90a380aacb0b7304bec004ea0208b121331dcd3.zip
Merge branch 'v5-devel' of git+ssh://al@git.adiscon.com/git/rsyslog into v5-devel
Diffstat (limited to 'tools/omusrmsg.c')
-rw-r--r--tools/omusrmsg.c4
1 files changed, 4 insertions, 0 deletions
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