diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-26 12:48:57 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-26 12:48:57 +0200 |
| commit | f2528ec101eb660560c7ec327d440cbb17f04f14 (patch) | |
| tree | 05083efcd96dedc9387579caa17c81b8b78592c6 /tools/omusrmsg.c | |
| parent | ceb336f0398e37ab51b4b54a14fa394d53ccdf3f (diff) | |
| parent | 0c7604dc27119122a3022c7bf094ffb5f8d59e6d (diff) | |
| download | rsyslog-f2528ec101eb660560c7ec327d440cbb17f04f14.tar.gz rsyslog-f2528ec101eb660560c7ec327d440cbb17f04f14.tar.xz rsyslog-f2528ec101eb660560c7ec327d440cbb17f04f14.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/conf.c
tools/omfile.c
tools/omusrmsg.c
Diffstat (limited to 'tools/omusrmsg.c')
| -rw-r--r-- | tools/omusrmsg.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c index 358b6ce7..f30af5c3 100644 --- a/tools/omusrmsg.c +++ b/tools/omusrmsg.c @@ -388,6 +388,7 @@ ENDnewActInst BEGINparseSelectorAct es_str_t *usrs; + int bHadWarning; CODESTARTparseSelectorAct CODE_STD_STRING_REQUESTparseSelectorAct(1) if(!strncmp((char*) p, ":omusrmsg:", sizeof(":omusrmsg:") - 1)) { @@ -395,12 +396,13 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) } else { if(!*p || !((*p >= 'a' && *p <= 'z') || (*p >= 'A' && *p <= 'Z') || (*p >= '0' && *p <= '9') || *p == '_' || *p == '.' || *p == '*')) { - ABORT_FINALIZE(RS_RET_CONFLINE_UNPROCESSED); + ABORT_FINALIZE(RS_RET_CONFLINE_UNPROCESSED); } else { errmsg.LogError(0, RS_RET_OUTDATED_STMT, "action '%s' treated as ':omusrmsg:%s' - please " "change syntax, '%s' will not be supported in the future", p, p, p); + bHadWarning = 1; } } @@ -424,6 +426,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 |