ntpd tries to bind to IPv6 interfaces in 'tentative' state and fails as IPv6 is
actually disabled. Fix it by making ntpd ignore such interfaces. Submitted by: ume Reviewed by: bz, gnn MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D1527
This commit is contained in:
parent
3a5ae4edcf
commit
a2b8f1cbb7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=277202
@ -1176,12 +1176,13 @@ set_wildcard_reuse(int family, int on)
|
|||||||
|
|
||||||
#ifdef INCLUDE_IPV6_SUPPORT
|
#ifdef INCLUDE_IPV6_SUPPORT
|
||||||
static isc_boolean_t
|
static isc_boolean_t
|
||||||
is_anycast(struct sockaddr *sa, char *name)
|
is_not_bindable(struct sockaddr *sa, char *name)
|
||||||
{
|
{
|
||||||
#if defined(SIOCGIFAFLAG_IN6) && defined(IN6_IFF_ANYCAST)
|
#if defined(SIOCGIFAFLAG_IN6) && \
|
||||||
|
(defined(IN6_IFF_ANYCAST) || defined(IN6_IFF_NOTREADY))
|
||||||
struct in6_ifreq ifr6;
|
struct in6_ifreq ifr6;
|
||||||
int fd;
|
int fd;
|
||||||
u_int32_t flags6;
|
u_int32_t flags6, exclude = 0;
|
||||||
|
|
||||||
if (sa->sa_family != AF_INET6)
|
if (sa->sa_family != AF_INET6)
|
||||||
return ISC_FALSE;
|
return ISC_FALSE;
|
||||||
@ -1197,9 +1198,15 @@ is_anycast(struct sockaddr *sa, char *name)
|
|||||||
}
|
}
|
||||||
close(fd);
|
close(fd);
|
||||||
flags6 = ifr6.ifr_ifru.ifru_flags6;
|
flags6 = ifr6.ifr_ifru.ifru_flags6;
|
||||||
if ((flags6 & IN6_IFF_ANYCAST) != 0)
|
#if defined(IN6_IFF_ANYCAST)
|
||||||
|
exclude |= IN6_IFF_ANYCAST;
|
||||||
|
#endif /* !IN6_IFF_ANYCAST */
|
||||||
|
#if defined(IN6_IFF_NOTREADY)
|
||||||
|
exclude |= IN6_IFF_NOTREADY;
|
||||||
|
#endif /* !IN6_IFF_NOTREADY */
|
||||||
|
if ((flags6 & exclude) != 0)
|
||||||
return ISC_TRUE;
|
return ISC_TRUE;
|
||||||
#endif /* !SIOCGIFAFLAG_IN6 || !IN6_IFF_ANYCAST */
|
#endif /* !SIOCGIFAFLAG_IN6 || !(IN6_IFF_ANYCAST && IN6_IFF_NOTREADY) */
|
||||||
return ISC_FALSE;
|
return ISC_FALSE;
|
||||||
}
|
}
|
||||||
#endif /* !INCLUDE_IPV6_SUPPORT */
|
#endif /* !INCLUDE_IPV6_SUPPORT */
|
||||||
@ -1344,7 +1351,7 @@ update_interfaces(
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
#ifdef INCLUDE_IPV6_SUPPORT
|
#ifdef INCLUDE_IPV6_SUPPORT
|
||||||
if (is_anycast((struct sockaddr *)&interface.sin, isc_if.name))
|
if (is_not_bindable((struct sockaddr *)&interface.sin, isc_if.name))
|
||||||
continue;
|
continue;
|
||||||
#endif /* !INCLUDE_IPV6_SUPPORT */
|
#endif /* !INCLUDE_IPV6_SUPPORT */
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user