summaryrefslogtreecommitdiff
path: root/net/ntp/files
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2025-02-18 19:49:50 -0800
committerCy Schubert <cy@FreeBSD.org>2025-02-18 19:55:50 -0800
commitc6ccd7ce6e64d7b036ad89d23b9a1ffc78740cb6 (patch)
treed049fe2bfd6860ef6578c52647bb168b6dbe3ab1 /net/ntp/files
parentnet/ntp: Replace the workaround from 98e34e8e2557 with a patch from upstream (diff)
net/ntp: Another patch to address IPv6 pool regression
43537eb9c3e5 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. Obtained from: src c1767cf87cb6 MFH: 2025Q1
Diffstat (limited to 'net/ntp/files')
-rw-r--r--net/ntp/files/patch-ntpd_ntp__proto.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/net/ntp/files/patch-ntpd_ntp__proto.c b/net/ntp/files/patch-ntpd_ntp__proto.c
new file mode 100644
index 000000000000..76d9a7bf0583
--- /dev/null
+++ b/net/ntp/files/patch-ntpd_ntp__proto.c
@@ -0,0 +1,11 @@
+--- ntpd/ntp_proto.c.orig 2024-05-07 04:21:28.000000000 -0700
++++ ntpd/ntp_proto.c 2025-02-18 19:48:02.135233000 -0800
+@@ -474,7 +474,7 @@
+ /* [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;
+ }