From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 25 Jun 2006 23:13:15 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_3P11~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35e54b7ac0344032672eee5cb3c4349a9f897bf0;p=thirdparty%2Fntp.git

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

bk: 449f188bA0XPMt5p81nRucWnf5MJuQ
---

35e54b7ac0344032672eee5cb3c4349a9f897bf0
diff --cc ntpd/ntp_io.c
index 468522f39,694ef5d95..b9a35805a
--- a/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)
  	{