[ntp:bk-ntp-stable-send] Bitkeeper diffs

Harlan Stenn stenn at whimsy.udel.edu
Wed Jul 19 19:01:27 UTC 2006


#### ChangeSet ####
2006-07-19 05:24:23-04:00, stenn at pogo.udel.edu 
  [Bug 657] netbsd fix for IP_MULTICAST_LOOP test

==== configure.ac ====
2006-07-19 05:24:14-04:00, stenn at pogo.udel.edu +1 -1
  [Bug 657] netbsd fix for IP_MULTICAST_LOOP test

--- 1.389/configure.ac	2006-07-19 15:01:39 -04:00
+++ 1.390/configure.ac	2006-07-19 15:01:39 -04:00
@@ -1755,7 +1755,7 @@ case "$ac_cv_var_mcast" in
     AC_CACHE_CHECK([[arg type needed for IP*_MULTICAST_LOOP for setsockopt()]],
 	ac_cv_var_typeof_ip_multicast_loop,
 	[case "$host" in
-	 *-*-netbsd|*-*-linux*|*-*-winnt*)
+	 *-*-netbsd*|*-*-linux*|*-*-winnt*)
 	    ac_cv_var_typeof_ip_multicast_loop=u_int
 	    ;;
 	 *) ac_cv_var_typeof_ip_multicast_loop=u_char

#### ChangeSet ####
2006-07-19 03:10:22-04:00, stenn at pogo.udel.edu 
  [Bug 657] Different OSes need different sized args for IP_MULTICAST_LOOP

==== configure.ac ====
2006-07-19 03:10:08-04:00, stenn at pogo.udel.edu +15 -1
  [Bug 657] Different OSes need different sized args for IP_MULTICAST_LOOP

--- 1.388/configure.ac	2006-07-19 15:02:07 -04:00
+++ 1.389/configure.ac	2006-07-19 15:02:07 -04:00
@@ -1750,7 +1750,21 @@ AC_CACHE_CHECK(for kernel multicast supp
   ], ac_cv_var_mcast=yes) ;;
   esac])
 case "$ac_cv_var_mcast" in
- yes) AC_DEFINE(MCAST, 1, [Does the kernel support multicasting IP?]) ;;
+ yes)
+    AC_DEFINE(MCAST, 1, [Does the kernel support multicasting IP?])
+    AC_CACHE_CHECK([[arg type needed for IP*_MULTICAST_LOOP for setsockopt()]],
+	ac_cv_var_typeof_ip_multicast_loop,
+	[case "$host" in
+	 *-*-netbsd|*-*-linux*|*-*-winnt*)
+	    ac_cv_var_typeof_ip_multicast_loop=u_int
+	    ;;
+	 *) ac_cv_var_typeof_ip_multicast_loop=u_char
+	    ;;
+	esac])
+    AC_DEFINE_UNQUOTED(TYPEOF_IP_MULTICAST_LOOP,
+		   $ac_cv_var_typeof_ip_multicast_loop,
+		   [What type to use for setsockopt])
+    ;;
 esac
 
 AC_CACHE_CHECK([[availability of ntp_{adj,get}time()]], ac_cv_var_ntp_syscalls,

==== ntpd/ntp_io.c ====
2006-07-19 03:10:09-04:00, stenn at pogo.udel.edu +1 -1
  [Bug 657] Different OSes need different sized args for IP_MULTICAST_LOOP

--- 1.205/ntpd/ntp_io.c	2006-07-19 15:02:07 -04:00
+++ 1.206/ntpd/ntp_io.c	2006-07-19 15:02:07 -04:00
@@ -1016,7 +1016,7 @@ void
 enable_multicast_if(struct interface *iface, struct sockaddr_storage *maddr)
 {
 #ifdef MCAST
-	u_char off = 0;
+	/*u_char*/ TYPEOF_IP_MULTICAST_LOOP off = 0;
 
 	switch (maddr->ss_family)
 	{

#### ChangeSet ####
2006-06-25 20:46:46-04:00, stenn at pogo.udel.edu 
  Merge whimsy:/backroom/ntp-stable
  into  pogo.udel.edu:/pogo/users/stenn/ntp-stable

==== bootstrap ====
2006-06-25 20:46:36-04:00, stenn at pogo.udel.edu +0 -0
  Auto merged

#### ChangeSet ####
2006-06-19 02:34:42-04:00, stenn at pogo.udel.edu 
  Merge whimsy:/backroom/ntp-stable
  into  pogo.udel.edu:/pogo/users/stenn/ntp-stable

==== bootstrap ====
2006-06-19 02:34:39-04:00, stenn at pogo.udel.edu +0 -1
  Auto merged

--- 1.5+1.4.1.1/bootstrap	2006-07-19 15:02:10 -04:00
+++ 1.6/bootstrap	2006-07-19 15:02:10 -04:00
@@ -1,5 +1,4 @@
 #! /usr/bin/env bash
-#! /usr/bin/env bash
 
 #  This "bootstrap" script performs various pre-autoreconf actions
 #  that are required after pulling fresh sources from the repository.

#### ChangeSet ####
2006-06-19 02:31:54-04:00, stenn at pogo.udel.edu 
  Avoid hardcoded path to bash for the bootstrap script

==== bootstrap ====
2006-06-19 02:31:43-04:00, stenn at pogo.udel.edu +1 -1
  Avoid hardcoded path to bash for the bootstrap script

--- 1.4/bootstrap	2006-07-19 15:02:10 -04:00
+++ 1.4.1.1/bootstrap	2006-07-19 15:02:10 -04:00
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 
 #  This "bootstrap" script performs various pre-autoreconf actions
 #  that are required after pulling fresh sources from the repository.


More information about the bk-ntp-stable-send mailing list