[src/trunk]: src/gnu/dist/sendmail/sendmail sync with sendmail 8.11.0beta3 ab...

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dbfee94e0721
branches:  trunk
changeset: 488088:dbfee94e0721
user:      itojun <itojun%NetBSD.org@localhost>
date:      Sun Jun 18 00:02:50 2000 +0000

description:
sync with sendmail 8.11.0beta3 about default address family (= AF_INET)
handling.

diffstat:

 gnu/dist/sendmail/sendmail/conf.c   |  2 +-
 gnu/dist/sendmail/sendmail/daemon.c |  8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (38 lines):

diff -r de288147e772 -r dbfee94e0721 gnu/dist/sendmail/sendmail/conf.c
--- a/gnu/dist/sendmail/sendmail/conf.c Sat Jun 17 21:44:46 2000 +0000
+++ b/gnu/dist/sendmail/sendmail/conf.c Sun Jun 18 00:02:50 2000 +0000
@@ -315,7 +315,7 @@
 #ifdef HESIOD_INIT
        HesiodContext = NULL;
 #endif /* HESIOD_INIT */
-#if 0 /*NETINET6*/
+#if NETINET6
        /* Detect if IPv6 is available at run time */
        i = socket(AF_INET6, SOCK_STREAM, 0);
        if (i >= 0)
diff -r de288147e772 -r dbfee94e0721 gnu/dist/sendmail/sendmail/daemon.c
--- a/gnu/dist/sendmail/sendmail/daemon.c       Sat Jun 17 21:44:46 2000 +0000
+++ b/gnu/dist/sendmail/sendmail/daemon.c       Sun Jun 18 00:02:50 2000 +0000
@@ -899,7 +899,9 @@
        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 @@
        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)
        {