diff options
| -rw-r--r-- | contrib/sendmail/makemap/makemap.c | 4 | ||||
| -rw-r--r-- | contrib/sendmail/praliases/praliases.c | 4 | ||||
| -rw-r--r-- | contrib/sendmail/src/conf.c | 41 | ||||
| -rw-r--r-- | contrib/sendmail/src/headers.c | 10 | ||||
| -rw-r--r-- | contrib/sendmail/src/sendmail.8 | 6 |
5 files changed, 43 insertions, 22 deletions
diff --git a/contrib/sendmail/makemap/makemap.c b/contrib/sendmail/makemap/makemap.c index 344d5b9..7302748 100644 --- a/contrib/sendmail/makemap/makemap.c +++ b/contrib/sendmail/makemap/makemap.c @@ -20,7 +20,7 @@ SM_IDSTR(copyright, Copyright (c) 1992, 1993\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> @@ -42,7 +42,7 @@ uid_t RealUid; gid_t RealGid; char *RealUserName; uid_t RunAsUid; -uid_t RunAsGid; +gid_t RunAsGid; char *RunAsUserName; int Verbose = 2; bool DontInitGroups = false; diff --git a/contrib/sendmail/praliases/praliases.c b/contrib/sendmail/praliases/praliases.c index 720fa6d..984981f 100644 --- a/contrib/sendmail/praliases/praliases.c +++ b/contrib/sendmail/praliases/praliases.c @@ -20,7 +20,7 @@ SM_IDSTR(copyright, Copyright (c) 1988, 1993\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 <ctype.h> @@ -45,7 +45,7 @@ uid_t RealUid; gid_t RealGid; char *RealUserName; uid_t RunAsUid; -uid_t RunAsGid; +gid_t RunAsGid; char *RunAsUserName; int Verbose = 2; bool DontInitGroups = false; diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c index 64b8d02..e892cef 100644 --- a/contrib/sendmail/src/conf.c +++ b/contrib/sendmail/src/conf.c @@ -14,7 +14,7 @@ #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 <sendmail/pathnames.h> @@ -5317,17 +5317,8 @@ sm_syslog(level, id, fmt, va_alist) save_errno = errno; if (id == NULL) - { id = "NOQUEUE"; - idlen = strlen(id) + SyslogPrefixLen; - } - else if (strcmp(id, NOQID) == 0) - { - id = ""; - idlen = SyslogPrefixLen; - } - else - idlen = strlen(id) + SyslogPrefixLen; + idlen = strlen(id) + SyslogPrefixLen; buf = buf0; bufsize = sizeof(buf0); @@ -6025,6 +6016,10 @@ char *OsCompileOptions[] = 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 /* DefaultAuthInfo can be specified by user. */ /* DefaultAuthInfo doesn't really work in 8.13 anymore. */ @@ -6095,6 +6090,10 @@ char *FFRCompileOptions[] = "_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 /* ** Don't issue this warning: @@ -6223,6 +6222,10 @@ char *FFRCompileOptions[] = /* Old mime7to8 code, the new is broken for at least one example. */ "_FFR_MIME7TO8_OLD", #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 /* allow to override "Message accepted for delivery" */ "_FFR_MSG_ACCEPT", @@ -6236,6 +6239,10 @@ char *FFRCompileOptions[] = /* Disable PIPELINING, delay client if used. */ "_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 /* log ntries=, from Nik Clayton of FreeBSD */ "_FFR_LOG_NTRIES", @@ -6281,6 +6288,18 @@ char *FFRCompileOptions[] = /* Random shuffle for queue sorting. */ "_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 /* Donated code (unused). */ "_FFR_SHM_STATUS", diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c index 7fc7873..7e223db 100644 --- a/contrib/sendmail/src/headers.c +++ b/contrib/sendmail/src/headers.c @@ -15,7 +15,7 @@ #include <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 size_t fix_mime_header __P((HDR *, ENVELOPE *)); @@ -1866,7 +1866,8 @@ putheader(mci, hdr, e, flags) if (bitset(H_FROM, h->h_flags)) oldstyle = false; - commaize(h, p, oldstyle, mci, e); + commaize(h, p, oldstyle, mci, e, + PXLF_HEADER | PXLF_STRIPMQUOTE); } else { @@ -1978,6 +1979,7 @@ put_vanilla_header(h, v, mci) ** oldstyle -- true if this is an old style header. ** mci -- the connection information. ** e -- the envelope containing the message. +** putflags -- flags for putxline() ** ** Returns: ** true iff header field was written successfully @@ -1987,17 +1989,17 @@ put_vanilla_header(h, v, mci) */ bool -commaize(h, p, oldstyle, mci, e) +commaize(h, p, oldstyle, mci, e, putflags) register HDR *h; register char *p; bool oldstyle; register MCI *mci; register ENVELOPE *e; + int putflags; { register char *obp; int opos, omax, spaces; bool firstone = true; - int putflags = PXLF_HEADER | PXLF_STRIPMQUOTE; char **res; char obuf[MAXLINE + 3]; diff --git a/contrib/sendmail/src/sendmail.8 b/contrib/sendmail/src/sendmail.8 index 65d37b0..540d554 100644 --- a/contrib/sendmail/src/sendmail.8 +++ b/contrib/sendmail/src/sendmail.8 @@ -9,9 +9,9 @@ .\" 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 sendmail \- 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(), but run in the foreground. .TP -\fB\-q\fRG name +\fB\-q\fRG\fIname\fR Process jobs in queue group called .I name only. |
