diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 10:48:33 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 10:48:33 +0200 |
| commit | ad296ff1be9045bfa2da7a1ab304f31f2366bc6b (patch) | |
| tree | a6a3e6d7226a9b93f52aba50f6413c02b17470ca /tools/omfile.c | |
| parent | 88fdb0c5ef6a34d28b358c9a50a6b172e25c4ee4 (diff) | |
| parent | a9933094b20d70da1641d80bb723e2570b937c36 (diff) | |
| download | rsyslog-ad296ff1be9045bfa2da7a1ab304f31f2366bc6b.tar.gz rsyslog-ad296ff1be9045bfa2da7a1ab304f31f2366bc6b.tar.xz rsyslog-ad296ff1be9045bfa2da7a1ab304f31f2366bc6b.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
Diffstat (limited to 'tools/omfile.c')
| -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 4e80e2f6..fa2fd156 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. * @@ -707,6 +707,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); |