From 1bbf49b55a2601a4b47f84ef0db64d5bbc97608f Mon Sep 17 00:00:00 2001 From: gshapiro Date: Sun, 1 Oct 2000 02:03:50 +0000 Subject: Fix conflicts from merge of sendmail 8.11.1 --- contrib/sendmail/src/conf.c | 17 ++++++++++++----- contrib/sendmail/src/conf.h | 19 +++++++++++++------ contrib/sendmail/src/headers.c | 8 +++----- contrib/sendmail/src/mailq.1 | 6 +++--- contrib/sendmail/src/savemail.c | 6 ++++-- contrib/sendmail/src/sendmail.8 | 13 +++++++++---- 6 files changed, 44 insertions(+), 25 deletions(-) (limited to 'contrib/sendmail/src') diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c index 85668b8..6130bee 100644 --- a/contrib/sendmail/src/conf.c +++ b/contrib/sendmail/src/conf.c @@ -12,7 +12,7 @@ */ #ifndef lint -static char id[] = "@(#)$Id: conf.c,v 8.646.2.2.2.23 2000/07/15 17:35:18 gshapiro Exp $"; +static char id[] = "@(#)$Id: conf.c,v 8.646.2.2.2.32 2000/09/23 00:31:33 ca Exp $"; #endif /* ! lint */ /* $FreeBSD$ */ @@ -199,6 +199,12 @@ struct dbsval DontBlameSendmailValues[] = #if _FFR_UNSAFE_SASL { "groupreadablesaslfile", DBS_GROUPREADABLESASLFILE }, #endif /* _FFR_UNSAFE_SASL */ +#if _FFR_UNSAFE_WRITABLE_INCLUDE + { "groupwritableforwardfile", DBS_GROUPWRITABLEFORWARDFILE }, + { "groupwritableincludefile", DBS_GROUPWRITABLEINCLUDEFILE }, + { "worldwritableforwardfile", DBS_WORLDWRITABLEFORWARDFILE }, + { "worldwritableincludefile", DBS_WORLDWRITABLEINCLUDEFILE }, +#endif /* _FFR_UNSAFE_WRITABLE_INCLUDE */ { NULL, 0 } }; @@ -2147,7 +2153,7 @@ sm_getla(e) { char labuf[8]; - snprintf(labuf, sizeof labuf, "%d", CurrentLA); + snprintf(labuf, sizeof labuf, "%d", la); define(macid("{load_avg}", NULL), newstr(labuf), e); } return la; @@ -2986,7 +2992,7 @@ setsid __P ((void)) fd = open("/dev/tty", O_RDWR, 0); if (fd >= 0) { - (void) ioctl(fd, (int) TIOCNOTTY, (char *) 0); + (void) ioctl(fd, TIOCNOTTY, (char *) 0); (void) close(fd); } # endif /* TIOCNOTTY */ @@ -4919,7 +4925,7 @@ load_if_names() if (addr != NULL) (void) snprintf(ip_addr, sizeof ip_addr, "[%.*s]", - sizeof ip_addr - 3, addr); + (int) sizeof ip_addr - 3, addr); break; case AF_INET: @@ -4934,7 +4940,7 @@ load_if_names() /* save IP address in text from */ (void) snprintf(ip_addr, sizeof ip_addr, "[%.*s]", - sizeof ip_addr - 3, inet_ntoa(ia)); + (int) sizeof ip_addr - 3, inet_ntoa(ia)); break; } @@ -4995,6 +5001,7 @@ load_if_names() if (tTd(0, 4)) dprintf("SIOCGIFCONF failed: %s\n", errstring(errno)); (void) close(s); + free(ifc.ifc_buf); return; } diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h index c748bf3..1ef1427 100644 --- a/contrib/sendmail/src/conf.h +++ b/contrib/sendmail/src/conf.h @@ -10,7 +10,7 @@ * the sendmail distribution. * * - * $Id: conf.h,v 8.496.4.20 2000/07/15 17:35:19 gshapiro Exp $ + * $Id: conf.h,v 8.496.4.25 2000/08/08 23:50:40 ca Exp $ */ /* $FreeBSD$ */ @@ -527,6 +527,8 @@ typedef int pid_t; # endif /* SOLARIS >= 20500 || (SOLARIS < 10000 && SOLARIS >= 205) */ # if SOLARIS >= 20600 || (SOLARIS < 10000 && SOLARIS >= 206) # define HASSNPRINTF 1 /* has snprintf starting in 2.6 */ +# else /* SOLARIS >= 20600 || (SOLARIS < 10000 && SOLARIS >= 206) */ + typedef int int32_t; # endif /* SOLARIS >= 20600 || (SOLARIS < 10000 && SOLARIS >= 206) */ # if SOLARIS >= 20700 || (SOLARIS < 10000 && SOLARIS >= 207) # ifndef LA_TYPE @@ -536,9 +538,9 @@ typedef int pid_t; # define HASGETUSERSHELL 1 /* getusershell(3c) bug fixed in 2.7 */ # endif /* SOLARIS >= 20700 || (SOLARIS < 10000 && SOLARIS >= 207) */ # if SOLARIS >= 20800 || (SOLARIS < 10000 && SOLARIS >= 208) -# undef NETINET6 -# define NETINET6 1 /* IPv6 added in 2.8 */ # define HASSTRL 1 /* str*(3) added in 2.8 */ +# undef _PATH_SENDMAILPID /* tmpfs /var/run added in 2.8 */ +# define _PATH_SENDMAILPID "/var/run/sendmail.pid" # endif /* SOLARIS >= 20800 || (SOLARIS < 10000 && SOLARIS >= 208) */ # ifndef HASGETUSERSHELL # define HASGETUSERSHELL 0 /* getusershell(3) causes core dumps pre-2.7 */ @@ -2791,9 +2793,14 @@ typedef void (*sigfunc_t) __P((int)); # define LOG_DEBUG 7 /* debug-level messages */ #endif /* !LOG */ -#if SFIO && defined(ERRLIST_PREDEFINED) -# undef ERRLIST_PREDEFINED -#endif /* SFIO && defined(ERRLIST_PREDEFINED) */ +#if SFIO +# ifdef ERRLIST_PREDEFINED +# undef ERRLIST_PREDEFINED +# endif /* ERRLIST_PREDEFINED */ +# if !HASSNPRINTF +# define HASSNPRINTF 1 /* sfio includes snprintf() */ +# endif /* !HASSNPRINTF */ +#endif /* SFIO */ #ifndef SFIO_STDIO_COMPAT # define SFIO_STDIO_COMPAT 0 diff --git a/contrib/sendmail/src/headers.c b/contrib/sendmail/src/headers.c index ac830a1..03472ac 100644 --- a/contrib/sendmail/src/headers.c +++ b/contrib/sendmail/src/headers.c @@ -12,7 +12,7 @@ */ #ifndef lint -static char id[] = "@(#)$Id: headers.c,v 8.203.4.6 2000/07/19 02:53:32 ca Exp $"; +static char id[] = "@(#)$Id: headers.c,v 8.203.4.7 2000/08/22 21:50:36 gshapiro Exp $"; #endif /* ! lint */ /* $FreeBSD$ */ @@ -53,9 +53,7 @@ setupheaders() ** ** Parameters: ** line -- header as a text line. -** pflag -- flags: -** CHHDR_DEF: this is a default value. -** CHHDR_CHECK: call rulesets. +** pflag -- flags for chompheader() (from sendmail.h) ** hdrp -- a pointer to the place to save the header. ** e -- the envelope including this header. ** @@ -416,7 +414,7 @@ hse: h->h_macro = mid; *hp = h; h->h_flags = hi->hi_flags; - if (bitset(pflag, CHHDR_USER)) + if (bitset(pflag, CHHDR_USER) || bitset(pflag, CHHDR_QUEUE)) h->h_flags |= H_USER; /* strip EOH flag if parsing MIME headers */ diff --git a/contrib/sendmail/src/mailq.1 b/contrib/sendmail/src/mailq.1 index d7160f9..d3e83c51 100644 --- a/contrib/sendmail/src/mailq.1 +++ b/contrib/sendmail/src/mailq.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +.\" Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers. .\" All rights reserved. .\" Copyright (c) 1983, 1997 Eric P. Allman. All rights reserved. .\" Copyright (c) 1985, 1990, 1993 @@ -9,11 +9,11 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: mailq.1,v 8.14.28.1 2000/07/14 05:07:01 gshapiro Exp $ +.\" $Id: mailq.1,v 8.14.28.2 2000/09/17 17:04:27 gshapiro Exp $ .\" .\" $FreeBSD$ .\" -.TH MAILQ 1 "$Date: 2000/07/14 05:07:01 $" +.TH MAILQ 1 "$Date: 2000/09/17 17:04:27 $" .SH NAME .B mailq \- print the mail queue diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c index 9a196b0..a5173eb 100644 --- a/contrib/sendmail/src/savemail.c +++ b/contrib/sendmail/src/savemail.c @@ -12,7 +12,7 @@ */ #ifndef lint -static char id[] = "@(#)$Id: savemail.c,v 8.212.4.3 2000/06/13 07:16:26 gshapiro Exp $"; +static char id[] = "@(#)$Id: savemail.c,v 8.212.4.5 2000/08/22 22:46:00 gshapiro Exp $"; #endif /* ! lint */ /* $FreeBSD$ */ @@ -334,7 +334,8 @@ savemail(e, sendbody) { if (e->e_from.q_home != NULL) p = e->e_from.q_home; - else if ((pw = sm_getpwnam(e->e_from.q_user)) != NULL) + else if ((pw = sm_getpwnam(e->e_from.q_user)) != NULL && + *pw->pw_dir != '\0') p = pw->pw_dir; } if (p == NULL || e->e_dfp == NULL) @@ -447,6 +448,7 @@ savemail(e, sendbody) case ESM_PANIC: /* leave the locked queue & transcript files around */ loseqfile(e, "savemail panic"); + errno = 0; syserr("!554 savemail: cannot save rejected email anywhere"); } } diff --git a/contrib/sendmail/src/sendmail.8 b/contrib/sendmail/src/sendmail.8 index a256033..2cf6600 100644 --- a/contrib/sendmail/src/sendmail.8 +++ b/contrib/sendmail/src/sendmail.8 @@ -9,11 +9,11 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: sendmail.8,v 8.36 2000/02/01 05:49:57 gshapiro Exp $ +.\" $Id: sendmail.8,v 8.36.8.2 2000/09/07 21:14:00 ca Exp $ .\" .\" $FreeBSD$ .\" -.TH SENDMAIL 8 "$Date: 2000/02/01 05:49:57 $" +.TH SENDMAIL 8 "$Date: 2000/09/07 21:14:00 $" .SH NAME .B sendmail \- an electronic mail transport agent @@ -172,6 +172,13 @@ Otherwise, an X-Authentication-Warning header will be added to the message. .TP +.BI \-G +Relay (gateway) submission of a message, +e.g., when +.BR rmail +calls +.B sendmail . +.TP .BI \-h N Set the hop count to .IR N . @@ -674,8 +681,6 @@ Internet Request For Comments .IR RFC819 , .IR RFC821 , .IR RFC822 . -.IR "Sendmail \- An Internetwork Mail Router" , -No. 9, SMM. .IR "Sendmail Installation and Operation Guide" , No. 8, SMM. .PP -- cgit v1.1