summaryrefslogtreecommitdiffstats
path: root/tools/omusrmsg.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-07-06 08:32:07 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-07-06 08:32:07 +0200
commit88fdb0c5ef6a34d28b358c9a50a6b172e25c4ee4 (patch)
tree8ed4031820199da407f5d15ab23cb006c39bc93b /tools/omusrmsg.c
parent8ea796903215ecaba737f9fbe89c0e052825535d (diff)
downloadrsyslog-88fdb0c5ef6a34d28b358c9a50a6b172e25c4ee4.tar.gz
rsyslog-88fdb0c5ef6a34d28b358c9a50a6b172e25c4ee4.tar.xz
rsyslog-88fdb0c5ef6a34d28b358c9a50a6b172e25c4ee4.zip
issue a warning if old omusrmsg action syntax is used
Diffstat (limited to 'tools/omusrmsg.c')
-rw-r--r--tools/omusrmsg.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c
index c737454f..6d46813e 100644
--- a/tools/omusrmsg.c
+++ b/tools/omusrmsg.c
@@ -281,9 +281,17 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1)
*/
if(!strncmp((char*) p, ":omusrmsg:", sizeof(":omusrmsg:") - 1)) {
p += sizeof(":omusrmsg:") - 1; /* eat indicator sequence (-1 because of '\0'!) */
- } else if(!*p || !((*p >= 'a' && *p <= 'z') || (*p >= 'A' && *p <= 'Z')
- || (*p >= '0' && *p <= '9') || *p == '_' || *p == '.' || *p == '*'))
+ } else {
+ if(!*p || !((*p >= 'a' && *p <= 'z') || (*p >= 'A' && *p <= 'Z')
+ || (*p >= '0' && *p <= '9') || *p == '_' || *p == '.' || *p == '*')) {
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);
+ }
+ }
CHKiRet(createInstance(&pData));