diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2000-06-18 00:04:22 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2000-06-18 00:04:22 +0000 |
| commit | d2b60c3678e4f48515a133025592d2833011b9fb (patch) | |
| tree | b5d51086882414da13a2ad2486eeec9b7eca39f1 | |
| parent | e7002853aa8b84f08afa0bcc0f14a932079230f6 (diff) | |
enable IPv6 support in sendmail. by default, listens AF_INET only
(need DaemonPortOptions line to listen to AF_INET6 socket)
default address family handling is from 8.11.0beta3.
| -rw-r--r-- | gnu/usr.sbin/sendmail/Makefile.inc | 5 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/sendmail/daemon.c | 8 |
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) { |