[src/netbsd-6]: src/external/bsd/ntp/dist/ntpd Pull up following revision(s) ...

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

details:   https://anonhg.NetBSD.org/src/rev/180036655fc1
branches:  netbsd-6
changeset: 774567:180036655fc1
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Sep 03 18:32:38 2012 +0000

description:
Pull up following revision(s) (requested by kardel in ticket #522):
        external/bsd/ntp/dist/ntpd/ntp_io.c: revision 1.10
re-enable broadcast client config after interface re-scanning
make broadcast transmission work again

diffstat:

 external/bsd/ntp/dist/ntpd/ntp_io.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (42 lines):

diff -r 802b1a54bf86 -r 180036655fc1 external/bsd/ntp/dist/ntpd/ntp_io.c
--- a/external/bsd/ntp/dist/ntpd/ntp_io.c       Mon Sep 03 18:30:59 2012 +0000
+++ b/external/bsd/ntp/dist/ntpd/ntp_io.c       Mon Sep 03 18:32:38 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntp_io.c,v 1.9 2012/02/01 21:21:25 kardel Exp $        */
+/*     $NetBSD: ntp_io.c,v 1.9.2.1 2012/09/03 18:32:38 riz Exp $       */
 
 /*
  * ntp_io.c - input/output routines for ntpd.  The socket-opening code
@@ -1592,9 +1592,11 @@
 {
 #ifdef  OS_MISSES_SPECIFIC_ROUTE_UPDATES
        if (interface->fd != INVALID_SOCKET) {
+               int bcast = (interface->flags & INT_BCASTOPEN) != 0;
                close_and_delete_fd_from_list(interface->fd);
+               interface->flags &= ~INT_BCASTOPEN;
                interface->fd = open_socket(&interface->sin,
-                                           0, 0, interface);
+                                           bcast, 0, interface);
                 /*
                  * reset TTL indication so TTL is is set again 
                  * next time around
@@ -2047,6 +2049,9 @@
                msyslog(LOG_INFO, "peers refreshed");
        }
 
+       if (sys_bclient)
+               io_setbclient();
+
        return new_interface_found;
 }
 
@@ -2074,9 +2079,6 @@
 
        update_interfaces(port, NULL, NULL);
 
-       if (sys_bclient)
-               io_setbclient();
-
        /*
         * Now that we have opened all the sockets, turn off the reuse
         * flag for security.