From nobody Thu Mar 20 04:27:18 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 4ZJCGc4R4Vz5rG2L; Thu, 20 Mar 2025 04:27:20 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCGb5Ts0z3x95; Thu, 20 Mar 2025 04:27:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742444839; 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=Sbl6Uast2uI2TiJg/WgrGFz4DlFSGUjhal7SzBpC8i8=; b=VNKxp2HYUn3ad1Xue/m9IUHHzwxQAetlzU6BbhkO/9inY575KHpembwpHl5MocPLrGi7aQ qbarcMpi2Fei6dM2n5oBzrPm6vfMWd6s76l63IIVHrvGVuGv4XklJfL/IvumjJDB7IP4tH PiqomtI7EUV7rDNVd9tOfPRwawikq/nfKNtCBoqgmVaQWACP+ADNzGUdb4WTL9e1ybWjzY cmTSLzVVDmzyAaZLlG+/ICUH/1gzBEtBdJ1VRNu/KGrhkqwDxr7/d2g88K8s4kNS/andkx X7JSV40CY7nZn3mwM5k4Q6xa3jFdK8qUSo4ERpzrY0zoSafdxv3lkfWDnlZM4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742444839; a=rsa-sha256; cv=none; b=elc2vIuGAmVDf0z17O9ox+sl32g3RNi8gSmw11RoAlX1xAoQ6H6J2fATlspB7DGtb7eeaV 91DFp8/EBp87m1hlX4TXo9VH8zLMg1N9chPM1tXXKcQLpSPaaye8CpE2HP/xwmNOEoSgb6 j0vdQF0zB9n1AFlz/vnAewlTReU+BTdpxMP4uL8xUnu8rrlJzRmKAMofiKqCpNXOZG4gUe gCokGR3Z50qRIUSARgVewfQAmVSzZhzzy5njQE1v4rw9kDpEI6EJ/gEvhLOUr61J4yiKJh IRpp+XVJnXhveW7LijdOYGT/CqOA01ePliQTpmXvHiLvwh48ZhNCRxUlLqiHjw== 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=1742444839; 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=Sbl6Uast2uI2TiJg/WgrGFz4DlFSGUjhal7SzBpC8i8=; b=do6NhcSYEIbmWe4w3lRcLIcNEHL9pMf2g1I/CNHV1H2KNx+KklhIMhhmmbHAemtz1Zfv2l JFJ7cpxp5c4u217gA58dwdxxckopXtY1EVTFH9w/5kYMBICCC+9cvzo5XCC5G4kLTnm6sZ mNja/o23KgncwXdVQ7t4zwCFSzmut+NgEYxuSo5PS8bIFqYSOBSwMwOM9pRMTdNFm0iqYe oi/NlAttA1rVSSmJMrcQdfjdsuCi+q2F4/xmOjvFF5AAOG+klaUBqn7vyKU4I95nSNYoSl bcOOTkQrj3SyLL910ZfVVEbMmIDXS+v66H+soBMDPh2KwyMe+Ech5pFy2glVvg== 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 4ZJCGZ66qRzqnR; Thu, 20 Mar 2025 04:27:18 +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 52K4RIED019043; Thu, 20 Mar 2025 04:27:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4RIhW019040; Thu, 20 Mar 2025 04:27:18 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:27:18 GMT Message-Id: <202503200427.52K4RIhW019040@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: 9d425f11f9ff - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 9d425f11f9ff9be2dc604d0bcaeb8f2c74c0aca5 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=9d425f11f9ff9be2dc604d0bcaeb8f2c74c0aca5 commit 9d425f11f9ff9be2dc604d0bcaeb8f2c74c0aca5 Author: Cy Schubert AuthorDate: 2025-02-03 23:16:08 +0000 Commit: Cy Schubert CommitDate: 2025-03-20 03:10:29 +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. (cherry picked from commit c1767cf87cb64c25426fd7fe119be283b134509a) --- 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 f9605b8feacb..6b875145802f 100644 --- a/contrib/ntp/ntpd/ntp_proto.c +++ b/contrib/ntp/ntpd/ntp_proto.c @@ -475,7 +475,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; }