Merge bk://www.ntp.org/home/bk/ntp-dev

into  pogo.udel.edu:/pogo/users/kardel/dynamic-if/ntp-dev

bk: 44755315bB4AAB52Qo49qS8bd3knrg

diff --cc ntpd/ntp_io.c
index 2290fd0f18dc45794d1cfe8ba9b0d42091ef5729,5a99737fe8cbb942c4503e8df16a1bdddb0753d3..a120a9b0c54a5973ba3b095d752c4132578c3193
--- 1/ntpd/ntp_io.c
--- 2/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@@ -139,21 -142,24 +139,24 @@@ static  struct refclockio *refio
   */
  fd_set activefds;
  int maxactivefd;
 +/*
 + * bit alternating value to detect verified interfaces during an update cycle
 + */
 +static  u_char          sys_interphase = 0;
 +
 +static  struct interface *new_interface P((struct interface *));
 +static  void add_interface P((struct interface *));
 +static  void update_interfaces P((u_short, interface_receiver_t, void *));
 +static  void remove_interface P((struct interface *));
 +static  struct interface *create_interface P((u_short, struct interface *));
  
- #ifdef F_DUPFD
- static int    dup_fd          P((int));
 -static        int create_sockets      P((u_short));
 -static        SOCKET  open_socket     P((struct sockaddr_storage *, int, int, struct interface *, int));
 -static        void    close_socket    P((SOCKET));
 -#ifdef REFCLOCK
 -static        void    close_file      P((SOCKET));
 -#endif
+ #if !defined(SYS_WINNT) && defined(F_DUPFD)
+ static int    move_fd         P((int));
+ #ifndef FOPEN_MAX
+ #define FOPEN_MAX     20
+ #endif
  #endif
  
 -static        char *  fdbits          P((int, fd_set *));
 -static        void    set_reuseaddr   P((int));
 -static        isc_boolean_t   socket_broadcast_enable  P((struct interface *, SOCKET, struct sockaddr_storage *));
 -static        isc_boolean_t   socket_broadcast_disable P((struct interface *, int, struct sockaddr_storage *));
  /*
   * Multicast functions
   */