4 files changed, 7 insertions, 6 deletions

diff --git a/usr.sbin/sendmail/src/conf.c b/usr.sbin/sendmail/src/conf.c
index 8c7ad33bce38..3fdde59e5a9f 100644
--- a/usr.sbin/sendmail/src/conf.c
+++ b/usr.sbin/sendmail/src/conf.c
@@ -249,9 +249,7 @@ setdefuser()
 */
 
 bool
-host_map_init(map, args)
-	MAP *map;
-	char *args;
+host_map_init(MAP *map, char *args)
 {
 	register char *p = args;
 
@@ -917,7 +915,7 @@ getla()
 
 /* Non Apollo stuff removed by Don Lewis 11/15/93 */
 #ifndef lint
-static char  rcsid[] = "@(#)$Id: getloadavg.c,v 1.16 1991/06/21 12:51:15 paul Exp $";
+static char  rcsid[] = "@(#)$Id: conf.c,v 1.4 1994/08/05 09:14:29 davidg Exp $";
 #endif /* !lint */
 
 #ifdef apollo
diff --git a/usr.sbin/sendmail/src/daemon.c b/usr.sbin/sendmail/src/daemon.c
index fe1070b2deff..87c6e833dde5 100644
--- a/usr.sbin/sendmail/src/daemon.c
+++ b/usr.sbin/sendmail/src/daemon.c
@@ -1408,6 +1408,9 @@ hostnamebyanyaddr(sap)
 	int saveretry;
 
 #if NAMED_BIND
+	/* need to make sure _res.retry is initialized before using it */
+	if ((_res.options & RES_INIT) == 0)
+		res_init();
 	/* shorten name server timeout to avoid higher level timeouts */
 	saveretry = _res.retry;
 	_res.retry = 3;
diff --git a/usr.sbin/sendmail/src/deliver.c b/usr.sbin/sendmail/src/deliver.c
index 06dd9b2cff39..bea703f53478 100644
--- a/usr.sbin/sendmail/src/deliver.c
+++ b/usr.sbin/sendmail/src/deliver.c
@@ -951,7 +951,7 @@ deliver(e, firstto)
 	}
 	errno = 0;
 
-	CurHostName = m->m_mailer;
+	CurHostName = host;
 
 	/*
 	**  Deal with the special case of mail handled through an IPC
diff --git a/usr.sbin/sendmail/src/domain.c b/usr.sbin/sendmail/src/domain.c
index 48109fef9770..bec6f21d3abc 100644
--- a/usr.sbin/sendmail/src/domain.c
+++ b/usr.sbin/sendmail/src/domain.c
@@ -522,7 +522,7 @@ cnameloop:
 				qtype == T_ANY ? "ANY" : qtype == T_A ? "A" :
 				qtype == T_MX ? "MX" : "???");
 		ret = res_querydomain(host, *dp, C_IN, qtype,
-				      &answer, sizeof(answer));
+				      (u_char *) &answer, sizeof(answer));
 		if (ret <= 0)
 		{
 			if (tTd(8, 7))