[packages/ntp.git] / ntp-4.2.4p2-tentative.patch

--- ntp-4.2.4p2/libisc/ifiter_ioctl.c.tentative	2006-12-28 13:03:07.000000000 +0100
+++ ntp-4.2.4p2/libisc/ifiter_ioctl.c	2007-07-16 13:04:15.000000000 +0200
@@ -94,6 +94,7 @@ struct isc_interfaceiter {
 #include <sys/socket.h>
 #endif
 
+#include <linux/rtnetlink.h>
 
 /*
  * Size of buffer for SIOCGLIFCONF, in bytes.  We assume no sane system
@@ -516,6 +517,9 @@ linux_if_inet6_current(isc_interfaceiter
 	if ((ifreq.ifr_flags & IFF_MULTICAST) != 0)
 		iter->current.flags |= INTERFACE_F_MULTICAST;
 #endif
+	/* ignore tentative address */
+	if (flags & IFA_F_TENTATIVE)
+		iter->current.flags &= ~INTERFACE_F_UP;
 
 	/*
 	 * enable_multicast_if() requires scopeid for setsockopt,
Commit	Line	Data
6fca7355 ER	1	--- ntp-4.2.4p2/libisc/ifiter_ioctl.c.tentative 2006-12-28 13:03:07.000000000 +0100
	2	+++ ntp-4.2.4p2/libisc/ifiter_ioctl.c 2007-07-16 13:04:15.000000000 +0200
	3	@@ -94,6 +94,7 @@ struct isc_interfaceiter {
	4	#include <sys/socket.h>
	5	#endif
	6
	7	+#include <linux/rtnetlink.h>
	8
	9	/*
	10	* Size of buffer for SIOCGLIFCONF, in bytes. We assume no sane system
	11	@@ -516,6 +517,9 @@ linux_if_inet6_current(isc_interfaceiter
	12	if ((ifreq.ifr_flags & IFF_MULTICAST) != 0)
	13	iter->current.flags \|= INTERFACE_F_MULTICAST;
	14	#endif
	15	+ /* ignore tentative address */
	16	+ if (flags & IFA_F_TENTATIVE)
	17	+ iter->current.flags &= ~INTERFACE_F_UP;
	18
	19	/*
	20	* enable_multicast_if() requires scopeid for setsockopt,