diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-16 15:09:14 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-16 15:09:14 +0200 |
| commit | 8892c5293248d730907bed5f956cbcfa2938fc6e (patch) | |
| tree | 63bce27bbc164442953b2c3a635186d371fb2252 /runtime | |
| parent | 7963aed7d6a91ba8d1c9c4bca0cd7607f1ba9d71 (diff) | |
| parent | 11e2d2c3bede67cc09580269fcc45d2f3e604eba (diff) | |
| download | rsyslog-8892c5293248d730907bed5f956cbcfa2938fc6e.tar.gz rsyslog-8892c5293248d730907bed5f956cbcfa2938fc6e.tar.xz rsyslog-8892c5293248d730907bed5f956cbcfa2938fc6e.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/conf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index e55b8d18..f71d5669 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -31,7 +31,7 @@ * * A copy of the GPL can be found in the file "COPYING" in this distribution. */ - +#define CFGLNSIZ 4096 /* the maximum size of a configuraton file line, after re-combination */ #include "config.h" #include <stdlib.h> #include <stdio.h> @@ -392,7 +392,7 @@ processConfFile(uchar *pConfFile) FILE *cf; selector_t *fCurr = NULL; uchar *p; - uchar cbuf[BUFSIZ]; + uchar cbuf[CFGLNSIZ]; uchar *cline; int i; ASSERT(pConfFile != NULL); @@ -432,7 +432,7 @@ processConfFile(uchar *pConfFile) for (p = (uchar*) strchr((char*)cline, '\0'); isspace((int) *--p);) /*EMPTY*/; if (*p == '\\') { - if ((p - cbuf) > BUFSIZ - 30) { + if ((p - cbuf) > CFGLNSIZ - 30) { /* Oops the buffer is full - what now? */ cline = cbuf; } else { |