diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:39:27 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:39:27 +0200 |
commit | 8cd429f7eeee548ff3d5a4d44daa22c2e5a1cf3a (patch) | |
tree | 25e2849f4b65d3fe4079d45088ff5d2c18c33a13 /tools | |
parent | 8fbefa688fc18dd1936158318ec92a108303d2e8 (diff) | |
download | rsyslog-8cd429f7eeee548ff3d5a4d44daa22c2e5a1cf3a.tar.gz rsyslog-8cd429f7eeee548ff3d5a4d44daa22c2e5a1cf3a.tar.xz rsyslog-8cd429f7eeee548ff3d5a4d44daa22c2e5a1cf3a.zip |
issue a warning if old omusrmsg action syntax is used
Diffstat (limited to 'tools')
-rw-r--r-- | tools/omusrmsg.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c index d28822ed..3ee01612 100644 --- a/tools/omusrmsg.c +++ b/tools/omusrmsg.c @@ -291,9 +291,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)); |