summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/usr.sbin/sendmail/Makefile.inc5
-rw-r--r--gnu/usr.sbin/sendmail/sendmail/daemon.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/gnu/usr.sbin/sendmail/Makefile.inc b/gnu/usr.sbin/sendmail/Makefile.inc
index 70c6d92d492..17306bf41b8 100644
--- a/gnu/usr.sbin/sendmail/Makefile.inc
+++ b/gnu/usr.sbin/sendmail/Makefile.inc
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile.inc,v 1.3 2000/05/15 16:16:38 millert Exp $
+# $OpenBSD: Makefile.inc,v 1.4 2000/06/18 00:04:20 itojun Exp $
.include <bsd.own.mk>
.include <bsd.obj.mk>
ENVDEF+= -DNEWDB -DMAP_REGEX
-# XXX - IPv6 support breaks IPv4 support since we don't do RFC2553
-#ENVDEF+= -DNETINET6 -DNEEDSGETIPNODE
+ENVDEF+= -DNETINET6 -DNEEDSGETIPNODE
.if (${YP} == "yes")
ENVDEF+=-DNIS
.endif
diff --git a/gnu/usr.sbin/sendmail/sendmail/daemon.c b/gnu/usr.sbin/sendmail/sendmail/daemon.c
index 5a61d06a7f6..116efa1c601 100644
--- a/gnu/usr.sbin/sendmail/sendmail/daemon.c
+++ b/gnu/usr.sbin/sendmail/sendmail/daemon.c
@@ -899,7 +899,9 @@ setupdaemon(daemonaddr)
if (daemonaddr->sa.sa_family == AF_UNSPEC)
{
memset(daemonaddr, '\0', sizeof *daemonaddr);
- daemonaddr->sa.sa_family = InetMode;
+# if NETINET
+ daemonaddr->sa.sa_family = AF_INET;
+# endif /* NETINET */
}
switch (daemonaddr->sa.sa_family)
@@ -1012,8 +1014,10 @@ setsockaddroptions(p, d)
int l;
char *h, *flags;
+# if NETINET
if (d->d_addr.sa.sa_family == AF_UNSPEC)
- d->d_addr.sa.sa_family = InetMode;
+ d->d_addr.sa.sa_family = AF_INET;
+# endif /* NETINET */
while (p != NULL)
{