Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Dec 2024 17:59:27 GMT
From:      Cy Schubert <cy@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: f904025c5d20 - stable/13 - ntp: Undo upstream (ntp.org) fix for upstream Bug 3851
Message-ID:  <202412271759.4BRHxRDj032959@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by cy:

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

commit f904025c5d20fb579a4b1607069ad9697be542fd
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-12-23 22:30:58 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2024-12-27 17:59:20 +0000

    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 170294c68bb6..f9605b8feacb 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412271759.4BRHxRDj032959>