summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sendmail/src
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1995-08-17 04:39:13 +0000
committerpeter <peter@FreeBSD.org>1995-08-17 04:39:13 +0000
commit78d9d5927fb62a9d93abb0c1a0027bdd84b89117 (patch)
tree5cc803418eec12744fa49a85f9198905d7416ae7 /usr.sbin/sendmail/src
parente2bc8b6f14ae0cd12a39de749da7c50344fb0a59 (diff)
downloadFreeBSD-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.
Diffstat (limited to 'usr.sbin/sendmail/src')
-rw-r--r--usr.sbin/sendmail/src/conf.c2
-rw-r--r--usr.sbin/sendmail/src/daemon.c6
-rw-r--r--usr.sbin/sendmail/src/deliver.c7
-rw-r--r--usr.sbin/sendmail/src/readcf.c3
-rw-r--r--usr.sbin/sendmail/src/version.c4
5 files changed, 10 insertions, 12 deletions
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";
OpenPOWER on IntegriCloud