diff options
author | peter <peter@FreeBSD.org> | 1995-08-17 04:39:13 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1995-08-17 04:39:13 +0000 |
commit | 78d9d5927fb62a9d93abb0c1a0027bdd84b89117 (patch) | |
tree | 5cc803418eec12744fa49a85f9198905d7416ae7 | |
parent | e2bc8b6f14ae0cd12a39de749da7c50344fb0a59 (diff) | |
download | FreeBSD-src-78d9d5927fb62a9d93abb0c1a0027bdd84b89117.zip FreeBSD-src-78d9d5927fb62a9d93abb0c1a0027bdd84b89117.tar.gz |
Import Sendmail v8.6.12, onto the CSRG(!) branch.
A seperate commit to fix the conflicts wil follow.
-rw-r--r-- | usr.sbin/sendmail/Makefile | 4 | ||||
-rw-r--r-- | usr.sbin/sendmail/RELEASE_NOTES | 13 | ||||
-rw-r--r-- | usr.sbin/sendmail/cf/m4/version.m4 | 4 | ||||
-rw-r--r-- | usr.sbin/sendmail/cf/ostype/sco3.2.m4 | 2 | ||||
-rw-r--r-- | usr.sbin/sendmail/src/conf.c | 2 | ||||
-rw-r--r-- | usr.sbin/sendmail/src/daemon.c | 6 | ||||
-rw-r--r-- | usr.sbin/sendmail/src/deliver.c | 7 | ||||
-rw-r--r-- | usr.sbin/sendmail/src/readcf.c | 3 | ||||
-rw-r--r-- | usr.sbin/sendmail/src/version.c | 4 |
9 files changed, 27 insertions, 18 deletions
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index 3b21e37..767d48e 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -1,6 +1,6 @@ -# @(#)Makefile 8.4 (Berkeley) 4/22/94 +# @(#)Makefile 8.3 (Berkeley) 2/27/94 -SUBDIR= src mailstats makemap praliases cf/cf +SUBDIR= src mailstats makemap praliases FTPDIR= barad-dur:/disks/barad-dur/ftp/sendmail/. VER= XX diff --git a/usr.sbin/sendmail/RELEASE_NOTES b/usr.sbin/sendmail/RELEASE_NOTES index 1205776..98f7461 100644 --- a/usr.sbin/sendmail/RELEASE_NOTES +++ b/usr.sbin/sendmail/RELEASE_NOTES @@ -1,10 +1,21 @@ SENDMAIL RELEASE NOTES - @(#)RELEASE_NOTES 8.6.11.1 (Berkeley) 3/8/95 + @(#)RELEASE_NOTES 8.6.12.1 (Berkeley) 3/28/95 This listing shows the version of the sendmail binary, the version of the sendmail configuration files, the date of release, and a summary of the changes in that release. +8.6.12/8.6.12 95/03/28 + Fix to IDENT code (it was getting the size of the reply buffer + too small, so nothing was ever accepted). Fix from several + people, including Allan Johannesen, Shane Castle of the + Boulder County Information Services, and Jeff Smith of + Warwick University (all arrived within a few hours of + each other!). + Fix a problem that could cause large jobs to run out of + file descriptors on systems that use vfork() rather + than fork(). + 8.6.11/8.6.11 95/03/08 The ``possible attack'' message would be logged more often than necessary if you are using Pine as a user agent. diff --git a/usr.sbin/sendmail/cf/m4/version.m4 b/usr.sbin/sendmail/cf/m4/version.m4 index 19806ff..d7abdd6 100644 --- a/usr.sbin/sendmail/cf/m4/version.m4 +++ b/usr.sbin/sendmail/cf/m4/version.m4 @@ -32,8 +32,8 @@ divert(-1) # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -VERSIONID(`@(#)version.m4 8.6.9.1 (Berkeley) 4/18/94') +VERSIONID(`@(#)version.m4 8.6.12.1 (Berkeley) 3/28/95') # divert(0) # Configuration version number -DZ8.6.9 +DZ8.6.12 diff --git a/usr.sbin/sendmail/cf/ostype/sco3.2.m4 b/usr.sbin/sendmail/cf/ostype/sco3.2.m4 index 08ed0fd..f336b34 100644 --- a/usr.sbin/sendmail/cf/ostype/sco3.2.m4 +++ b/usr.sbin/sendmail/cf/ostype/sco3.2.m4 @@ -34,7 +34,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)sco32.m4 8.1 (Berkeley) 11/27/93') +VERSIONID(`@(#)sco3.2.m4 8.1 (Berkeley) 11/27/93') define(`ALIAS_FILE', /usr/lib/mail/aliases)dnl define(`QUEUE_DIR', /usr/spool/mqueue)dnl define(`STATUS_FILE', /usr/lib/sendmail.st)dnl diff --git a/usr.sbin/sendmail/src/conf.c b/usr.sbin/sendmail/src/conf.c index 702203c..9582788 100644 --- a/usr.sbin/sendmail/src/conf.c +++ b/usr.sbin/sendmail/src/conf.c @@ -917,7 +917,7 @@ getla() /* Non Apollo stuff removed by Don Lewis 11/15/93 */ #ifndef lint -static char rcsid[] = "@(#)$Id: conf.c,v 1.1.1.1 1994/05/26 05:23:10 rgrimes Exp $"; +static char rcsid[] = "@(#)$Id: getloadavg.c,v 1.16 1991/06/21 12:51:15 paul Exp $"; #endif /* !lint */ #ifdef apollo diff --git a/usr.sbin/sendmail/src/daemon.c b/usr.sbin/sendmail/src/daemon.c index 1b58da4..b4b4e8b 100644 --- a/usr.sbin/sendmail/src/daemon.c +++ b/usr.sbin/sendmail/src/daemon.c @@ -37,9 +37,9 @@ #ifndef lint #ifdef DAEMON -static char sccsid[] = "@(#)daemon.c 8.48.1.4 (Berkeley) 2/28/95 (with daemon mode)"; +static char sccsid[] = "@(#)daemon.c 8.48.1.5 (Berkeley) 3/28/95 (with daemon mode)"; #else -static char sccsid[] = "@(#)daemon.c 8.48.1.4 (Berkeley) 2/28/95 (without daemon mode)"; +static char sccsid[] = "@(#)daemon.c 8.48.1.5 (Berkeley) 3/28/95 (without daemon mode)"; #endif #endif /* not lint */ @@ -1078,7 +1078,7 @@ getauthinfo(fd) /* get result */ p = &ibuf[0]; - nleft = sizeof(ibuf - 1); + nleft = sizeof ibuf - 1; while ((i = read(s, p, nleft)) > 0) { p += i; diff --git a/usr.sbin/sendmail/src/deliver.c b/usr.sbin/sendmail/src/deliver.c index 89286ff..99e09f6 100644 --- a/usr.sbin/sendmail/src/deliver.c +++ b/usr.sbin/sendmail/src/deliver.c @@ -33,7 +33,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)deliver.c 8.84.1.3 (Berkeley) 3/5/95"; +static char sccsid[] = "@(#)deliver.c 8.84.1.4 (Berkeley) 3/28/95"; #endif /* not lint */ #include "sendmail.h" @@ -1182,10 +1182,7 @@ tryhost: extern int DtableSize; if (e->e_lockfp != NULL) - { - fclose(e->e_lockfp); - e->e_lockfp = NULL; - } + (void) close(fileno(e->e_lockfp)); /* child -- set up input & exec mailer */ (void) setsignal(SIGINT, SIG_IGN); diff --git a/usr.sbin/sendmail/src/readcf.c b/usr.sbin/sendmail/src/readcf.c index 11a895b..ad7da2a 100644 --- a/usr.sbin/sendmail/src/readcf.c +++ b/usr.sbin/sendmail/src/readcf.c @@ -33,7 +33,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)readcf.c 8.23.1.2 (Berkeley) 2/10/95"; +static char sccsid[] = "@(#)readcf.c 8.23.1.3 (Berkeley) 3/5/95"; #endif /* not lint */ # include "sendmail.h" @@ -1354,6 +1354,7 @@ setoption(opt, val, safe, sticky, e) syserr("readcf: Op line: %s unrecognized", val); PrivacyFlags |= pv->pv_flag; } + sticky = FALSE; break; case 'P': /* postmaster copy address for returned mail */ diff --git a/usr.sbin/sendmail/src/version.c b/usr.sbin/sendmail/src/version.c index 14ba246..ad4dd52 100644 --- a/usr.sbin/sendmail/src/version.c +++ b/usr.sbin/sendmail/src/version.c @@ -33,7 +33,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)version.c 8.6.11.1 (Berkeley) 2/28/95"; +static char sccsid[] = "@(#)version.c 8.6.12.1 (Berkeley) 3/28/95"; #endif /* not lint */ -char Version[] = "8.6.11"; +char Version[] = "8.6.12"; |