git: 9d425f11f9ff - stable/13 - ntp: Another patch to address IPv6 pool regression
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 20 Mar 2025 04:27:18 UTC
The branch stable/13 has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=9d425f11f9ff9be2dc604d0bcaeb8f2c74c0aca5
commit 9d425f11f9ff9be2dc604d0bcaeb8f2c74c0aca5
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2025-02-03 23:16:08 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2025-03-20 03:10:29 +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.
(cherry picked from commit c1767cf87cb64c25426fd7fe119be283b134509a)
---
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 f9605b8feacb..6b875145802f 100644
--- a/contrib/ntp/ntpd/ntp_proto.c
+++ b/contrib/ntp/ntpd/ntp_proto.c
@@ -475,7 +475,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;
}