From nobody Mon Dec 23 22:38:02 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 4YHCbG1tfsz5hXtZ; Mon, 23 Dec 2024 22:38:02 +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 4YHCbG1LZxz4Mdy; Mon, 23 Dec 2024 22:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734993482; 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=i0pRTUJa286uDVoDYRNexXjjlU10VFmAp28U6FrqOhc=; b=jzRKSY8u3MMTRjIcGVVy7GMlmBCOotO5vKGFHEcB3Js0qkDFJKG0scqZf1mUDROM+Kt1kq 5Ooz3a8tmzOVVaXKXs50F91MSB7SBu0i78rRn0lUOPWnPVojwLXtX3G4U2ZbQoWAhwEf/m 1QjY1/a00FP0OK6o9DtunNeeNsabi51uxCABpnIrkfzPlrp9NE9ISeBY/pUy3S+NRarLfw krTcfojrNUvDTGwj24WyeRIwukNiSqcQ5YmYKMPyH3FypNtlGYpXQpBxxzPURBornNoeOn YZYPw6B30x2Pau+1uCetKZN0qI6l0tvcCCBdhQTm94BqOLrVhXzTHuVMH9Lwig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734993482; 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=i0pRTUJa286uDVoDYRNexXjjlU10VFmAp28U6FrqOhc=; b=hCHHJOTHbJNev8PKTP3CdPF8zlwL6PYY75vVzqWt5InnXonkCfBOGo5ZiG0XfoqX6Ac4tG FieI2KYCx6xSSzxs55ZtQDf+nOlK4yfnxCkOERvNq5+Akdck/6Zik9ZZ3XxEhTP65N4TIY p9krLQXyTbskOu19JXYL+mFG2hFLmhtOXiWBY4rcfIqR87SHc6AY3ngkBJas9xcgos/4Bh Bue4ciR6Iu1/C5PnyJPJH8jAXbgsGXb68CLLAtKcbOSN43cUwO6wYC97SG88E0esLc+GyS G7zQanyTVE93PRWXqz0/UjOLtvlaPWkOJSUt25hSSHvk/3LgBP+pEQ04doKOKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734993482; a=rsa-sha256; cv=none; b=L+xJmtNCg1osVv/G+3AHsDqR8OIhmy4Ur/mvqOojvcdf9xge37ysWcHiBzHnRO/MpEoaFG rdbggY3yIq/W1E2D22elDrngpt8uVXmDcG2RmBxVaZMdQUuVBQgyTL6/9lFeF/RdvWTjTp q8guz7GPb7LO17k7sCz6P6wxBeqmAdy4we4xlwHofBCCxSdS4v2HHiHyyILGfsc6sYsSnL XmzY5fSD6cdVfv/NOiEreNF7fGI0NMoJ1dREi5yrI+UaUWyh0EKnYSjgx2ubo0dL37mtOr tiZOMrYmxcWCGkYLn+OG+zcbkuJLvlXiOqbvVqF4KjGUp/W0Q9KtjEon6o3y4g== 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 4YHCbG0xT4z1BKW; Mon, 23 Dec 2024 22:38:02 +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 4BNMc2FC078547; Mon, 23 Dec 2024 22:38:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNMc2M9078544; Mon, 23 Dec 2024 22:38:02 GMT (envelope-from git) Date: Mon, 23 Dec 2024 22:38:02 GMT Message-Id: <202412232238.4BNMc2M9078544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 98e34e8e2557 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 98e34e8e255767e18dd8a6c348cff8bfc01b2662 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=98e34e8e255767e18dd8a6c348cff8bfc01b2662 commit 98e34e8e255767e18dd8a6c348cff8bfc01b2662 Author: Cy Schubert AuthorDate: 2024-12-23 22:30:58 +0000 Commit: Cy Schubert CommitDate: 2024-12-23 22:37:34 +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 MFH: 3 days --- 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