The branch main has been updated by cy:

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

commit c1767cf87cb64c25426fd7fe119be283b134509a
Author:     Cy Schubert <c...@freebsd.org>
AuthorDate: 2025-02-03 23:16:08 +0000
Commit:     Cy Schubert <c...@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;
                }

Reply via email to