fix for 596493 from upstream

[debian/sudo] / interfaces.h

diff --git a/interfaces.h b/interfaces.h
index ddb6f84b7ef06e91863b4d20c85bcd6f1f120895..06b0b8571db0a753d02796d741c8e46e4bcde19a 100644 (file)
--- a/interfaces.h
+++ b/interfaces.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1996, 1998-2004 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1996, 1998-2005, 2007
+ *     Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -16,30 +17,28 @@
  * Sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- *
- * $Sudo: interfaces.h,v 1.8.2.3 2007/10/24 16:43:27 millert Exp $
  */
 
 #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;
 };
 
 /*