Resolve conflicts from sendmail 8.13.7 import
This commit is contained in:
parent
5e7d85418b
commit
355d91e30e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=159613
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
#include <sendmail.h>
|
#include <sendmail.h>
|
||||||
|
|
||||||
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 <sendmail/pathnames.h>
|
#include <sendmail/pathnames.h>
|
||||||
#if NEWDB
|
#if NEWDB
|
||||||
@ -2198,7 +2198,7 @@ shouldqueue(pri, ct)
|
|||||||
memfree < QueueLowMem)
|
memfree < QueueLowMem)
|
||||||
{
|
{
|
||||||
if (tTd(3, 30))
|
if (tTd(3, 30))
|
||||||
sm_dprintf("true (memfree=%ld < QueueLowMem)\n",
|
sm_dprintf("true (memfree=%ld < QueueLowMem=%ld)\n",
|
||||||
memfree, QueueLowMem);
|
memfree, QueueLowMem);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
#include <sendmail.h>
|
#include <sendmail.h>
|
||||||
|
|
||||||
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 HDR *allocheader __P((char *, char *, int, SM_RPOOL_T *));
|
||||||
static size_t fix_mime_header __P((HDR *, ENVELOPE *));
|
static size_t fix_mime_header __P((HDR *, ENVELOPE *));
|
||||||
@ -1543,7 +1543,7 @@ crackaddr(addr, e)
|
|||||||
** flags -- MIME conversion flags.
|
** flags -- MIME conversion flags.
|
||||||
**
|
**
|
||||||
** Returns:
|
** Returns:
|
||||||
** success
|
** true iff header part was written successfully
|
||||||
**
|
**
|
||||||
** Side Effects:
|
** Side Effects:
|
||||||
** none.
|
** none.
|
||||||
@ -1811,7 +1811,7 @@ putheader(mci, hdr, e, flags)
|
|||||||
** mci -- the connection info for output
|
** mci -- the connection info for output
|
||||||
**
|
**
|
||||||
** Returns:
|
** Returns:
|
||||||
** success
|
** true iff header was written successfully
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
@ -1872,7 +1872,7 @@ put_vanilla_header(h, v, mci)
|
|||||||
** e -- the envelope containing the message.
|
** e -- the envelope containing the message.
|
||||||
**
|
**
|
||||||
** Returns:
|
** Returns:
|
||||||
** success
|
** true iff header field was written successfully
|
||||||
**
|
**
|
||||||
** Side Effects:
|
** Side Effects:
|
||||||
** outputs "p" to file "fp".
|
** outputs "p" to file "fp".
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
#include <sendmail.h>
|
#include <sendmail.h>
|
||||||
|
|
||||||
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
|
#if NETINET || NETINET6
|
||||||
# include <arpa/inet.h>
|
# include <arpa/inet.h>
|
||||||
@ -923,9 +923,17 @@ mci_read_persistent(fp, mci)
|
|||||||
char buf[MAXLINE];
|
char buf[MAXLINE];
|
||||||
|
|
||||||
if (fp == NULL)
|
if (fp == NULL)
|
||||||
|
{
|
||||||
syserr("mci_read_persistent: NULL fp");
|
syserr("mci_read_persistent: NULL fp");
|
||||||
|
/* NOTREACHED */
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
if (mci == NULL)
|
if (mci == NULL)
|
||||||
|
{
|
||||||
syserr("mci_read_persistent: NULL mci");
|
syserr("mci_read_persistent: NULL mci");
|
||||||
|
/* NOTREACHED */
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
if (tTd(56, 93))
|
if (tTd(56, 93))
|
||||||
{
|
{
|
||||||
sm_dprintf("mci_read_persistent: fp=%lx, mci=",
|
sm_dprintf("mci_read_persistent: fp=%lx, mci=",
|
||||||
|
@ -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.
|
* All rights reserved.
|
||||||
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
|
* Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved.
|
||||||
* Copyright (c) 1988, 1993
|
* Copyright (c) 1988, 1993
|
||||||
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
#include <sendmail.h>
|
#include <sendmail.h>
|
||||||
|
|
||||||
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 errbody __P((MCI *, ENVELOPE *, char *));
|
||||||
static bool pruneroute __P((char *));
|
static bool pruneroute __P((char *));
|
||||||
@ -735,7 +735,7 @@ returntosender(msg, returnq, flags, e)
|
|||||||
** separator -- any possible MIME separator (unused).
|
** separator -- any possible MIME separator (unused).
|
||||||
**
|
**
|
||||||
** Returns:
|
** Returns:
|
||||||
** success
|
** true iff body was written successfully
|
||||||
**
|
**
|
||||||
** Side Effects:
|
** Side Effects:
|
||||||
** Outputs the body of an error message.
|
** Outputs the body of an error message.
|
||||||
@ -1266,8 +1266,8 @@ errbody(mci, e, separator)
|
|||||||
/* Diagnostic-Code: -- actual result from other end */
|
/* Diagnostic-Code: -- actual result from other end */
|
||||||
if (q->q_rstatus != NULL)
|
if (q->q_rstatus != NULL)
|
||||||
{
|
{
|
||||||
p = q->q_mailer->m_diagtype;
|
if (q->q_mailer == NULL ||
|
||||||
if (p == NULL)
|
(p = q->q_mailer->m_diagtype) == NULL)
|
||||||
p = "smtp";
|
p = "smtp";
|
||||||
(void) sm_snprintf(buf, sizeof buf,
|
(void) sm_snprintf(buf, sizeof buf,
|
||||||
"Diagnostic-Code: %s; %.800s",
|
"Diagnostic-Code: %s; %.800s",
|
||||||
|
Loading…
Reference in New Issue
Block a user