diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-22 11:07:21 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-22 11:07:21 +0200 |
| commit | b6f496f8619b02c50d3f5ced34eff279244b6e9b (patch) | |
| tree | d534a1941848a4f9577076cd11330f3ee014033c /runtime/conf.c | |
| parent | a27e249e445deecb1d9ef57fbbb203d71bf061dd (diff) | |
| parent | 162c9e91e970cc9475bc86ffd00fd1d939e1e487 (diff) | |
| download | rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.tar.gz rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.tar.xz rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.zip | |
Merge branch 'master' into nextmaster
Conflicts:
ChangeLog
configure.ac
Diffstat (limited to 'runtime/conf.c')
| -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 { |