>Number:         7842
>Category:       kern
>Synopsis:       patch-01-in_var was not created against the 1.4 version of in_var.h
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kern-bug-people (Kernel Bug People)
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jun 23 11:20:00 1999
>Last-Modified:
>Originator:     Mike Pelley
>Organization:
	WorldMap.Net
>Release:        NetBSD 1.4
>Environment:
System: NetBSD storm 1.4 NetBSD 1.4 (GENERIC) #0: Fri May 7 12:27:31 PDT 1999 perry@cynic.cynic.net:/usr/src/sys/arch/i386/compile/GENERIC i386


>Description:
	patch-01-in_var in ftp.netbsd.org/pub/NetBSD/NetBSD-1.4/patches was created against version 1.33 of in_var.h, but the distributed version of in_var.h with 1.4 was 1.32.2.1.  Dan (mcmahill@mtl.mit.edu) posted this to netbsd-bugs (thanks Dan!) so I thought I'd create a pr (I hate .rej files ;o).
>How-To-Repeat:
	Run the patch and see the rejected lines.
>Fix:
	Replace the patch on the ftp server with Dan's new one:

*** sys/netinet/in_var.h.orig   Fri Jun 18 10:10:22 1999
--- sys/netinet/in_var.h        Fri Jun 18 10:10:59 1999
***************
*** 1,4 ****
! /*    $NetBSD: in_var.h,v 1.32.2.1 1999/05/03 22:24:49 perry Exp $    */
  
  /*-
   * Copyright (c) 1998 The NetBSD Foundation, Inc.
--- 1,4 ----
! /*    $NetBSD: in_var.h,v 1.34 1999/05/16 19:33:27 thorpej Exp $      */
  
  /*-
   * Copyright (c) 1998 The NetBSD Foundation, Inc.
***************
*** 153,162 ****
        /* struct in_ifaddr *ia; */ \
  { \
        for (ia = IN_IFADDR_HASH((addr).s_addr).lh_first; \
!           ia != NULL && !in_hosteq(ia->ia_addr.sin_addr, (addr)) && \
!           (ia->ia_ifp->if_flags & IFF_UP) == 0; \
!           ia = ia->ia_hash.le_next) \
!                continue; \
  }
  
  /*
--- 153,164 ----
        /* struct in_ifaddr *ia; */ \
  { \
        for (ia = IN_IFADDR_HASH((addr).s_addr).lh_first; \
!            ia != NULL; \
!            ia = ia->ia_hash.le_next) { \
!               if (in_hosteq(ia->ia_addr.sin_addr, (addr)) && \
!                   (ia->ia_ifp->if_flags & IFF_UP) != 0) \
!                       break; \
!       } \
  }
  
  /*
>Audit-Trail:
>Unformatted: