From nobody Fri Dec 27 17:59:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKYCg6TyFz5j6Vk; Fri, 27 Dec 2024 17:59:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKYCg5sKCz4FSK; Fri, 27 Dec 2024 17:59:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735322351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y5+o3HMEds7DMMVrQtxYlNFNiyBNyCPbuEvfm/OdKFI=; b=cRMtgDU+1zsuhJLrXTqXy1Ce4d9jsE0pFQ3BXu48xCbBXx4EtFbA6ZmLdA6wY2IIUhJ2Wp NRHQ0jrCycicxbUvyBj6lJaTql2OtNTOo9Mdk1yrf0atCA+XO4MO/iP1r27BTFmo5OE2Uz 7UuFmviPNRgJuzBr9mFLRLLMAL2Nq81XaRFi6D/z+7cKrYPjBAnwa0ggnQjvIQ/5JgSM8s nSA8QsB471dl0+scmUauZNvV19P3K1ZDTWbjcaztK2SqV1qoYoO3A4UaF/bPT9qPPw7JnE 6mlTvGO6UFMFDiZHoI3Xf1Na9oxYAOzANAv1LkT9xE4EHjO9HILhJaJTlpns/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735322351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y5+o3HMEds7DMMVrQtxYlNFNiyBNyCPbuEvfm/OdKFI=; b=VNT/gxTWpnC3F2/wSYb8isDEbGMsd2AYy6RSTUbWV+b1gzOeO9B131tmve50Zc0UWeeoXt 0WrY4V14fd/uQGEMPa/335BGnfMvLArl0BM0kJioy3/ZKGbWv1LruPpkEgU/RfeH5ZtqXj RuqBYYz/NvWGgSurreNDmsBDXp/WewTIkpi5CQgVsPjZXzhANiimWU/vztukNf7CxDxtzl Jppbquk5dKVMR+GVT+YmEugto5agedTHW4NwFZTUR5UBmrdUma65TLKjZQhwLTl/jyfiL1 hieWKYsI/802xsW7sghRsdSukXilwWVRmRYl84iA2V9v5BH9ArjYSKz8CbIS9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735322351; a=rsa-sha256; cv=none; b=S4Zyuwd2K5KT6UHlNmk4wt/HRD+vxE+bfkU6q13+MKKiJ3uYkorQc0n52bvitw8/nB7pg4 LoiEYf6J52AvjJgnD9Q5eVmACYZQzM5k4k/HmLcLOUX4S4xtYMJbGuYGm35d1tGBWHvVH0 55Cl46t0YToM2661wQPozdsLA1X+FkybBAAGzSS/q99OHd3lEfROitrQA2TB/OcM0BhSsG ftQ1XSb7pCBIz2jX7m0kPFK9ciOwCM71uatGwnBETXKBAm/IbHEg5XuGcfaKNS/7CdDJG0 0zueOr7zKSKUHh52SXRkdccstYdHcbAV6dbyc0tkHCzMpBhR/mpwgZLN5XUNGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKYCg5GPYzpd4; Fri, 27 Dec 2024 17:59:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BRHxB0J032757; Fri, 27 Dec 2024 17:59:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRHxB24032754; Fri, 27 Dec 2024 17:59:11 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:59:11 GMT Message-Id: <202412271759.4BRHxB24032754@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: a653e8317f5a - stable/14 - ntp: Undo upstream (ntp.org) fix for upstream Bug 3851 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a653e8317f5af006ab49a761ce35d3f525ba5abd Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=a653e8317f5af006ab49a761ce35d3f525ba5abd commit a653e8317f5af006ab49a761ce35d3f525ba5abd Author: Cy Schubert AuthorDate: 2024-12-23 22:30:58 +0000 Commit: Cy Schubert CommitDate: 2024-12-27 17:59:03 +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