Current-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Builds w/o INET6 broken by usr.bin/netstat/if.c

Wasting some time building -current on amd64 I discovered that version 1.64 of usr.bin/netstat/if.c broke builds that don't include IPv6.

Specifically, there's a declaration of *sin6 and *netmask6 that got unprotected:

--- /tmp/if.c.orig      2009-09-27 09:42:31.000000000 -0700
+++ /tmp/if.c.scotte    2009-09-27 09:43:00.000000000 -0700
@@ -333,10 +333,10 @@
        char hbuf[NI_MAXHOST];          /* for getnameinfo() */
 #ifdef INET6
        const int niflag = NI_NUMERICHOST;
+       struct sockaddr_in6 *sin6, *netmask6;
        in_addr_t netmask;
        struct sockaddr_in *sin;
-       struct sockaddr_in6 *sin6, *netmask6;
        char *cp;
        int n, m;

Would somebody be so kind as to correct that? :-)


Home | Main Index | Thread Index | Old Index