Merge whimsy.udel.edu:/deacon/backroom/ntp-stable

into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 449f188bA0XPMt5p81nRucWnf5MJuQ

diff --cc ntpd/ntp_io.c
index 468522f39687bdac7665e903ecfb4662d409e9ba,694ef5d9558317fc737c07a66cc3010ea672cfcc..b9a35805afdc38bfcda9dcca668dc4665ac88b8a
--- 1/ntpd/ntp_io.c
--- 2/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@@ -1457,10 -934,10 +1457,10 @@@ socket_broadcast_enable(struct interfac
   * broadcasting. It is not this function's job to select the socket
   */
  static isc_boolean_t
 -socket_broadcast_disable(struct interface *iface, int ind, struct sockaddr_storage *maddr)
 +socket_broadcast_disable(struct interface *iface, struct sockaddr_storage *maddr)
  {
  #ifdef SO_BROADCAST
-       int off = 0;
+       int off = 0;    /* XXX: Should this be a u_char (Bug 657)? */
  
        if (maddr->ss_family == AF_INET)
        {