git: 4ac2d0f2537c - stable/14 - ntp: Replace the workaround from 98e34e8e2557 with a patch from upstream

The branch stable/14 has been updated by cy:

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

commit 4ac2d0f2537cbc1049d1f58f8b868c2130bd54e2
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2025-01-31 23:36:59 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2025-03-20 04:26:46 +0000

    ntp: Replace the workaround from 98e34e8e2557 with a patch from upstream
    
    98e34e8e2557 circumvented an upstream patch which caused an IPv6
    pool regresson. This patch removes the circumvention and replaces
    it with an upstream patch planned for the new release of ntp.
    
    (cherry picked from commit bc02e655872021595c434850fbcbdb8dd11d4a46)
---
 contrib/ntp/ntpd/ntp_io.c    | 4 +---
 contrib/ntp/ntpd/ntp_proto.c | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/contrib/ntp/ntpd/ntp_io.c b/contrib/ntp/ntpd/ntp_io.c
index 69fae606f5c7..9c4f6c1553e3 100644
--- a/contrib/ntp/ntpd/ntp_io.c
+++ b/contrib/ntp/ntpd/ntp_io.c
@@ -1486,9 +1486,7 @@ is_linklocal(
 
 	if (IS_IPV6(psau)) {
 		p6addr = &psau->sa6.sin6_addr;
-		if (   IN6_IS_ADDR_LINKLOCAL(p6addr)
-		    || IN6_IS_ADDR_SITELOCAL(p6addr)) {
-
+		if (IN6_IS_ADDR_LINKLOCAL(p6addr)) {
 			return TRUE;
 		}
 	} else if (IS_IPV4(psau)) {
diff --git a/contrib/ntp/ntpd/ntp_proto.c b/contrib/ntp/ntpd/ntp_proto.c
index 6b875145802f..2e0d221c8472 100644
--- a/contrib/ntp/ntpd/ntp_proto.c
+++ b/contrib/ntp/ntpd/ntp_proto.c
@@ -471,7 +471,6 @@ transmit(
 		return;
 	}
 
-#if 0
 	/* [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)
@@ -480,7 +479,6 @@ transmit(
 			return;
 		}
 	}
-#endif
 
 	 /*
 	 * In unicast modes the dance is much more intricate. It is