summaryrefslogtreecommitdiffstats
path: root/contrib/ntp/lib/isc/unix/net.c
diff options
context:
space:
mode:
authorcy <cy@FreeBSD.org>2015-05-04 04:45:59 +0000
committercy <cy@FreeBSD.org>2015-05-04 04:45:59 +0000
commit1818eba70c74c4ba7173ef82fd98d197914adc74 (patch)
tree62ff96a32b854c652d9d65280d1d6fd2089b2f1e /contrib/ntp/lib/isc/unix/net.c
parent46cb5cb412522de16502b815c1126a1bf652045b (diff)
parentf63afe28012870b3eb07e80844160966b32ef52e (diff)
downloadFreeBSD-src-1818eba70c74c4ba7173ef82fd98d197914adc74.zip
FreeBSD-src-1818eba70c74c4ba7173ef82fd98d197914adc74.tar.gz
MFV ntp 4.2.8p2 (r281348)
Reviewed by: delphij (suggested MFC) Approved by: roberto Security: CVE-2015-1798, CVE-2015-1799 Security: VuXML ebd84c96-dd7e-11e4-854e-3c970e169bc2 MFC after: 1 month
Diffstat (limited to 'contrib/ntp/lib/isc/unix/net.c')
-rw-r--r--contrib/ntp/lib/isc/unix/net.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/ntp/lib/isc/unix/net.c b/contrib/ntp/lib/isc/unix/net.c
index 2ba17d16..7056668 100644
--- a/contrib/ntp/lib/isc/unix/net.c
+++ b/contrib/ntp/lib/isc/unix/net.c
@@ -106,7 +106,8 @@ const struct in6_addr isc_net_in6addrloop = IN6ADDR_LOOPBACK_INIT;
static isc_once_t once_ipv6only = ISC_ONCE_INIT;
# endif
-# if defined(ISC_PLATFORM_HAVEIN6PKTINFO)
+# if defined(ISC_PLATFORM_HAVEIPV6) && \
+ defined(WANT_IPV6) && defined(ISC_PLATFORM_HAVEIN6PKTINFO)
static isc_once_t once_ipv6pktinfo = ISC_ONCE_INIT;
# endif
#endif /* ISC_PLATFORM_HAVEIPV6 */
OpenPOWER on IntegriCloud