Deleted Added
full compact
headers.c (102533) headers.c (110563)
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 *
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 * $FreeBSD: head/contrib/sendmail/src/headers.c 102533 2002-08-28 18:12:33Z gshapiro $
12 * $FreeBSD: head/contrib/sendmail/src/headers.c 110563 2003-02-08 20:35:51Z gshapiro $
13 *
14 */
15
16#include <sendmail.h>
17
13 *
14 */
15
16#include <sendmail.h>
17
18SM_RCSID("@(#)$Id: headers.c,v 8.266.4.1 2002/08/16 14:56:01 ca Exp $")
18SM_RCSID("@(#)$Id: headers.c,v 8.266.4.2 2002/09/23 23:42:02 ca Exp $")
19
20static size_t fix_mime_header __P((char *));
21static int priencode __P((char *));
22static void put_vanilla_header __P((HDR *, char *, MCI *));
23
24/*
25** SETUPHEADERS -- initialize headers in symbol table
26**

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

925 }
926 p = macvalue(macid("{daemon_name}"), e);
927 if (p != NULL)
928 {
929 (void) sm_snprintf(sbp, SPACELEFT(sbuf, sbp),
930 ", daemon=%.20s", p);
931 sbp += strlen(sbp);
932 }
19
20static size_t fix_mime_header __P((char *));
21static int priencode __P((char *));
22static void put_vanilla_header __P((HDR *, char *, MCI *));
23
24/*
25** SETUPHEADERS -- initialize headers in symbol table
26**

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

925 }
926 p = macvalue(macid("{daemon_name}"), e);
927 if (p != NULL)
928 {
929 (void) sm_snprintf(sbp, SPACELEFT(sbuf, sbp),
930 ", daemon=%.20s", p);
931 sbp += strlen(sbp);
932 }
933 sm_syslog(LOG_INFO, e->e_id, "%.850s, relay=%.100s", sbuf, name);
933 sm_syslog(LOG_INFO, e->e_id, "%.850s, relay=%s", sbuf, name);
934
935#else /* (SYSLOG_BUFSIZE) >= 256 */
936
937 sm_syslog(LOG_INFO, e->e_id,
938 "from=%s",
939 e->e_from.q_paddr == NULL ? "<NONE>"
940 : shortenstring(e->e_from.q_paddr,
941 83));

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

957 p = macvalue('r', e);
958 if (p != NULL)
959 {
960 (void) sm_snprintf(sbp, SPACELEFT(sbuf, sbp),
961 "proto=%.20s, ", p);
962 sbp += strlen(sbp);
963 }
964 sm_syslog(LOG_INFO, e->e_id,
934
935#else /* (SYSLOG_BUFSIZE) >= 256 */
936
937 sm_syslog(LOG_INFO, e->e_id,
938 "from=%s",
939 e->e_from.q_paddr == NULL ? "<NONE>"
940 : shortenstring(e->e_from.q_paddr,
941 83));

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

957 p = macvalue('r', e);
958 if (p != NULL)
959 {
960 (void) sm_snprintf(sbp, SPACELEFT(sbuf, sbp),
961 "proto=%.20s, ", p);
962 sbp += strlen(sbp);
963 }
964 sm_syslog(LOG_INFO, e->e_id,
965 "%.400srelay=%.100s", sbuf, name);
965 "%.400srelay=%s", sbuf, name);
966#endif /* (SYSLOG_BUFSIZE) >= 256 */
967}
968/*
969** PRIENCODE -- encode external priority names into internal values.
970**
971** Parameters:
972** p -- priority in ascii.
973**

--- 946 unchanged lines hidden ---
966#endif /* (SYSLOG_BUFSIZE) >= 256 */
967}
968/*
969** PRIENCODE -- encode external priority names into internal values.
970**
971** Parameters:
972** p -- priority in ascii.
973**

--- 946 unchanged lines hidden ---