From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Sat, 25 Aug 2007 02:36:09 +0000 (+0000)
Subject: Fix thinko introduced when merging IPV6 support.
X-Git-Tag: SUDO_1_7_0~404
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3fd33970c19054ee8b0f62fd9f8309d1fd134c08;p=sudo

Fix thinko introduced when merging IPV6 support.
---

diff --git a/match.c b/match.c
index 09ae958e1..266f86ac5 100644
--- a/match.c
+++ b/match.c
@@ -430,18 +430,17 @@ addr_matches_if(n)
     struct in6_addr addr6;
     int j;
 #endif
-    int family = AF_UNSPEC;
+    int family;
 
 #ifdef AF_INET6
     if (inet_pton(AF_INET6, n, &addr6) > 0) {
 	family = AF_INET6;
     } else
-#else
+#endif
     {
 	family = AF_INET;
 	addr.s_addr = inet_addr(n);
     }
-#endif
 
     for (i = 0; i < num_interfaces; i++) {
 	ifp = &interfaces[i];
@@ -484,18 +483,17 @@ addr_matches_if_netmask(n, m)
     struct in6_addr addr6, mask6;
     int j;
 #endif
-    int family = AF_UNSPEC;
+    int family;
 
 #ifdef AF_INET6
     if (inet_pton(AF_INET6, n, &addr6) > 0)
 	family = AF_INET6;
     else
-#else
+#endif
     {
 	family = AF_INET;
 	addr.s_addr = inet_addr(n);
     }
-#endif
 
     if (family == AF_INET) {
 	if (strchr(m, '.'))