Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 Feb 2025 17:12:04 GMT
From:      Cy Schubert <cy@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: c1767cf87cb6 - main - ntp: Another patch to address IPv6 pool regression
Message-ID:  <202502181712.51IHC4FY064742@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=c1767cf87cb64c25426fd7fe119be283b134509a

commit c1767cf87cb64c25426fd7fe119be283b134509a
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2025-02-03 23:16:08 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2025-02-18 17:11:45 +0000

    ntp: Another patch to address IPv6 pool regression
    
    98e34e8e2557 circumvented an upstream patch which caused an IPv6
    pool regression. This patch, discussed in
    https://bugs.ntp.org/show_bug.cgi?id=3958, addresses another
    unworkable combination of link-local local address with
    non-link-local server.
    
    MFC after:      1 month
---
 contrib/ntp/ntpd/ntp_proto.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/ntp/ntpd/ntp_proto.c b/contrib/ntp/ntpd/ntp_proto.c
index 170294c68bb6..2e0d221c8472 100644
--- a/contrib/ntp/ntpd/ntp_proto.c
+++ b/contrib/ntp/ntpd/ntp_proto.c
@@ -474,7 +474,7 @@ transmit(
 	/* [Bug 3851] drop pool servers which can no longer be reached. */
 	if (MDF_PCLNT & peer->cast_flags) {
 		if (   (IS_IPV6(&peer->srcadr) && !nonlocal_v6_addr_up)
-		    || !nonlocal_v4_addr_up) {
+		    || (IS_IPV4(&peer->srcadr) && !nonlocal_v4_addr_up)) {
 			unpeer(peer);
 			return;
 		}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502181712.51IHC4FY064742>