Resolve conflicts from sendmail 8.14.2 import
This commit is contained in:
parent
b834e0522a
commit
41f3d2cef4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=173343
@ -20,7 +20,7 @@ SM_IDSTR(copyright,
|
|||||||
Copyright (c) 1992, 1993\n\
|
Copyright (c) 1992, 1993\n\
|
||||||
The Regents of the University of California. All rights reserved.\n")
|
The Regents of the University of California. All rights reserved.\n")
|
||||||
|
|
||||||
SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.177 2004/08/03 23:57:24 ca Exp $")
|
SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.178 2007/05/11 18:45:39 ca Exp $")
|
||||||
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
@ -42,7 +42,7 @@ uid_t RealUid;
|
|||||||
gid_t RealGid;
|
gid_t RealGid;
|
||||||
char *RealUserName;
|
char *RealUserName;
|
||||||
uid_t RunAsUid;
|
uid_t RunAsUid;
|
||||||
uid_t RunAsGid;
|
gid_t RunAsGid;
|
||||||
char *RunAsUserName;
|
char *RunAsUserName;
|
||||||
int Verbose = 2;
|
int Verbose = 2;
|
||||||
bool DontInitGroups = false;
|
bool DontInitGroups = false;
|
||||||
|
@ -20,7 +20,7 @@ SM_IDSTR(copyright,
|
|||||||
Copyright (c) 1988, 1993\n\
|
Copyright (c) 1988, 1993\n\
|
||||||
The Regents of the University of California. All rights reserved.\n")
|
The Regents of the University of California. All rights reserved.\n")
|
||||||
|
|
||||||
SM_IDSTR(id, "@(#)$Id: praliases.c,v 8.93 2001/09/11 04:05:07 gshapiro Exp $")
|
SM_IDSTR(id, "@(#)$Id: praliases.c,v 8.94 2007/05/11 18:50:36 ca Exp $")
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
@ -45,7 +45,7 @@ uid_t RealUid;
|
|||||||
gid_t RealGid;
|
gid_t RealGid;
|
||||||
char *RealUserName;
|
char *RealUserName;
|
||||||
uid_t RunAsUid;
|
uid_t RunAsUid;
|
||||||
uid_t RunAsGid;
|
gid_t RunAsGid;
|
||||||
char *RunAsUserName;
|
char *RunAsUserName;
|
||||||
int Verbose = 2;
|
int Verbose = 2;
|
||||||
bool DontInitGroups = false;
|
bool DontInitGroups = false;
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
#include <sendmail.h>
|
#include <sendmail.h>
|
||||||
|
|
||||||
SM_RCSID("@(#)$Id: conf.c,v 8.1128 2007/04/03 21:32:29 ca Exp $")
|
SM_RCSID("@(#)$Id: conf.c,v 8.1136 2007/10/10 00:06:45 ca Exp $")
|
||||||
|
|
||||||
#include <sm/sendmail.h>
|
#include <sm/sendmail.h>
|
||||||
#include <sendmail/pathnames.h>
|
#include <sendmail/pathnames.h>
|
||||||
@ -5317,17 +5317,8 @@ sm_syslog(level, id, fmt, va_alist)
|
|||||||
|
|
||||||
save_errno = errno;
|
save_errno = errno;
|
||||||
if (id == NULL)
|
if (id == NULL)
|
||||||
{
|
|
||||||
id = "NOQUEUE";
|
id = "NOQUEUE";
|
||||||
idlen = strlen(id) + SyslogPrefixLen;
|
idlen = strlen(id) + SyslogPrefixLen;
|
||||||
}
|
|
||||||
else if (strcmp(id, NOQID) == 0)
|
|
||||||
{
|
|
||||||
id = "";
|
|
||||||
idlen = SyslogPrefixLen;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
idlen = strlen(id) + SyslogPrefixLen;
|
|
||||||
|
|
||||||
buf = buf0;
|
buf = buf0;
|
||||||
bufsize = sizeof(buf0);
|
bufsize = sizeof(buf0);
|
||||||
@ -6025,6 +6016,10 @@ char *OsCompileOptions[] =
|
|||||||
|
|
||||||
char *FFRCompileOptions[] =
|
char *FFRCompileOptions[] =
|
||||||
{
|
{
|
||||||
|
#if _FFR_ADDR_TYPE_MODES
|
||||||
|
/* more info in {addr_type}, requires m4 changes! */
|
||||||
|
"_FFR_ADDR_TYPE_MODES",
|
||||||
|
#endif /* _FFR_ADDR_TYPE_MODES */
|
||||||
#if _FFR_ALLOW_SASLINFO
|
#if _FFR_ALLOW_SASLINFO
|
||||||
/* DefaultAuthInfo can be specified by user. */
|
/* DefaultAuthInfo can be specified by user. */
|
||||||
/* DefaultAuthInfo doesn't really work in 8.13 anymore. */
|
/* DefaultAuthInfo doesn't really work in 8.13 anymore. */
|
||||||
@ -6095,6 +6090,10 @@ char *FFRCompileOptions[] =
|
|||||||
|
|
||||||
"_FFR_DPO_CS",
|
"_FFR_DPO_CS",
|
||||||
#endif /* _FFR_DPO_CS */
|
#endif /* _FFR_DPO_CS */
|
||||||
|
#if _FFR_DPRINTF_MAP
|
||||||
|
/* dprintf map for logging */
|
||||||
|
"_FFR_DPRINTF_MAP",
|
||||||
|
#endif /* _FFR_DPRINTF_MAP */
|
||||||
#if _FFR_DROP_TRUSTUSER_WARNING
|
#if _FFR_DROP_TRUSTUSER_WARNING
|
||||||
/*
|
/*
|
||||||
** Don't issue this warning:
|
** Don't issue this warning:
|
||||||
@ -6223,6 +6222,10 @@ char *FFRCompileOptions[] =
|
|||||||
/* Old mime7to8 code, the new is broken for at least one example. */
|
/* Old mime7to8 code, the new is broken for at least one example. */
|
||||||
"_FFR_MIME7TO8_OLD",
|
"_FFR_MIME7TO8_OLD",
|
||||||
#endif /* _FFR_MAX_SLEEP_TIME */
|
#endif /* _FFR_MAX_SLEEP_TIME */
|
||||||
|
#if _FFR_MORE_MACROS
|
||||||
|
/* allow more long macro names ("unprintable" characters). */
|
||||||
|
"_FFR_MORE_MACROS",
|
||||||
|
#endif /* _FFR_MORE_MACROS */
|
||||||
#if _FFR_MSG_ACCEPT
|
#if _FFR_MSG_ACCEPT
|
||||||
/* allow to override "Message accepted for delivery" */
|
/* allow to override "Message accepted for delivery" */
|
||||||
"_FFR_MSG_ACCEPT",
|
"_FFR_MSG_ACCEPT",
|
||||||
@ -6236,6 +6239,10 @@ char *FFRCompileOptions[] =
|
|||||||
/* Disable PIPELINING, delay client if used. */
|
/* Disable PIPELINING, delay client if used. */
|
||||||
"_FFR_NO_PIPE",
|
"_FFR_NO_PIPE",
|
||||||
#endif /* _FFR_NO_PIPE */
|
#endif /* _FFR_NO_PIPE */
|
||||||
|
#if _FFR_LDAP_NETWORK_TIMEOUT
|
||||||
|
/* set LDAP_OPT_NETWORK_TIMEOUT if available (-c) */
|
||||||
|
"_FFR_LDAP_NETWORK_TIMEOUT",
|
||||||
|
#endif /* _FFR_LDAP_NETWORK_TIMEOUT */
|
||||||
#if _FFR_LOG_NTRIES
|
#if _FFR_LOG_NTRIES
|
||||||
/* log ntries=, from Nik Clayton of FreeBSD */
|
/* log ntries=, from Nik Clayton of FreeBSD */
|
||||||
"_FFR_LOG_NTRIES",
|
"_FFR_LOG_NTRIES",
|
||||||
@ -6281,6 +6288,18 @@ char *FFRCompileOptions[] =
|
|||||||
/* Random shuffle for queue sorting. */
|
/* Random shuffle for queue sorting. */
|
||||||
"_FFR_RHS",
|
"_FFR_RHS",
|
||||||
#endif /* _FFR_RHS */
|
#endif /* _FFR_RHS */
|
||||||
|
#if _FFR_RUNPQG
|
||||||
|
/*
|
||||||
|
** allow -qGqueue_group -qp to work, i.e.,
|
||||||
|
** restrict a persistent queue runner to a queue group.
|
||||||
|
*/
|
||||||
|
|
||||||
|
"_FFR_RUNPQG",
|
||||||
|
#endif /* _FFR_RUNPQG */
|
||||||
|
#if _FFR_SESSID
|
||||||
|
/* session id (for logging) */
|
||||||
|
"_FFR_SESSID",
|
||||||
|
#endif /* _FFR_SESSID */
|
||||||
#if _FFR_SHM_STATUS
|
#if _FFR_SHM_STATUS
|
||||||
/* Donated code (unused). */
|
/* Donated code (unused). */
|
||||||
"_FFR_SHM_STATUS",
|
"_FFR_SHM_STATUS",
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
#include <sendmail.h>
|
#include <sendmail.h>
|
||||||
#include <sm/sendmail.h>
|
#include <sm/sendmail.h>
|
||||||
|
|
||||||
SM_RCSID("@(#)$Id: headers.c,v 8.310 2007/02/07 22:44:35 ca Exp $")
|
SM_RCSID("@(#)$Id: headers.c,v 8.312 2007/06/19 18:52:11 ca Exp $")
|
||||||
|
|
||||||
static HDR *allocheader __P((char *, char *, int, SM_RPOOL_T *, bool));
|
static HDR *allocheader __P((char *, char *, int, SM_RPOOL_T *, bool));
|
||||||
static size_t fix_mime_header __P((HDR *, ENVELOPE *));
|
static size_t fix_mime_header __P((HDR *, ENVELOPE *));
|
||||||
@ -1866,7 +1866,8 @@ putheader(mci, hdr, e, flags)
|
|||||||
|
|
||||||
if (bitset(H_FROM, h->h_flags))
|
if (bitset(H_FROM, h->h_flags))
|
||||||
oldstyle = false;
|
oldstyle = false;
|
||||||
commaize(h, p, oldstyle, mci, e);
|
commaize(h, p, oldstyle, mci, e,
|
||||||
|
PXLF_HEADER | PXLF_STRIPMQUOTE);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -1978,6 +1979,7 @@ put_vanilla_header(h, v, mci)
|
|||||||
** oldstyle -- true if this is an old style header.
|
** oldstyle -- true if this is an old style header.
|
||||||
** mci -- the connection information.
|
** mci -- the connection information.
|
||||||
** e -- the envelope containing the message.
|
** e -- the envelope containing the message.
|
||||||
|
** putflags -- flags for putxline()
|
||||||
**
|
**
|
||||||
** Returns:
|
** Returns:
|
||||||
** true iff header field was written successfully
|
** true iff header field was written successfully
|
||||||
@ -1987,17 +1989,17 @@ put_vanilla_header(h, v, mci)
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
bool
|
bool
|
||||||
commaize(h, p, oldstyle, mci, e)
|
commaize(h, p, oldstyle, mci, e, putflags)
|
||||||
register HDR *h;
|
register HDR *h;
|
||||||
register char *p;
|
register char *p;
|
||||||
bool oldstyle;
|
bool oldstyle;
|
||||||
register MCI *mci;
|
register MCI *mci;
|
||||||
register ENVELOPE *e;
|
register ENVELOPE *e;
|
||||||
|
int putflags;
|
||||||
{
|
{
|
||||||
register char *obp;
|
register char *obp;
|
||||||
int opos, omax, spaces;
|
int opos, omax, spaces;
|
||||||
bool firstone = true;
|
bool firstone = true;
|
||||||
int putflags = PXLF_HEADER | PXLF_STRIPMQUOTE;
|
|
||||||
char **res;
|
char **res;
|
||||||
char obuf[MAXLINE + 3];
|
char obuf[MAXLINE + 3];
|
||||||
|
|
||||||
|
@ -9,9 +9,9 @@
|
|||||||
.\" the sendmail distribution.
|
.\" the sendmail distribution.
|
||||||
.\"
|
.\"
|
||||||
.\"
|
.\"
|
||||||
.\" $Id: sendmail.8,v 8.57 2003/12/01 17:02:41 ca Exp $
|
.\" $Id: sendmail.8,v 8.58 2007/08/02 05:42:33 ca Exp $
|
||||||
.\"
|
.\"
|
||||||
.TH SENDMAIL 8 "$Date: 2003/12/01 17:02:41 $"
|
.TH SENDMAIL 8 "$Date: 2007/08/02 05:42:33 $"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
sendmail
|
sendmail
|
||||||
\- an electronic mail transport agent
|
\- an electronic mail transport agent
|
||||||
@ -314,7 +314,7 @@ empty in the previous queue run.
|
|||||||
Process saved messages in the queue once and do not fork(),
|
Process saved messages in the queue once and do not fork(),
|
||||||
but run in the foreground.
|
but run in the foreground.
|
||||||
.TP
|
.TP
|
||||||
\fB\-q\fRG name
|
\fB\-q\fRG\fIname\fR
|
||||||
Process jobs in queue group called
|
Process jobs in queue group called
|
||||||
.I name
|
.I name
|
||||||
only.
|
only.
|
||||||
|
Loading…
Reference in New Issue
Block a user