=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/interfaces.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- src/usr.bin/sudo/Attic/interfaces.c 2007/08/15 14:22:39 1.9 +++ src/usr.bin/sudo/Attic/interfaces.c 2007/10/25 16:08:12 1.10 @@ -89,7 +89,7 @@ #include "interfaces.h" #ifndef lint -__unused static const char rcsid[] = "$Sudo: interfaces.c,v 1.72.2.6 2007/08/14 15:19:25 millert Exp $"; +__unused static const char rcsid[] = "$Sudo: interfaces.c,v 1.72.2.7 2007/10/24 16:43:26 millert Exp $"; #endif /* lint */ @@ -104,7 +104,7 @@ { struct ifaddrs *ifa, *ifaddrs; struct sockaddr_in *sin; -#ifdef AF_INET6 +#ifdef HAVE_IN6_ADDR struct sockaddr_in6 *sin6; #endif int i; @@ -121,7 +121,7 @@ switch(ifa->ifa_addr->sa_family) { case AF_INET: -#ifdef AF_INET6 +#ifdef HAVE_IN6_ADDR case AF_INET6: #endif num_interfaces++; @@ -151,7 +151,7 @@ interfaces[i].family = AF_INET; i++; break; -#ifdef AF_INET6 +#ifdef HAVE_IN6_ADDR case AF_INET6: sin6 = (struct sockaddr_in6 *)ifa->ifa_addr; memcpy(&interfaces[i].addr, &sin6->sin6_addr, @@ -162,7 +162,7 @@ interfaces[i].family = AF_INET6; i++; break; -#endif /* AF_INET6 */ +#endif /* HAVE_IN6_ADDR */ } } #ifdef HAVE_FREEIFADDRS @@ -325,7 +325,7 @@ dump_interfaces() { int i; -#ifdef AF_INET6 +#ifdef HAVE_IN6_ADDR char addrbuf[INET6_ADDRSTRLEN], maskbuf[INET6_ADDRSTRLEN]; #endif @@ -336,7 +336,7 @@ printf("\t%s / ", inet_ntoa(interfaces[i].addr.ip4)); puts(inet_ntoa(interfaces[i].netmask.ip4)); break; -#ifdef AF_INET6 +#ifdef HAVE_IN6_ADDR case AF_INET6: inet_ntop(AF_INET6, &interfaces[i].addr.ip6, addrbuf, sizeof(addrbuf)); @@ -344,7 +344,7 @@ maskbuf, sizeof(maskbuf)); printf("\t%s / %s\n", addrbuf, maskbuf); break; -#endif /* AF_INET6 */ +#endif /* HAVE_IN6_ADDR */ } } }