[src/netbsd-1-4]: src/usr.sbin/xntp/xntpd pullup 1.9->1.10 (bad): Fix abort w...

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aa3ed7465b7d
branches:  netbsd-1-4
changeset: 468788:aa3ed7465b7d
user:      perry <perry%NetBSD.org@localhost>
date:      Mon Jun 21 14:49:07 1999 +0000

description:
pullup 1.9->1.10 (bad): Fix abort when multiple interfaces had same IP address

diffstat:

 usr.sbin/xntp/xntpd/ntp_io.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 13ee13061dcd -r aa3ed7465b7d usr.sbin/xntp/xntpd/ntp_io.c
--- a/usr.sbin/xntp/xntpd/ntp_io.c      Mon Jun 21 14:46:36 1999 +0000
+++ b/usr.sbin/xntp/xntpd/ntp_io.c      Mon Jun 21 14:49:07 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntp_io.c,v 1.9 1999/01/29 13:19:17 bouyer Exp $        */
+/*     $NetBSD: ntp_io.c,v 1.9.2.1 1999/06/21 14:49:07 perry Exp $     */
 
 /*
  * xntp_io.c - input/output routines for xntpd.  The socket-opening code
@@ -607,11 +607,15 @@
        * for the two aliases on the one physical interface. -wsr
        */
       for (j=0; j < i; j++)
-       if ((inter_list[j].sin.sin_addr.s_addr &
+       if (((inter_list[j].sin.sin_addr.s_addr ==
+           inter_list[i].sin.sin_addr.s_addr) ||
+           ((inter_list[j].sin.sin_addr.s_addr &
            inter_list[j].mask.sin_addr.s_addr) ==
            (inter_list[i].sin.sin_addr.s_addr &
-           inter_list[i].mask.sin_addr.s_addr))
+           inter_list[i].mask.sin_addr.s_addr))))
          {
+           if (inter_list[j].flags & INT_LOOPBACK)
+             inter_list[j] = inter_list[i];
            break;
          }
       if (j == i)