From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Mon, 14 Jun 2010 18:53:34 +0000 (-0400)
Subject: Move union sudo_in_addr_un into interfaces.h
X-Git-Tag: SUDO_1_7_3~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a39a26752a08a79b41d05a8a9a4ebbe78f88754;p=sudo

Move union sudo_in_addr_un into interfaces.h

--HG--
branch : 1.7
---

diff --git a/interfaces.h b/interfaces.h
index b9591af45..06b0b8571 100644
--- a/interfaces.h
+++ b/interfaces.h
@@ -22,23 +22,23 @@
 #ifndef _SUDO_INTERFACES_H
 #define _SUDO_INTERFACES_H
 
+/*
+ * Union to hold either strucr in_addr or in6_add
+ */
+union sudo_in_addr_un {
+    struct in_addr ip4;
+#ifdef HAVE_IN6_ADDR
+    struct in6_addr ip6;
+#endif
+};
+
 /*
  * IP address and netmask pairs for checking against local interfaces.
  */
 struct interface {
     int family;	/* AF_INET or AF_INET6 */
-    union {
-	struct in_addr ip4;
-#ifdef HAVE_IN6_ADDR
-	struct in6_addr ip6;
-#endif
-    } addr;
-    union {
-	struct in_addr ip4;
-#ifdef HAVE_IN6_ADDR
-	struct in6_addr ip6;
-#endif
-    } netmask;
+    union sudo_in_addr_un addr;
+    union sudo_in_addr_un netmask;
 };
 
 /*
diff --git a/match.c b/match.c
index 7ba89a853..369130ce8 100644
--- a/match.c
+++ b/match.c
@@ -105,13 +105,6 @@ static int command_matches_normal __P((char *, char *));
  */
 #define has_meta(s)	(strpbrk(s, "\\?*[]") != NULL)
 
-union sudo_in_addr_un {
-    struct in_addr ip4;
-#ifdef HAVE_IN6_ADDR
-    struct in6_addr ip6;
-#endif
-};
-
 /*
  * Check for user described by pw in a list of members.
  * Returns ALLOW, DENY or UNSPEC.