diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:36:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:36:58 +0200 |
| commit | 8fbefa688fc18dd1936158318ec92a108303d2e8 (patch) | |
| tree | 5090afbc864526b9d381b365dfc6365c0ffe408d /tools | |
| parent | 44609ec259fdd321520111049ace194a0941a157 (diff) | |
| parent | 68a01594000b788e530ee8f716545dafccf85982 (diff) | |
| download | rsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.tar.gz rsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.tar.xz rsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
doc/manual.html
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/omusrmsg.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c index da510e08..d28822ed 100644 --- a/tools/omusrmsg.c +++ b/tools/omusrmsg.c @@ -289,7 +289,9 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) * [a-zA-Z0-9_.] * plus '*' for wall */ - if(!*p || !((*p >= 'a' && *p <= 'z') || (*p >= 'A' && *p <= 'Z') + 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 == '*')) ABORT_FINALIZE(RS_RET_CONFLINE_UNPROCESSED); |