git: bc02e6558720 - main - ntp: Replace the workaround from 98e34e8e2557 with a patch from upstream

The branch main has been updated by cy:

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

commit bc02e655872021595c434850fbcbdb8dd11d4a46
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2025-01-31 23:36:59 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2025-02-18 17:11:45 +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.
    
    MFC after:      1 month
---
 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 0df543c5af04..6a796101b0e8 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 f9605b8feacb..170294c68bb6 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