From a653e8317f5af006ab49a761ce35d3f525ba5abd Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Mon, 23 Dec 2024 14:30:58 -0800 Subject: [PATCH] ntp: Undo upstream (ntp.org) fix for upstream Bug 3851 The patch for upstream (ntp.org) fix for upstream Bug 3851 may have fixed a Linux bug but it caused a regression when ntpd is run on FreeBSD. Suggested that so@ publish an errata and merge this to releng/14.2. PR: 283116 (cherry picked from commit 98e34e8e255767e18dd8a6c348cff8bfc01b2662) --- contrib/ntp/ntpd/ntp_proto.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/ntp/ntpd/ntp_proto.c b/contrib/ntp/ntpd/ntp_proto.c index 170294c68bb..f9605b8feac 100644 --- a/contrib/ntp/ntpd/ntp_proto.c +++ b/contrib/ntp/ntpd/ntp_proto.c @@ -471,6 +471,7 @@ 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) @@ -479,6 +480,7 @@ transmit( return; } } +#endif /* * In unicast modes the dance is much more intricate. It is