Deleted Added
full compact
collect.c (77349) collect.c (80785)
1/*
2 * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
3 * All rights reserved.
4 * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
5 * Copyright (c) 1988, 1993
6 * The Regents of the University of California. All rights reserved.
7 *
8 * By using this file, you agree to the terms and conditions set
9 * forth in the LICENSE file which can be found at the top level of
10 * the sendmail distribution.
11 *
12 */
13
14#ifndef lint
1/*
2 * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
3 * All rights reserved.
4 * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
5 * Copyright (c) 1988, 1993
6 * The Regents of the University of California. All rights reserved.
7 *
8 * By using this file, you agree to the terms and conditions set
9 * forth in the LICENSE file which can be found at the top level of
10 * the sendmail distribution.
11 *
12 */
13
14#ifndef lint
15static char id[] = "@(#)$Id: collect.c,v 8.136.4.21 2001/05/17 18:10:14 gshapiro Exp $";
15static char id[] = "@(#)$Id: collect.c,v 8.136.4.22 2001/06/07 21:01:02 ca Exp $";
16#endif /* ! lint */
17
18#include <sendmail.h>
19
20
21static void collecttimeout __P((time_t));
22static void dferror __P((FILE *volatile, char *, ENVELOPE *));
23static void eatfrom __P((char *volatile, ENVELOPE *));

--- 323 unchanged lines hidden (view full) ---

347#else /* 0 */
348 /* EMPTY */
349#endif /* 0 */
350 }
351 else if (c != '\0')
352 {
353 *bp++ = c;
354 hdrslen++;
16#endif /* ! lint */
17
18#include <sendmail.h>
19
20
21static void collecttimeout __P((time_t));
22static void dferror __P((FILE *volatile, char *, ENVELOPE *));
23static void eatfrom __P((char *volatile, ENVELOPE *));

--- 323 unchanged lines hidden (view full) ---

347#else /* 0 */
348 /* EMPTY */
349#endif /* 0 */
350 }
351 else if (c != '\0')
352 {
353 *bp++ = c;
354 hdrslen++;
355 if (MaxHeadersLength > 0 &&
355 if (!headeronly &&
356 MaxHeadersLength > 0 &&
356 hdrslen > MaxHeadersLength)
357 {
358 sm_syslog(LOG_NOTICE, e->e_id,
359 "headers too large (%d max) from %s during message collect",
360 MaxHeadersLength,
361 CurHostName != NULL ? CurHostName : "localhost");
362 errno = 0;
363 e->e_flags |= EF_CLRQUEUE;

--- 559 unchanged lines hidden ---
357 hdrslen > MaxHeadersLength)
358 {
359 sm_syslog(LOG_NOTICE, e->e_id,
360 "headers too large (%d max) from %s during message collect",
361 MaxHeadersLength,
362 CurHostName != NULL ? CurHostName : "localhost");
363 errno = 0;
364 e->e_flags |= EF_CLRQUEUE;

--- 559 unchanged lines hidden ---