From nobody Tue Feb 18 17:12:04 2025 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 4Yy5fr6xw1z5ntMF; Tue, 18 Feb 2025 17:12:04 +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 4Yy5fr3wZFz3CbD; Tue, 18 Feb 2025 17:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739898724; 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=4ZGQIV4FcU7l23wgtyWTJJwuPe+195DKOujd4B+X81Q=; b=Sff/Wqy9a5iNXufJ0mlr4TrsjgJQ8cVmmjra2s7bDtze88nzEPF3RYNu9Egb1w6NJTi2u/ 7vLFljCQeVtEn0SkzpAhs5yH5/YiG43U8c3tWaFwc6VNHBXmBu4ffdg7NkD63NyrSugTPF tMlETvzk6VQP69gO5DxjkSbEA932CV3JBEy4eaWJw5X3+/gnQF5UZDe0ROedGhuJlK9oPj 71Dz8MBIrEjA3gX9EzzCKs7RHen/5uAL/wYqxiq/iO2bZTZrE1lYMQvbrfvQtB/W4agIJM c5NPZ5WLJ8zNMBWaqlWPEwqa4T2BLpy/J6QqC/ZwbMIdCGjjyH0aY9M5eRYvpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739898724; a=rsa-sha256; cv=none; b=XdhPGy/RSyYbi3lW5/rNPwHMO01N7JT5CGklbHJBLufG8BfOuHipgvvTYBcfzqp10TteXG +UZihJfJ+J+OJxwZpW2Lm7EnUvwr5a3a1Roy84HxNBSDdOg7tggEiiCsNIg6hdnrXZLLFt ijt34uLq9uuTxnd/Rs5EgiIRZRYC0dxJ3QD9MnHjdRQgJnXuLF0ezQ1RBij+ze30K/fDvZ 2l9B+h6L75YCNmwm15k2vM990FoPnce8c6Sqyums+mZHLAU/zFNBu3Gy0bC286WeeHXTdo HBsFI9NteFdS8jOmithjp4neVQrGzbipGgRnEPiGYcQpU6UrN8gD1/kWXUi1ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739898724; 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=4ZGQIV4FcU7l23wgtyWTJJwuPe+195DKOujd4B+X81Q=; b=dpfngjbS/Zx/6C+B0FvL0NreP9jUwVCnXGMD0oLEEqu0pHLrZbccaGLXWQegbfw82A3gCP w0raHCWtKqatdBu+toewsIAMCdg3k3TuFcQHgEZWWS1uNClZKH5lZyth5tY+z04LgOg2qB lwGMoCh7fYh3xXMVgkt4H34fA6ZrDxgC/OmEEGTMq1fPVwUqzBqwbpoxhf5h6n3XMgJYPS b3tTxsTaQXOaXFUNvJk3rFCvKwSthhMMG4lC/WfUUE33lW3GuwqpSbdBjsNp4P2LR3p+Yj aJF2NlMM/BOUMgg5zGe+yloBOR4EzZDtAGEnxl5UVqpQeQ2TOmeM/YVJ1hDSMA== 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 4Yy5fr3QfvzCgR; Tue, 18 Feb 2025 17:12:04 +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 51IHC47M064747; Tue, 18 Feb 2025 17:12:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51IHC4FY064742; Tue, 18 Feb 2025 17:12:04 GMT (envelope-from git) Date: Tue, 18 Feb 2025 17:12:04 GMT Message-Id: <202502181712.51IHC4FY064742@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: c1767cf87cb6 - main - ntp: Another patch to address IPv6 pool regression 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: c1767cf87cb64c25426fd7fe119be283b134509a Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=c1767cf87cb64c25426fd7fe119be283b134509a commit c1767cf87cb64c25426fd7fe119be283b134509a Author: Cy Schubert AuthorDate: 2025-02-03 23:16:08 +0000 Commit: Cy Schubert CommitDate: 2025-02-18 17:11:45 +0000 ntp: Another patch to address IPv6 pool regression 98e34e8e2557 circumvented an upstream patch which caused an IPv6 pool regression. This patch, discussed in https://bugs.ntp.org/show_bug.cgi?id=3958, addresses another unworkable combination of link-local local address with non-link-local server. MFC after: 1 month --- contrib/ntp/ntpd/ntp_proto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/ntp/ntpd/ntp_proto.c b/contrib/ntp/ntpd/ntp_proto.c index 170294c68bb6..2e0d221c8472 100644 --- a/contrib/ntp/ntpd/ntp_proto.c +++ b/contrib/ntp/ntpd/ntp_proto.c @@ -474,7 +474,7 @@ transmit( /* [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) - || !nonlocal_v4_addr_up) { + || (IS_IPV4(&peer->srcadr) && !nonlocal_v4_addr_up)) { unpeer(peer); return; }