diff options
| author | peter <peter@FreeBSD.org> | 1995-08-17 04:57:21 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1995-08-17 04:57:21 +0000 |
| commit | f2c21db1649c3858bf0d3d1775e0462f923dd982 (patch) | |
| tree | ba18adf02650ad8839f385b7f27f91ea42b1c1b9 /usr.sbin/sendmail | |
| parent | a9bf7387cf18bf6618c70967ca793ccfc13103f2 (diff) | |
| download | FreeBSD-src-f2c21db1649c3858bf0d3d1775e0462f923dd982.zip FreeBSD-src-f2c21db1649c3858bf0d3d1775e0462f923dd982.tar.gz | |
Merge in the remaining differences from 8.6.11 to 8.6.12.
Note that conf.c, although there was an import conflict, it did not
require intervention, as it was the $Id$ tag. It would have become
rev 1.8 on checkout so there's no point changing it from 1.7 to
1.1.1.3 as the "-j" option wanted to do.. Trust me.. :-)
Diffstat (limited to 'usr.sbin/sendmail')
| -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 |
3 files changed, 7 insertions, 9 deletions
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 9e29de9..437b1ad 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 a2d37d9..4a2a820 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 */ |
