Merge pogo.udel.edu:/pogo/users/hart/ntp-stable-dprintf

into  pogo.udel.edu:/pogo/users/hart/ntp-dev-dprintf

bk: 498cd055kXpez70jjFxQ-27WUT8evw

diff --cc ntpd/ntp_io.c
index 34892f07509614a51c3cd6dd9a5f28174b6ab93b,a13b6747e9914a6d59f737ed267c631420aa072b..80c446756b2d09d32e01672a2f9abd4cea986a36
--- 1/ntpd/ntp_io.c
--- 2/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@@ -224,10 -191,10 +224,10 @@@ static  isc_boolean_t   socket_multicast_d
  #endif
  
  #ifdef DEBUG
 -static void print_interface   P((struct interface *, char *, char *));
 +static void print_interface   (struct interface *, char *, char *);
  #define DPRINT_INTERFACE(_LVL_, _ARGS_) do { if (debug >= (_LVL_)) { print_interface _ARGS_; } } while (0)
  #else
- #define DPRINT_INTERFACE(_LVL_, _ARGS_)
+ #define DPRINT_INTERFACE(_LVL_, _ARGS_) do {} while (0)
  #endif
  
  typedef struct vsock vsock_t;
@@@ -3379,10 -3205,9 +3379,10 @@@ findlocalinterface
        struct sockaddr_storage saddr;
        GETSOCKNAME_SOCKLEN_TYPE saddrlen = SOCKLEN(addr);
        struct interface *iface;
 +      int on = 1;
  
        DPRINTF(4, ("Finding interface for addr %s in list of addresses\n",
-                   stoa(addr));)
+                   stoa(addr)));
  
        memset(&saddr, 0, sizeof(saddr));
        saddr.ss_family = addr->ss_family;