From nobody Thu Mar 20 04:27:02 2025 X-Original-To: dev-commits-src-branches@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 4ZJCGH03zwz5rG6S; Thu, 20 Mar 2025 04:27:03 +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 4ZJCGG5Ntwz3whD; Thu, 20 Mar 2025 04:27:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742444822; 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=yaCeMxENHdya3ajG6zX5cRg0AQrjmPas6iVkMHtGIyo=; b=K0VJJqucZhpMEQf5xihJfOZakT8obXB2/VVfcgYBHOaDtEJN+HOXo08lNN5bsLJwNTIVGC NM1s7kci9uNw62CoGuSdCauXAqYJD2EtocH5F/oFszc+ac112UC6U4TumRVYOf4N6GRa3q 9RKdRM/R9ESdPCE1ERjOKK6iCm9oq2lvUkLhZFH03m6Cqe7tamtInLNVFSlMWBQE/uDE9H NH+PQaksBIz1NJBy9lCq+q9eaCJkunEbnLRaxXgK8NQ6ZYjfU7Ipj74CKskeyngj+uGk2n dQLrC+P/aABl3FktQjMYuU79dnwIWRuyTZDCNChYhHds2GshJ67tMBAIKWBpVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742444822; a=rsa-sha256; cv=none; b=cOh1fSK0mpzZxGrtungLhleSgzl+YtY6uz45t6XR51EtXy40DVtXBgMWF44Bz0ctd7R0u3 yRkXvHVEOj5RkoctVxgmYO5S4nVr1WTEHPjHklZ+iJGre9vLev07BBmi1cP8B2XI7hXDbi Sp0m1+OYzQPiVLuHCCxsnQk3IeDDf13QNsg8RBXaU74YWkzTts8J8p/2N66i+YIpX7F2x6 hsaF3rkSHNsnIuv+xO4uhYPMRCx/BAaubFZEfHqH+vy+LRgcya0rX6QWAVl89MrOaLoXTl EJbb0Qq/9WR5zJ1NJEWZn/tG5RPzzunU+1bEX9l+7nrpwn7UNiIzNbwsbNJulQ== 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=1742444822; 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=yaCeMxENHdya3ajG6zX5cRg0AQrjmPas6iVkMHtGIyo=; b=iEBvFtI5CUrOAsaQScjUo+YlxHJEuV35o9Gpxs8wDrmAVNMGcDE9hSGD3SIOGInQjpiRT7 oiYo4/BDM4Cgvs5DaBNDZFm75wOVMDzaMJfgfazczzzz+FWGIK/1IOzFC8v7T7Lyq0aIaU +SFNlpwqJDNDKHKkWVRFefKAjVgAKEzsD8EJBkqBOiXFaYVAwbp/sBzTzTkOC8rPz4bty5 0yXdwO/WypQjVTI/8+wMkjMUUINs98VO/d+HBRKTXvlYAXqF87NVf8BdDSwrh736WBhAre YiDz55zbP5tq6mtGqDkWAvKDi34f2pjSO/ofwRBBM1eTDa0LBakyQPM/D2KfuQ== 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 4ZJCGG4RWjzr1Y; Thu, 20 Mar 2025 04:27: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 52K4R29w018782; Thu, 20 Mar 2025 04:27:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4R2oA018779; Thu, 20 Mar 2025 04:27:02 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:27:02 GMT Message-Id: <202503200427.52K4R2oA018779@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: 61e5e864ca19 - stable/14 - ntp: Another patch to address IPv6 pool regression List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 61e5e864ca19a1a6cfef859cbaf1ae6795ca0bed Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=61e5e864ca19a1a6cfef859cbaf1ae6795ca0bed commit 61e5e864ca19a1a6cfef859cbaf1ae6795ca0bed Author: Cy Schubert AuthorDate: 2025-02-03 23:16:08 +0000 Commit: Cy Schubert CommitDate: 2025-03-20 04:26: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. (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; }