diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 10:08:13 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 10:08:13 +0200 |
commit | 398966be6d5a94d2602a08305b0533bf4a502a95 (patch) | |
tree | 6d2a7458311963fb4393ecc8549e1ece2062a7e5 /tools/omfile.c | |
parent | 68a01594000b788e530ee8f716545dafccf85982 (diff) | |
parent | dc1dd284c28a863a0b000082aaeb62c39ff0e905 (diff) | |
download | rsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.tar.gz rsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.tar.xz rsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.zip |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tests/diag.sh
Diffstat (limited to 'tools/omfile.c')
-rw-r--r-- | tools/omfile.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/omfile.c b/tools/omfile.c index 08f965b3..f32da124 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -16,7 +16,7 @@ * pipes. These have been moved to ompipe, to reduced the entanglement * between the two different functionalities. -- rgerhards * - * Copyright 2007-2009 Rainer Gerhards and Adiscon GmbH. + * Copyright 2007-2011 Rainer Gerhards and Adiscon GmbH. * * This file is part of rsyslog. * @@ -713,6 +713,14 @@ ENDdoAction BEGINparseSelectorAct CODESTARTparseSelectorAct + /* Note: the indicator sequence permits us to use '$' to signify + * outchannel, what otherwise is not possible due to truely + * unresolvable grammar conflicts (*this time no way around*). + * rgerhards, 2011-07-09 + */ + if(!strncmp((char*) p, ":omfile:", sizeof(":omfile:") - 1)) { + p += sizeof(":omfile:") - 1; + } if(!(*p == '$' || *p == '?' || *p == '/' || *p == '.' || *p == '-')) ABORT_FINALIZE(RS_RET_CONFLINE_UNPROCESSED); |