diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 11:02:55 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 11:02:55 +0200 |
| commit | 4e6a10161ba592a9e72c7585fa4cfcb5d0f8d420 (patch) | |
| tree | 5fbce194ca939a2999ad944647dc67e5913b68ff /tools | |
| parent | 8cd429f7eeee548ff3d5a4d44daa22c2e5a1cf3a (diff) | |
| parent | a9933094b20d70da1641d80bb723e2570b937c36 (diff) | |
| download | rsyslog-4e6a10161ba592a9e72c7585fa4cfcb5d0f8d420.tar.gz rsyslog-4e6a10161ba592a9e72c7585fa4cfcb5d0f8d420.tar.xz rsyslog-4e6a10161ba592a9e72c7585fa4cfcb5d0f8d420.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/omfile.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/tools/omfile.c b/tools/omfile.c index eb9933cd..a861ed0b 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. * @@ -725,6 +725,21 @@ 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; + } else { + if(*p == '$') { + errmsg.LogError(0, RS_RET_OUTDATED_STMT, + "action '%s' treated as ':omfile:%s' - please " + "change syntax, '%s' will not be supported in " + "rsyslog v6 and above.", p, p, p); + } + } if(!(*p == '$' || *p == '?' || *p == '/' || *p == '.' || *p == '-')) ABORT_FINALIZE(RS_RET_CONFLINE_UNPROCESSED); |