diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:32:03 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:32:03 +0200 |
| commit | 8ea796903215ecaba737f9fbe89c0e052825535d (patch) | |
| tree | eed7b742e7d50d7bae6d5f7055342469ec82fdff /tools | |
| parent | 8162ff020d7c37ca1c9ec18e31e09e7f18df1cac (diff) | |
| parent | 68a01594000b788e530ee8f716545dafccf85982 (diff) | |
| download | rsyslog-8ea796903215ecaba737f9fbe89c0e052825535d.tar.gz rsyslog-8ea796903215ecaba737f9fbe89c0e052825535d.tar.xz rsyslog-8ea796903215ecaba737f9fbe89c0e052825535d.zip | |
Merge branch 'v5-stable' into v5-devel
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 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); |