===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/parse.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/sudo/Attic/parse.c	2007/09/05 23:55:57	1.16
--- src/usr.bin/sudo/Attic/parse.c	2007/10/25 16:08:12	1.17
***************
*** 90,96 ****
  #endif /* HAVE_EXTENDED_GLOB */
  
  #ifndef lint
! __unused static const char rcsid[] = "$Sudo: parse.c,v 1.160.2.13 2007/08/25 02:37:11 millert Exp $";
  #endif /* lint */
  
  /*
--- 90,96 ----
  #endif /* HAVE_EXTENDED_GLOB */
  
  #ifndef lint
! __unused static const char rcsid[] = "$Sudo: parse.c,v 1.160.2.14 2007/10/24 16:43:27 millert Exp $";
  #endif /* lint */
  
  /*
***************
*** 390,402 ****
      int i;
      struct in_addr addr;
      struct interface *ifp;
! #ifdef AF_INET6
      struct in6_addr addr6;
      int j;
  #endif
      int family;
  
! #ifdef AF_INET6
      if (inet_pton(AF_INET6, n, &addr6) > 0) {
  	family = AF_INET6;
      } else
--- 390,402 ----
      int i;
      struct in_addr addr;
      struct interface *ifp;
! #ifdef HAVE_IN6_ADDR
      struct in6_addr addr6;
      int j;
  #endif
      int family;
  
! #ifdef HAVE_IN6_ADDR
      if (inet_pton(AF_INET6, n, &addr6) > 0) {
  	family = AF_INET6;
      } else
***************
*** 417,423 ****
  		    == addr.s_addr)
  		    return(TRUE);
  		break;
! #ifdef AF_INET6
  	    case AF_INET6:
  		if (memcmp(ifp->addr.ip6.s6_addr, addr6.s6_addr,
  		    sizeof(addr6.s6_addr)) == 0)
--- 417,423 ----
  		    == addr.s_addr)
  		    return(TRUE);
  		break;
! #ifdef HAVE_IN6_ADDR
  	    case AF_INET6:
  		if (memcmp(ifp->addr.ip6.s6_addr, addr6.s6_addr,
  		    sizeof(addr6.s6_addr)) == 0)
***************
*** 428,434 ****
  		}
  		if (j == sizeof(addr6.s6_addr))
  		    return(TRUE);
! #endif /* AF_INET6 */
  	}
      }
  
--- 428,434 ----
  		}
  		if (j == sizeof(addr6.s6_addr))
  		    return(TRUE);
! #endif /* HAVE_IN6_ADDR */
  	}
      }
  
***************
*** 443,455 ****
      int i;
      struct in_addr addr, mask;
      struct interface *ifp;
! #ifdef AF_INET6
      struct in6_addr addr6, mask6;
      int j;
  #endif
      int family;
  
! #ifdef AF_INET6
      if (inet_pton(AF_INET6, n, &addr6) > 0)
  	family = AF_INET6;
      else
--- 443,455 ----
      int i;
      struct in_addr addr, mask;
      struct interface *ifp;
! #ifdef HAVE_IN6_ADDR
      struct in6_addr addr6, mask6;
      int j;
  #endif
      int family;
  
! #ifdef HAVE_IN6_ADDR
      if (inet_pton(AF_INET6, n, &addr6) > 0)
  	family = AF_INET6;
      else
***************
*** 470,476 ****
  	    mask.s_addr = htonl(mask.s_addr);
  	}
      }
! #ifdef AF_INET6
      else {
  	if (inet_pton(AF_INET6, m, &mask6) <= 0) {
  	    j = atoi(m);
--- 470,476 ----
  	    mask.s_addr = htonl(mask.s_addr);
  	}
      }
! #ifdef HAVE_IN6_ADDR
      else {
  	if (inet_pton(AF_INET6, m, &mask6) <= 0) {
  	    j = atoi(m);
***************
*** 484,490 ****
  	    }
  	}
      }
! #endif /* AF_INET6 */
  
      for (i = 0; i < num_interfaces; i++) {
  	ifp = &interfaces[i];
--- 484,490 ----
  	    }
  	}
      }
! #endif /* HAVE_IN6_ADDR */
  
      for (i = 0; i < num_interfaces; i++) {
  	ifp = &interfaces[i];
***************
*** 494,500 ****
  	    case AF_INET:
  		if ((ifp->addr.ip4.s_addr & mask.s_addr) == addr.s_addr)
  		    return(TRUE);
! #ifdef AF_INET6
  	    case AF_INET6:
  		for (j = 0; j < sizeof(addr6.s6_addr); j++) {
  		    if ((ifp->addr.ip6.s6_addr[j] & mask6.s6_addr[j]) != addr6.s6_addr[j])
--- 494,500 ----
  	    case AF_INET:
  		if ((ifp->addr.ip4.s_addr & mask.s_addr) == addr.s_addr)
  		    return(TRUE);
! #ifdef HAVE_IN6_ADDR
  	    case AF_INET6:
  		for (j = 0; j < sizeof(addr6.s6_addr); j++) {
  		    if ((ifp->addr.ip6.s6_addr[j] & mask6.s6_addr[j]) != addr6.s6_addr[j])
***************
*** 502,508 ****
  		}
  		if (j == sizeof(addr6.s6_addr))
  		    return(TRUE);
! #endif /* AF_INET6 */
  	}
      }
  
--- 502,508 ----
  		}
  		if (j == sizeof(addr6.s6_addr))
  		    return(TRUE);
! #endif /* HAVE_IN6_ADDR */
  	}
      }