diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:07:04 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:07:04 +0200 |
| commit | 68a01594000b788e530ee8f716545dafccf85982 (patch) | |
| tree | c5b54c9add730528f99c816db4faa55dfcfdbd1a /tools/omusrmsg.c | |
| parent | e8e881e9795e5dc9fc14fd7f34523bcd6ae13106 (diff) | |
| parent | f09ee69ee1b7f8c098d0720c8e85a6753cc7d342 (diff) | |
| download | rsyslog-68a01594000b788e530ee8f716545dafccf85982.tar.gz rsyslog-68a01594000b788e530ee8f716545dafccf85982.tar.xz rsyslog-68a01594000b788e530ee8f716545dafccf85982.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'tools/omusrmsg.c')
| -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 2d99c1e4..c737454f 100644 --- a/tools/omusrmsg.c +++ b/tools/omusrmsg.c @@ -279,7 +279,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); |