===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/interfaces.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/sudo/Attic/interfaces.c	2003/04/19 21:57:17	1.6
--- src/usr.bin/sudo/Attic/interfaces.c	2004/09/28 15:10:51	1.7
***************
*** 1,36 ****
  /*
   * Copyright (c) 1996, 1998-2003 Todd C. Miller <Todd.Miller@courtesan.com>
-  * All rights reserved.
   *
!  * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted provided that the following conditions
!  * are met:
   *
!  * 1. Redistributions of source code must retain the above copyright
!  *    notice, this list of conditions and the following disclaimer.
   *
-  * 2. Redistributions in binary form must reproduce the above copyright
-  *    notice, this list of conditions and the following disclaimer in the
-  *    documentation and/or other materials provided with the distribution.
-  *
-  * 3. The name of the author may not be used to endorse or promote products
-  *    derived from this software without specific prior written permission.
-  *
-  * 4. Products derived from this software may not be called "Sudo" nor
-  *    may "Sudo" appear in their names without specific prior written
-  *    permission from the author.
-  *
-  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-  * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-  * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  *
   * 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.
--- 1,18 ----
  /*
   * Copyright (c) 1996, 1998-2003 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
!  * copyright notice and this permission notice appear in all copies.
   *
!  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
!  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
!  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
!  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
!  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
!  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
!  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   *
   * 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.
***************
*** 106,112 ****
  #include "interfaces.h"
  
  #ifndef lint
! static const char rcsid[] = "$Sudo: interfaces.c,v 1.70 2003/04/16 00:42:10 millert Exp $";
  #endif /* lint */
  
  
--- 88,94 ----
  #include "interfaces.h"
  
  #ifndef lint
! static const char rcsid[] = "$Sudo: interfaces.c,v 1.72 2004/02/13 21:36:43 millert Exp $";
  #endif /* lint */
  
  
***************
*** 130,137 ****
      /* Allocate space for the interfaces list. */
      for (ifa = ifaddrs; ifa != NULL; ifa = ifa -> ifa_next) {
  	/* Skip interfaces marked "down" and "loopback". */
! 	if (ifa->ifa_addr == NULL || !(ifa->ifa_flags & IFF_UP) ||
! 	    (ifa->ifa_flags & IFF_LOOPBACK))
  	    continue;
  
  	switch(ifa->ifa_addr->sa_family) {
--- 112,119 ----
      /* Allocate space for the interfaces list. */
      for (ifa = ifaddrs; ifa != NULL; ifa = ifa -> ifa_next) {
  	/* Skip interfaces marked "down" and "loopback". */
! 	if (ifa->ifa_addr == NULL || !ISSET(ifa->ifa_flags, IFF_UP) ||
! 	    ISSET(ifa->ifa_flags, IFF_LOOPBACK))
  	    continue;
  
  	switch(ifa->ifa_addr->sa_family) {
***************
*** 149,156 ****
      /* Store the ip addr / netmask pairs. */
      for (ifa = ifaddrs, i = 0; ifa != NULL; ifa = ifa -> ifa_next) {
  	/* Skip interfaces marked "down" and "loopback". */
! 	if (ifa->ifa_addr == NULL || !(ifa->ifa_flags & IFF_UP) ||
! 	    (ifa->ifa_flags & IFF_LOOPBACK))
  		continue;
  
  	switch(ifa->ifa_addr->sa_family) {
--- 131,138 ----
      /* Store the ip addr / netmask pairs. */
      for (ifa = ifaddrs, i = 0; ifa != NULL; ifa = ifa -> ifa_next) {
  	/* Skip interfaces marked "down" and "loopback". */
! 	if (ifa->ifa_addr == NULL || !ISSET(ifa->ifa_flags, IFF_UP) ||
! 	    ISSET(ifa->ifa_flags, IFF_LOOPBACK))
  		continue;
  
  	switch(ifa->ifa_addr->sa_family) {
***************
*** 257,263 ****
  	    ifr_tmp = *ifr;
  	
  	/* Skip interfaces marked "down" and "loopback". */
! 	if (!(ifr_tmp.ifr_flags & IFF_UP) || (ifr_tmp.ifr_flags & IFF_LOOPBACK))
  		continue;
  
  	sin = (struct sockaddr_in *) &ifr->ifr_addr;
--- 239,246 ----
  	    ifr_tmp = *ifr;
  	
  	/* Skip interfaces marked "down" and "loopback". */
! 	if (!ISSET(ifr_tmp.ifr_flags, IFF_UP) ||
! 	    ISSET(ifr_tmp.ifr_flags, IFF_LOOPBACK))
  		continue;
  
  	sin = (struct sockaddr_in *) &ifr->ifr_addr;