diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-26 12:09:48 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-26 12:09:48 +0100 |
| commit | 7f4972b9fa132c7e5c8077f58e3e2845326884af (patch) | |
| tree | 1100978c1a2c559d5431c71d6d40ea2bcb97317f /runtime/conf.c | |
| parent | 452fb9282d3c53ce2a7256adfc1948b10b5b532e (diff) | |
| parent | 939852b1cdfaed376342a3a0aa4b0fb7c14f55c5 (diff) | |
| download | rsyslog-7f4972b9fa132c7e5c8077f58e3e2845326884af.tar.gz rsyslog-7f4972b9fa132c7e5c8077f58e3e2845326884af.tar.xz rsyslog-7f4972b9fa132c7e5c8077f58e3e2845326884af.zip | |
Merge branch 'v4-beta' into beta
Conflicts:
ChangeLog
runtime/queue.c
Diffstat (limited to 'runtime/conf.c')
| -rw-r--r-- | runtime/conf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index d6e6ccf6..e7c1576f 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -567,6 +567,7 @@ finalize_it: * rgerhards, 2007-07-25 * updated to include OMSR pointer -- rgerhards, 2007-07-27 * updated to include template name -- rgerhards, 2008-03-28 + * rgerhards, 2010-01-19: file names end at the first space */ rsRetVal cflineParseFileName(uchar* p, uchar *pFileName, omodStringRequest_t *pOMSR, int iEntry, int iTplOpts, uchar *pszTpl) @@ -579,7 +580,7 @@ cflineParseFileName(uchar* p, uchar *pFileName, omodStringRequest_t *pOMSR, int pName = pFileName; i = 1; /* we start at 1 so that we reseve space for the '\0'! */ - while(*p && *p != ';' && i < MAXFNAME) { + while(*p && *p != ';' && *p != ' ' && i < MAXFNAME) { *pName++ = *p++; ++i; } |