[ntp:bk-ntp-stable-send] BitKeeper patch

Harlan Stenn stenn at whimsy.udel.edu
Tue Nov 11 00:11:39 PST 2003


This BitKeeper patch contains the following changesets:
mayer at pogo.udel.edu|ChangeSet|20031108022753|18659
mayer at tecotoo.myibg.com|ChangeSet|20031103041829|19099
mayer at tecotoo.myibg.com|ChangeSet|20031108214943|19194
mayer at tecotoo.myibg.com|ChangeSet|20031109013239|19182
stenn at whimsy.udel.edu|ChangeSet|20031111081016|19231

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# ID:	stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
# User:	stenn
# Host:	whimsy.udel.edu
# Root:	/backroom/ntp-stable

#
#--- 1.9/include/ntp_rfc2553.h	Tue Feb 25 23:33:54 2003
#+++ 1.11/include/ntp_rfc2553.h	Sat Nov  8 20:30:05 2003
#@@ -68,9 +68,13 @@
# #ifndef _NTP_RFC2553_H_
# #define _NTP_RFC2553_H_
# 
#-#if defined(_SS_MAXSIZE) || defined(_SS_SIZE)
#-#define HAVE_IPV6
#-#else
#+/*
#+ * Ensure that we include the configuration file before we check
#+ * for IPV6
#+ */
#+#include <config.h>
#+
#+#ifndef ISC_PLATFORM_HAVEIPV6
# 
# #include <sys/types.h>
# #include "ntp_types.h"
#@@ -250,5 +254,5 @@
# void	freeaddrinfo P((struct addrinfo *));
# char	*gai_strerror P((int));
# 
#-#endif /* _SS_MAXSIZE */
#+#endif /* ISC_PLATFORM_HAVEIPV6 */
# #endif /* !_NTP_RFC2553_H_ */
#
#--- 1.14/libntp/ntp_rfc2553.c	Tue Feb 18 22:09:24 2003
#+++ 1.15/libntp/ntp_rfc2553.c	Sat Nov  8 16:49:00 2003
#@@ -83,7 +83,7 @@
# #include "ntp_stdlib.h"
# #include "ntp_string.h"
# 
#-#ifndef HAVE_IPV6
#+#ifndef ISC_PLATFORM_HAVEIPV6
# 
# #if defined(SYS_WINNT)
# /* XXX This is the preferred way, but for some reason the SunOS compiler
#@@ -328,4 +328,4 @@
# #endif
# 	return (1);
# }
#-#endif /* !HAVE_IPV6 */
#+#endif /* !ISC_PLATFORM_HAVEIPV6 */
#
#--- 1.3/include/isc/ipv6.h	Sat Jul 26 15:36:09 2003
#+++ 1.4/include/isc/ipv6.h	Sat Nov  8 16:48:51 2003
#@@ -102,12 +102,13 @@
# /*
#  * Unspecified
#  */
#+#ifndef IN6_IS_ADDR_UNSPECIFIED
# #define IN6_IS_ADDR_UNSPECIFIED(a)      \
#         (((a)->s6_addr32[0] == 0) &&    \
#          ((a)->s6_addr32[1] == 0) &&    \
#          ((a)->s6_addr32[2] == 0) &&    \
#          ((a)->s6_addr32[3] == 0))
#-
#+#endif
# /*
#  * Loopback
#  */
#@@ -138,9 +139,10 @@
# /*
#  * Multicast
#  */
#+#ifndef IN6_IS_ADDR_MULTICAST
# #define IN6_IS_ADDR_MULTICAST(a)	\
# 	((a)->s6_addr8[0] == 0xffU)
#-
#+#endif
# /*
#  * Unicast link / site local.
#  */
#
#--- 1.2/ports/winnt/include/isc/ipv6.h	Sat Jul 26 15:36:17 2003
#+++ 1.3/ports/winnt/include/isc/ipv6.h	Sat Nov  8 16:49:04 2003
#@@ -56,13 +56,14 @@
#  * Unspecified
#  */
# 
#+#ifndef IN6_IS_ADDR_UNSPECIFIED
# #define IN6_IS_ADDR_UNSPECIFIED(a)      \
# *((u_long *)((a)->s6_addr)    ) == 0 && \
# *((u_long *)((a)->s6_addr) + 1) == 0 && \
# *((u_long *)((a)->s6_addr) + 2) == 0 && \
# *((u_long *)((a)->s6_addr) + 3) == 0 \
# )
#-
#+#endif
# /*
#  * Loopback
#  */
#@@ -95,9 +96,10 @@
# /*
#  * Multicast
#  */
#+#ifndef IN6_IS_ADDR_MULTICAST
# #define IN6_IS_ADDR_MULTICAST(a)	\
# 	((a)->s6_addr8[0] == 0xffU)
#-
#+#endif
# /*
#  * Unicast link / site local.
#  */
#
#--- 1.2/ports/winnt/include/isc/platform.h	Sat Jul 26 15:36:19 2003
#+++ 1.3/ports/winnt/include/isc/platform.h	Sat Nov  8 16:49:06 2003
#@@ -30,7 +30,12 @@
#  *** Network.
#  ***/
# 
#+/*
#+ * This should not be defined yet until we can support IPV6
#+ * on Windows Platforms.
#+ *
# #define ISC_PLATFORM_HAVEIPV6
#+*/
# #define ISC_PLATFORM_NEEDPORTT
# #undef MSG_TRUNC
# #define ISC_PLATFORM_NEEDNTOP
#
#--- 1.94/ntpd/ntp_io.c	Sun Oct  5 18:49:09 2003
#+++ 1.96/ntpd/ntp_io.c	Fri Nov  7 21:25:26 2003
#@@ -296,7 +296,7 @@
# 	wildipv4 = idx;
# 	idx++;
# 
#-#ifdef HAVE_IPV6
#+#ifdef ISC_PLATFORM_HAVEIPV6
# 	/*
# 	 * create pseudo-interface with wildcard IPv6 address
# 	 */
#@@ -373,7 +373,7 @@
# 			loopback_interface = itf;
# 		}
# 	}
#-#ifdef HAVE_IPV6
#+#ifdef ISC_PLATFORM_HAVEIPV6
# 	else if (isc_if->af == AF_INET6) {
# 		itf->sin.ss_family = (u_short) isc_if->af;
# 		strcpy(itf->name, isc_if->name);
#@@ -393,7 +393,7 @@
# 			loopback6_interface = itf;
# 		}
# 	}
#-#endif /* HAVE_IPV6 */
#+#endif /* ISC_PLATFORM_HAVEIPV6 */
# 
# 		/* Process the rest of the flags */
# 
#@@ -429,7 +429,7 @@
# 
# 	if (isc_net_probeipv6() == ISC_R_SUCCESS)
# 		scan_ipv6 = ISC_TRUE;
#-#ifdef HAVE_IPV6
#+#ifdef ISC_PLATFORM_HAVEIPV6
# 	else
# 		netsyslog(LOG_ERR, "no IPv6 interfaces found");
# #endif
#@@ -655,11 +655,11 @@
# 	SOCKET s;
# 	struct sockaddr_in *sinp;
# 
#-#ifdef HAVE_IPV6
#+#ifdef ISC_PLATFORM_HAVEIPV6
# 	struct ipv6_mreq mreq6;
# 	struct in6_addr iaddr6;
# 	struct sockaddr_in6 *sin6p;
#-#endif /* HAVE_IPV6 */
#+#endif /* ISC_PLATFORM_HAVEIPV6 */
# 
# 	switch (addr.ss_family)
# 	{
#@@ -743,7 +743,7 @@
#                 add_addr_to_list(&addr, i);
# 		break;
# 
#-#ifdef HAVE_IPV6
#+#ifdef ISC_PLATFORM_HAVEIPV6
# 	case AF_INET6 :
# 
# 		iaddr6 = ((struct sockaddr_in6*)&addr)->sin6_addr;
#@@ -823,7 +823,7 @@
# 
#                 add_addr_to_list(&addr, i);
# 		break;
#-#endif /* HAVE_IPV6 */
#+#endif /* ISC_PLATFORM_HAVEIPV6 */
# 	}
# 
# #ifdef DEBUG
#@@ -869,10 +869,10 @@
# 	struct ip_mreq mreq;
# 	u_int32 haddr;
# 
#-#ifdef HAVE_IPV6
#+#ifdef ISC_PLATFORM_HAVEIPV6
# 	struct ipv6_mreq mreq6;
# 	struct in6_addr haddr6;
#-#endif /* HAVE_IPV6 */
#+#endif /* ISC_PLATFORM_HAVEIPV6 */
# 
# 	switch (addr.ss_family)
# 	{
#@@ -926,7 +926,7 @@
# 		}
# 		break;
# 
#-#ifdef HAVE_IPV6
#+#ifdef ISC_PLATFORM_HAVEIPV6
# 	case AF_INET6 :
# 		haddr6 = ((struct sockaddr_in6*)&addr)->sin6_addr;
# 
#@@ -974,7 +974,7 @@
# 			}
# 		}
# 		break;
#-#endif /* HAVE_IPV6 */
#+#endif /* ISC_PLATFORM_HAVEIPV6 */
# 	}/* switch */
#         delete_addr_from_list(&addr);
# 
#@@ -1343,26 +1343,26 @@
# 		struct	in_addr addr;
# 	};
# 
#-#ifdef HAVE_IPV6
#+#ifdef ISC_PLATFORM_HAVEIPV6
# 	struct cache6 {
# 		u_short port;
# 		struct in6_addr addr;
# 	};
#-#endif /* HAVE_IPV6 */
#+#endif /* ISC_PLATFORM_HAVEIPV6 */
# 
# #ifndef ERRORCACHESIZE
# #define ERRORCACHESIZE 8
# #endif
# #if ERRORCACHESIZE > 0
# 	static struct cache badaddrs[ERRORCACHESIZE];
#-#ifdef HAVE_IPV6
#+#ifdef ISC_PLATFORM_HAVEIPV6
# 	static struct cache6 badaddrs6[ERRORCACHESIZE];
#-#endif /* HAVE_IPV6 */
#+#endif /* ISC_PLATFORM_HAVEIPV6 */
# #else
# #define badaddrs ((struct cache *)0)		/* Only used in empty loops! */
#-#ifdef HAVE_IPV6
#+#ifdef ISC_PLATFORM_HAVEIPV6
# #define badaddrs6 ((struct cache6 *)0)		/* Only used in empty loops! */
#-#endif /* HAVE_IPV6 */
#+#endif /* ISC_PLATFORM_HAVEIPV6 */
# #endif
# #ifdef DEBUG
# 	if (debug > 1)
#@@ -1386,8 +1386,9 @@
# 			/*
# 			* set the multicast ttl for outgoing packets
# 			*/
#+			u_char mttl = (u_char) ttl;
# 			if (setsockopt(inter->fd, IPPROTO_IP, IP_MULTICAST_TTL,
#-				(char *) &ttl, sizeof(ttl)) != 0) {
#+				(const void *) &mttl, sizeof(mttl)) != 0) {
# 				netsyslog(LOG_ERR, "setsockopt IP_MULTICAST_TTL fails on address %s: %m",
# 					stoa(&inter->sin));
# 			}
#@@ -1396,7 +1397,7 @@
# 		}
# 		break;
# 
#-#ifdef HAVE_IPV6
#+#ifdef ISC_PLATFORM_HAVEIPV6
# 	case AF_INET6 :
# 
# 	 	/*
#@@ -1408,15 +1409,16 @@
#                 	/*
#                  	* set the multicast ttl for outgoing packets
#                  	*/
#+			u_int ittl = (u_int) ttl;
#                 	if (setsockopt(inter->fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
#-                    	&ttl, sizeof(ttl)) == -1)
#+                    	(const void *) &ittl, sizeof(ittl)) == -1)
# 	                        netsyslog(LOG_ERR, "setsockopt IP_MULTICAST_TTL fails on address %s: %m",
# 					stoa(&inter->sin));
#                 	else
# 	                        inter->last_ttl = ttl;
# 	        }
# 	        break;
#-#endif /* HAVE_IPV6 */
#+#endif /* ISC_PLATFORM_HAVEIPV6 */
# 
# 	default :
# 		exit(1);
#@@ -1432,13 +1434,13 @@
# 				badaddrs[slot].addr.s_addr == ((struct sockaddr_in*)dest)->sin_addr.s_addr)
# 			break;
# 		}
#-#ifdef HAVE_IPV6
#+#ifdef ISC_PLATFORM_HAVEIPV6
# 		else if (dest->ss_family == AF_INET6) {
# 			if (badaddrs6[slot].port == ((struct sockaddr_in6*)dest)->sin6_port &&
# 				badaddrs6[slot].addr.s6_addr == ((struct sockaddr_in6*)dest)->sin6_addr.s6_addr)
# 			break;
# 		}
#-#endif /* HAVE_IPV6 */
#+#endif /* ISC_PLATFORM_HAVEIPV6 */
# 		else exit(1);  /* address family not supported yet */
# 
# #if defined(HAVE_IO_COMPLETION_PORT)
#@@ -1479,7 +1481,7 @@
# 					}
# 				break;
# 
#-#ifdef HAVE_IPV6
#+#ifdef ISC_PLATFORM_HAVEIPV6
# 			case AF_INET6 :
# 
# 				for (slot = ERRORCACHESIZE; --slot >= 0; )
#@@ -1490,7 +1492,7 @@
#                                     		break;
#                             		}
#                 		break;
#-#endif /* HAVE_IPV6 */
#+#endif /* ISC_PLATFORM_HAVEIPV6 */
# 
# 			default :
# 				exit(1);
#@@ -1513,11 +1515,11 @@
# 			case AF_INET :
# 				badaddrs[slot].port = 0;
# 				break;
#-#ifdef HAVE_IPV6
#+#ifdef ISC_PLATFORM_HAVEIPV6
# 			case AF_INET6 :
# 				badaddrs6[slot].port = 0;
# 				break;
#-#endif /* HAVE_IPV6 */
#+#endif /* ISC_PLATFORM_HAVEIPV6 */
# 			}
# 		}
# 	}
#

# Diff checksum=f39292e5


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
mayer at tecotoo.myibg.com|ChangeSet|20031101042343|19624
D 1.1165 03/11/02 23:18:29-05:00 mayer at tecotoo.myibg.com +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fix setsockopt arguments to conform to standard declarations for various arguments
K 19099
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663 mayer at tecotoo.myibg.com|ntpd/ntp_io.c|20031103041743|14868

mayer at tecotoo.myibg.com|ChangeSet|20031103041829|19099
D 1.1166 03/11/07 21:27:53-05:00 mayer at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Change HAVE_IPV6 macro to ISC_PLATFORM_HAVEIPV6 since BIND 9 does a better job of figuring out what's needed for IPv6
K 18659
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663 mayer at pogo.udel.edu|ntpd/ntp_io.c|20031108022526|39074

mayer at pogo.udel.edu|ChangeSet|20031108022753|18659
D 1.1167 03/11/08 16:49:43-05:00 mayer at tecotoo.myibg.com +5 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fixes to properly support platforms that do not have IPv6 support.
K 19194
P ChangeSet
------------------------------------------------

0a0
> jhay at angel.cids.org.za|libntp/ntp_rfc2553.c|20011004194249|12627|ba0e411f8e42699a mayer at tecotoo.myibg.com|libntp/ntp_rfc2553.c|20031108214900|41162
> jhay at angel.cids.org.za|include/ntp_rfc2553.h|20011004194249|08764|d8c85aa6dfbf483 mayer at tecotoo.myibg.com|include/ntp_rfc2553.h|20031108214856|35281
> mayer at tecotoo.myibg.com|include/isc/ipv6.h|20030105020009|30586|ce4106b8 mayer at tecotoo.myibg.com|include/isc/ipv6.h|20031108214851|02374
> mayer at tecotoo.myibg.com|ports/winnt/include/isc/platform.h|20030105020109|04016|d2813e88 mayer at tecotoo.myibg.com|ports/winnt/include/isc/platform.h|20031108214906|61096
> mayer at tecotoo.myibg.com|ports/winnt/include/isc/ipv6.h|20030105020102|23288|d1fdf9f3 mayer at tecotoo.myibg.com|ports/winnt/include/isc/ipv6.h|20031108214904|07723

mayer at tecotoo.myibg.com|ChangeSet|20031108214943|19194
D 1.1168 03/11/08 20:32:39-05:00 mayer at tecotoo.myibg.com +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Ensure config.h is included in ntp_rfx2553.h before testing macros
K 19182
P ChangeSet
------------------------------------------------

0a0
> jhay at angel.cids.org.za|include/ntp_rfc2553.h|20011004194249|08764|d8c85aa6dfbf483 mayer at tecotoo.myibg.com|include/ntp_rfc2553.h|20031109013005|43925

mayer at tecotoo.myibg.com|ChangeSet|20031109013239|19182
D 1.1169 03/11/11 03:10:16-05:00 stenn at whimsy.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge pogo:/usa/mayer/ntp-dev-io
c into whimsy.udel.edu:/backroom/ntp-stable
i stenn at whimsy.udel.edu|ChangeSet|20031111045342|19589
i stenn at whimsy.udel.edu|ChangeSet|20031111075522|19673
K 19231
M stenn at whimsy.udel.edu|ChangeSet|20031111075522|19673
P ChangeSet
------------------------------------------------


== include/ntp_rfc2553.h ==
jhay at angel.cids.org.za|include/ntp_rfc2553.h|20011004194249|08764|d8c85aa6dfbf483
mayer at tecotoo.myibg.com|include/ntp_rfc2553.h|20030226043354|37877
D 1.10 03/11/08 16:48:56-05:00 mayer at tecotoo.myibg.com +2 -4
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Change to only use the definitions if IPv6 not defined on the platform. This uses the
c Macros defined during the config process which defines the Macro
c ISC_PLATFORM_HAVEIPV6 if the platform properly supports IPv6
K 35281
O -rw-rw-r--
P include/ntp_rfc2553.h
------------------------------------------------

D71 3
I73 1
#ifndef ISC_PLATFORM_HAVEIPV6
D253 1
I253 1
#endif /* ISC_PLATFORM_HAVEIPV6 */

mayer at tecotoo.myibg.com|include/ntp_rfc2553.h|20031108214856|35281
D 1.11 03/11/08 20:30:05-05:00 mayer at tecotoo.myibg.com +6 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Ensure config.h is included before testing macros
K 43925
O -rw-rw-r--
P include/ntp_rfc2553.h
------------------------------------------------

I70 6
/*
 * Ensure that we include the configuration file before we check
 * for IPV6
 */
#include <config.h>
\

== libntp/ntp_rfc2553.c ==
jhay at angel.cids.org.za|libntp/ntp_rfc2553.c|20011004194249|12627|ba0e411f8e42699a
mayer at tecotoo.myibg.com|libntp/ntp_rfc2553.c|20030219030924|39300
D 1.15 03/11/08 16:49:00-05:00 mayer at tecotoo.myibg.com +2 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Use ISC_PLATFORM_HAVEIPV6 instead of HAVE_IPV6 which was previously
c defined in the ntp_rfc2553.h file based on the erroneously assumption about a
c macro.
K 41162
O -rw-rw-r--
P libntp/ntp_rfc2553.c
------------------------------------------------

D86 1
I86 1
#ifndef ISC_PLATFORM_HAVEIPV6
D331 1
I331 1
#endif /* !ISC_PLATFORM_HAVEIPV6 */

== include/isc/ipv6.h ==
mayer at tecotoo.myibg.com|include/isc/ipv6.h|20030105020009|30586|ce4106b8
stenn at whimsy.udel.edu|include/isc/ipv6.h|20030726193609|23512
D 1.4 03/11/08 16:48:51-05:00 mayer at tecotoo.myibg.com +4 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Make IPv6 Macro definitions only if not previously defined.
K 2374
O -rw-rw-r--
P include/isc/ipv6.h
------------------------------------------------

I104 1
#ifndef IN6_IS_ADDR_UNSPECIFIED
D110 1
I110 1
#endif
I140 1
#ifndef IN6_IS_ADDR_MULTICAST
D143 1
I143 1
#endif

== ports/winnt/include/isc/ipv6.h ==
mayer at tecotoo.myibg.com|ports/winnt/include/isc/ipv6.h|20030105020102|23288|d1fdf9f3
stenn at whimsy.udel.edu|ports/winnt/include/isc/ipv6.h|20030726193617|11852
D 1.3 03/11/08 16:49:04-05:00 mayer at tecotoo.myibg.com +4 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Make IPv6 Macro definitions only if not previously defined.
K 7723
O -rw-rw-r--
P ports/winnt/include/isc/ipv6.h
------------------------------------------------

I58 1
#ifndef IN6_IS_ADDR_UNSPECIFIED
D65 1
I65 1
#endif
I97 1
#ifndef IN6_IS_ADDR_MULTICAST
D100 1
I100 1
#endif

== ports/winnt/include/isc/platform.h ==
mayer at tecotoo.myibg.com|ports/winnt/include/isc/platform.h|20030105020109|04016|d2813e88
stenn at whimsy.udel.edu|ports/winnt/include/isc/platform.h|20030726193619|19644
D 1.3 03/11/08 16:49:06-05:00 mayer at tecotoo.myibg.com +5 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c The ISC_PLATFORM_HAVEIPV6 macro should not have been defined here.
c This was a vestige of the work being done to scan for IPv6 interfaces on
c Windows platforms.
K 61096
O -rw-rw-r--
P ports/winnt/include/isc/platform.h
------------------------------------------------

I32 4
/*
 * This should not be defined yet until we can support IPV6
 * on Windows Platforms.
 *
I33 1
*/

== ntpd/ntp_io.c ==
stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663
fredb at seduction.immanent.net|ntpd/ntp_io.c|20031005224909|07989
D 1.95 03/11/02 23:17:43-05:00 mayer at tecotoo.myibg.com +4 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fix setsockopt arguments to conform to standard declarations for various arguments
K 14868
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

I1388 1
			u_char mttl = (u_char) ttl;
D1390 1
I1390 1
				(const void *) &mttl, sizeof(mttl)) != 0) {
I1410 1
			u_int ittl = (u_int) ttl;
D1412 1
I1412 1
                    	(const void *) &ittl, sizeof(ittl)) == -1)

mayer at tecotoo.myibg.com|ntpd/ntp_io.c|20031103041743|14868
D 1.96 03/11/07 21:25:26-05:00 mayer at pogo.udel.edu +26 -26
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Change HAVE_IPV6 macro to ISC_PLATFORM_HAVEIPV6 since BIND 9 does a better job of figuring out what's needed for IPv6
K 39074
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

D299 1
I299 1
#ifdef ISC_PLATFORM_HAVEIPV6
D376 1
I376 1
#ifdef ISC_PLATFORM_HAVEIPV6
D396 1
I396 1
#endif /* ISC_PLATFORM_HAVEIPV6 */
D432 1
I432 1
#ifdef ISC_PLATFORM_HAVEIPV6
D658 1
I658 1
#ifdef ISC_PLATFORM_HAVEIPV6
D662 1
I662 1
#endif /* ISC_PLATFORM_HAVEIPV6 */
D746 1
I746 1
#ifdef ISC_PLATFORM_HAVEIPV6
D826 1
I826 1
#endif /* ISC_PLATFORM_HAVEIPV6 */
D872 1
I872 1
#ifdef ISC_PLATFORM_HAVEIPV6
D875 1
I875 1
#endif /* ISC_PLATFORM_HAVEIPV6 */
D929 1
I929 1
#ifdef ISC_PLATFORM_HAVEIPV6
D977 1
I977 1
#endif /* ISC_PLATFORM_HAVEIPV6 */
D1346 1
I1346 1
#ifdef ISC_PLATFORM_HAVEIPV6
D1351 1
I1351 1
#endif /* ISC_PLATFORM_HAVEIPV6 */
D1358 1
I1358 1
#ifdef ISC_PLATFORM_HAVEIPV6
D1360 1
I1360 1
#endif /* ISC_PLATFORM_HAVEIPV6 */
D1363 1
I1363 1
#ifdef ISC_PLATFORM_HAVEIPV6
D1365 1
I1365 1
#endif /* ISC_PLATFORM_HAVEIPV6 */
D1400 1
I1400 1
#ifdef ISC_PLATFORM_HAVEIPV6
D1421 1
I1421 1
#endif /* ISC_PLATFORM_HAVEIPV6 */
D1437 1
I1437 1
#ifdef ISC_PLATFORM_HAVEIPV6
D1443 1
I1443 1
#endif /* ISC_PLATFORM_HAVEIPV6 */
D1484 1
I1484 1
#ifdef ISC_PLATFORM_HAVEIPV6
D1495 1
I1495 1
#endif /* ISC_PLATFORM_HAVEIPV6 */
D1518 1
I1518 1
#ifdef ISC_PLATFORM_HAVEIPV6
D1522 1
I1522 1
#endif /* ISC_PLATFORM_HAVEIPV6 */

# Patch checksum=57158d21



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