From nobody Fri Dec 27 17:59:27 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 4YKYCz2dpSz5j6k4; Fri, 27 Dec 2024 17:59:27 +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 4YKYCz27h2z4Fhc; Fri, 27 Dec 2024 17:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735322367; 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=J1NDAKopjiAsYiaJ5hUKBWhb8vZIB72Ivb1xYWf03vo=; b=movoxCmS91ylJrDNwaKOupjRvOvpNZ1TqnYJwsJaJQmg/IKL55OP3k6obB2LqyrbYFj6K4 vPaJ3TQqVo0WV9MuGJmN3vhBI2zjE0CYyentWHAH+lM8EBmRkMPx2F5YH9wUc8mqTa2BzV NWZGAvpwih9Rw2w5KoBHaLMI7Viik2dCyD7MJsUZJZEHpunpgjYbpIjHK6O+EawlTEOH9y xRG2Lq5988btpTWstWLnkixyQclmB+oZvuvzkDQFXrYrVphmiXF/KmBilC7opHniTNFyp9 DPKn32SnBPgfwTeCm1U8NyI/6TBbW6Q0gSymV1Tun0XK7egMLEV9RSyyqZXeGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735322367; 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=J1NDAKopjiAsYiaJ5hUKBWhb8vZIB72Ivb1xYWf03vo=; b=xz5VegNZ2bVGHZm4bsUnjv6x8nQRJ8yIuG18AIbZT2hnnHwn4IrPRFBg+S1dZ3x8aELgeZ jriLptU2lgiQXnuDVzEvdbDHOPHm31WOM4/RowMIiuV1F5wMoNkyNjEujLUK8ahI4f3ac0 O/gqPYSVsb8RlJDD2rSfStk5Yf/EYVL54iBtJqFhroqMc5c0JHoSCPB0nDCyqUr7TUWzA5 MD3utGcbJrW12aVW4xJ31eLstTxGo8becM4H/KIZFP/+dXtSBb9wvCLnFbpxEWseee5OEL 7Rnnj137COo3effUizmmc//3q7/6djaSDaL2gpDsFt5/4Lk8qLRGUdBFXT4ikA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735322367; a=rsa-sha256; cv=none; b=SsfhiuBDG8yI9x56U1gBwagSJTPLLTh6JN3Gqh5FTyzxC/IzlTlMhm7n6uS0T9MAi/smyz AbhToF+62MX8/Yw3+r16HPTmpNbo4n83WxMZwbpam5q5x3JTTOixxeWtWI7qu4VW2bQWcW 9T3wapN3YOy/rvzTAE4btcDYdhd/nevllIOGf9sHTh36BQ7ti2/QO3tiyUsHjOe6WA04YR Aa8sWdshNX0bECWGiUAK0pZ6pgPK4CebRp2NvmmBdqxVFkOX2xBUV0lnHW4s4nwj4lQohS GlMEErP7fFjHzeLGqahY2oJsP2rbKT8IunDoc6ayKv5LnbOu2xrNlKFJxV9Gqg== 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 4YKYCz1l2Rzpg0; Fri, 27 Dec 2024 17:59:27 +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 4BRHxRcC032962; Fri, 27 Dec 2024 17:59:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRHxRDj032959; Fri, 27 Dec 2024 17:59:27 GMT (envelope-from git) Date: Fri, 27 Dec 2024 17:59:27 GMT Message-Id: <202412271759.4BRHxRDj032959@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: f904025c5d20 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: f904025c5d20fb579a4b1607069ad9697be542fd Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=f904025c5d20fb579a4b1607069ad9697be542fd commit f904025c5d20fb579a4b1607069ad9697be542fd Author: Cy Schubert AuthorDate: 2024-12-23 22:30:58 +0000 Commit: Cy Schubert 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