From 18e97b419daa5793c57a596eed732ef8b2724142 Mon Sep 17 00:00:00 2001 From: gshapiro Date: Wed, 14 Jun 2006 16:25:31 +0000 Subject: Resolve conflicts from sendmail 8.13.7 import --- contrib/sendmail/src/conf.c | 4 ++-- contrib/sendmail/src/headers.c | 8 ++++---- contrib/sendmail/src/mci.c | 10 +++++++++- contrib/sendmail/src/savemail.c | 10 +++++----- 4 files changed, 20 insertions(+), 12 deletions(-) (limited to 'contrib/sendmail') diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c index 573cd1d..f299d5c 100644 --- a/contrib/sendmail/src/conf.c +++ b/contrib/sendmail/src/conf.c @@ -14,7 +14,7 @@ #include -SM_RCSID("@(#)$Id: conf.c,v 8.1081 2006/02/24 02:21:53 ca Exp $") +SM_RCSID("@(#)$Id: conf.c,v 8.1082 2006/03/22 22:49:33 ca Exp $") #include #if NEWDB @@ -2198,7 +2198,7 @@ shouldqueue(pri, ct) memfree < QueueLowMem) { if (tTd(3, 30)) - sm_dprintf("true (memfree=%ld < QueueLowMem)\n", + sm_dprintf("true (memfree=%ld < QueueLowMem=%ld)\n", memfree, QueueLowMem); return true; } diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c index 0bd0c49..383a053 100644 --- a/contrib/sendmail/src/headers.c +++ b/contrib/sendmail/src/headers.c @@ -14,7 +14,7 @@ #include -SM_RCSID("@(#)$Id: headers.c,v 8.290 2006/02/25 02:16:52 ca Exp $") +SM_RCSID("@(#)$Id: headers.c,v 8.291 2006/03/24 01:01:56 ca Exp $") static HDR *allocheader __P((char *, char *, int, SM_RPOOL_T *)); static size_t fix_mime_header __P((HDR *, ENVELOPE *)); @@ -1543,7 +1543,7 @@ crackaddr(addr, e) ** flags -- MIME conversion flags. ** ** Returns: -** success +** true iff header part was written successfully ** ** Side Effects: ** none. @@ -1811,7 +1811,7 @@ putheader(mci, hdr, e, flags) ** mci -- the connection info for output ** ** Returns: -** success +** true iff header was written successfully */ static bool @@ -1872,7 +1872,7 @@ put_vanilla_header(h, v, mci) ** e -- the envelope containing the message. ** ** Returns: -** success +** true iff header field was written successfully ** ** Side Effects: ** outputs "p" to file "fp". diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c index dd07449..1726379 100644 --- a/contrib/sendmail/src/mci.c +++ b/contrib/sendmail/src/mci.c @@ -14,7 +14,7 @@ #include -SM_RCSID("@(#)$Id: mci.c,v 8.216 2005/07/12 22:27:44 ca Exp $") +SM_RCSID("@(#)$Id: mci.c,v 8.217 2006/04/18 01:27:36 ca Exp $") #if NETINET || NETINET6 # include @@ -923,9 +923,17 @@ mci_read_persistent(fp, mci) char buf[MAXLINE]; if (fp == NULL) + { syserr("mci_read_persistent: NULL fp"); + /* NOTREACHED */ + return -1; + } if (mci == NULL) + { syserr("mci_read_persistent: NULL mci"); + /* NOTREACHED */ + return -1; + } if (tTd(56, 93)) { sm_dprintf("mci_read_persistent: fp=%lx, mci=", diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c index 66141df..8010b31 100644 --- a/contrib/sendmail/src/savemail.c +++ b/contrib/sendmail/src/savemail.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2003, 2006 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -15,7 +15,7 @@ #include -SM_RCSID("@(#)$Id: savemail.c,v 8.306 2006/02/25 02:16:53 ca Exp $") +SM_RCSID("@(#)$Id: savemail.c,v 8.308 2006/04/18 01:31:33 ca Exp $") static bool errbody __P((MCI *, ENVELOPE *, char *)); static bool pruneroute __P((char *)); @@ -735,7 +735,7 @@ returntosender(msg, returnq, flags, e) ** separator -- any possible MIME separator (unused). ** ** Returns: -** success +** true iff body was written successfully ** ** Side Effects: ** Outputs the body of an error message. @@ -1266,8 +1266,8 @@ errbody(mci, e, separator) /* Diagnostic-Code: -- actual result from other end */ if (q->q_rstatus != NULL) { - p = q->q_mailer->m_diagtype; - if (p == NULL) + if (q->q_mailer == NULL || + (p = q->q_mailer->m_diagtype) == NULL) p = "smtp"; (void) sm_snprintf(buf, sizeof buf, "Diagnostic-Code: %s; %.800s", -- cgit v1.1