summaryrefslogtreecommitdiffstats
path: root/tools/omfile.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-07-11 09:02:09 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-07-11 09:02:09 +0200
commit53265e3c7403c290158b70f7efad2b9388a06e6c (patch)
tree6fd45b1de23595348f5f011cff83b5877bac4d73 /tools/omfile.c
parent6afbb39ea197623688e36b74f81f5ec45d0b15ff (diff)
parentdc1dd284c28a863a0b000082aaeb62c39ff0e905 (diff)
downloadrsyslog-53265e3c7403c290158b70f7efad2b9388a06e6c.tar.gz
rsyslog-53265e3c7403c290158b70f7efad2b9388a06e6c.tar.xz
rsyslog-53265e3c7403c290158b70f7efad2b9388a06e6c.zip
Merge branch 'v4-stable' into v4-devel
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'tools/omfile.c')
-rw-r--r--tools/omfile.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/omfile.c b/tools/omfile.c
index e543ec9b..b7b94597 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.
*
@@ -665,6 +665,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);