diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-16 14:23:14 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-16 14:23:14 +0200 |
| commit | 83360a6841ce7b3d28d26fde98d9ef4f03b1e229 (patch) | |
| tree | 41d33433855d4d1a2279b9590befbcd2f3fc632e | |
| parent | d090f525286377dbb25e977829e2bcbef1eb4ddf (diff) | |
| download | rsyslog-83360a6841ce7b3d28d26fde98d9ef4f03b1e229.tar.gz rsyslog-83360a6841ce7b3d28d26fde98d9ef4f03b1e229.tar.xz rsyslog-83360a6841ce7b3d28d26fde98d9ef4f03b1e229.zip | |
increased maximum size of a configuration statement to 4K (was 1K)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | runtime/conf.c | 6 |
2 files changed, 6 insertions, 4 deletions
@@ -1,9 +1,11 @@ --------------------------------------------------------------------------- -Version 3.19.12 [BETA] (rgerhards), 2008-08-25 +Version 3.19.12 [BETA] (rgerhards), 2008-10-16 - bugfix: subseconds where not correctly extracted from a timestamp if that timestamp did not contain any subsecond information (the resulting string was garbagge but should have been "0", what it now is). +- increased maximum size of a configuration statement to 4K (was 1K) +- imported all fixes from the stable branch (quite a lot) --------------------------------------------------------------------------- Version 3.19.11 [BETA] (rgerhards), 2008-08-25 This is a refresh of the beta. No beta-specific fixes have been added. diff --git a/runtime/conf.c b/runtime/conf.c index 71b2b2da..75276a00 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> @@ -382,7 +382,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); @@ -422,7 +422,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 { |