diff options
| author | peter <peter@FreeBSD.org> | 1999-02-07 09:40:41 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-02-07 09:40:41 +0000 |
| commit | 19c8fca2df7a6f39e5208229f428ec269fb3adbf (patch) | |
| tree | 880a7cd01e2b6a0483601535c1a4c1b63a131b51 /contrib/sendmail/src/readcf.c | |
| parent | d7ac03c10c41129058bfcad4473d778394642703 (diff) | |
| download | FreeBSD-src-19c8fca2df7a6f39e5208229f428ec269fb3adbf.zip FreeBSD-src-19c8fca2df7a6f39e5208229f428ec269fb3adbf.tar.gz | |
Import sendmail 8.9.3 onto vendor branch, replacing previous interim
8.9.2 + patches version.
Obtained from: ftp.sendmail.org
Diffstat (limited to 'contrib/sendmail/src/readcf.c')
| -rw-r--r-- | contrib/sendmail/src/readcf.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/contrib/sendmail/src/readcf.c b/contrib/sendmail/src/readcf.c index ab81027..df40097 100644 --- a/contrib/sendmail/src/readcf.c +++ b/contrib/sendmail/src/readcf.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)readcf.c 8.235 (Berkeley) 8/18/1998"; +static char sccsid[] = "@(#)readcf.c 8.238 (Berkeley) 1/28/1999"; #endif /* not lint */ # include "sendmail.h" @@ -1527,9 +1527,9 @@ struct optioninfo #define O_CONTROLSOCKET 0xa9 { "ControlSocketName", O_CONTROLSOCKET, FALSE }, #endif -#if _FFR_MAX_HEADER_LINES -#define O_MAXHDRLINES 0xaa - { "MaxHeaderLines", O_MAXHDRLINES, FALSE }, +#if _FFR_MAX_HEADERS_LENGTH +#define O_MAXHDRSLEN 0xaa + { "MaxHeadersLength", O_MAXHDRSLEN, FALSE }, #endif { NULL, '\0', FALSE } }; @@ -2470,22 +2470,13 @@ setoption(opt, val, safe, sticky, e) break; #endif -#if _FFR_MAX_HEADER_LINES - case O_MAXHDRLINES: - p = strchr(val, '/'); - if (p != NULL) - *p++ = '\0'; - MaxHeaderLines = atoi(val); - if (p != NULL && *p != '\0') - MaxHeaderLineLength = atoi(p); - - if (MaxHeaderLines > 0 && - MaxHeaderLines < 50) - printf("Warning: MaxHeaderLines: header line limit set lower than 50\n"); +#if _FFR_MAX_HEADERS_LENGTH + case O_MAXHDRSLEN: + MaxHeadersLength = atoi(val); - if (MaxHeaderLineLength > 0 && - MaxHeaderLineLength < MAXHDRLINELEN) - printf("Warning: MaxHeaderLines: header line length limit set lower than %d\n", MAXHDRLINELEN); + if (MaxHeadersLength > 0 && + MaxHeadersLength < (MAXHDRSLEN / 2)) + printf("Warning: MaxHeadersLength: headers length limit set lower than %d\n", MAXHDRSLEN); break; #endif |
