From nobody Thu Mar 20 04:27:19 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 4ZJCGc4R3mz5rFn3; 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 4ZJCGc0ydYz3xFp; Thu, 20 Mar 2025 04:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742444840; 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=jeVxuh6lsBYwgE0Q+t+mGc8l2Z9nW2ptU9NZ3MwB+cI=; b=tSxcvpwwpvK6kqguoIRu9aczONw5aPwhuu4hjOzyXBc/tSmXzz9vmiwshzMDA2cgLlA1Y7 OV4ErBlJQ+LbKSD3mpEE78znHlvHSJ6MvPDISO7n4VE3UMeOcisk5pgrQbYjHWbsZNQeDx zouPGkM3FVPeW9tIEqYVzY75GEPHJ9SLywefr1e74+QmxGIxOwWCR8QnuK+FBcz+dGQgjI xT0RQ484laWRGeyzJ8bh6OkusvH16+qlvvS5EpdP3oc8nD+Z1Xn1ZhawzaGDhijnUnTEbA 8F6SY+btCjpAX3A79k0F27DYG+m0JN6KdzaQrfTnuNiL1q+J6vGfTuex4bCJ4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742444840; a=rsa-sha256; cv=none; b=DM91zvsnjm5BrMztGizb8kQbqIXYfZLcKoIqUZmAweOvv28+MLEnJ0fbPpcGH10dIqZ+UM LaUjzh/5WmW6pwR9fp1DIc4Dbqavb8WrTjKzbobviEXp9GNEHvXzvy/IdIcWcp5bZu9wQC 8aEsqpiacIk2MmY79tcHshO836fDLNfUv/A7yuKaSdYS2rAEJLU5kEz5+XH1yMQlMTzkfB XNo/GH88K/91N0xM0lHTKZV72GA38XYdZsDU5XP6aGgJMgKTVdr6Nn/XuIv95vfSuyQxc1 X93jYLNUaeqllcqIcvOHfFEMEQLBe2vRIFpEosOTZ+/1H0CaoSDNa1XeqBv/mg== 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=1742444840; 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=jeVxuh6lsBYwgE0Q+t+mGc8l2Z9nW2ptU9NZ3MwB+cI=; b=jO5mkOsfGMcy6tVHgv6bh0HG5IKJUZLul0Rq6G2qdH9U33TmgROPkcsMhS6tD0qf7DEcAK 2d1AZvlQhLv502Lfl7kc5pzUfEsjpNwfIIkumQK4WUypmXR35pI4aTnVwNSbgtu4bkgKNx Bewmk7VM6kfYmfhlhzeoPCL9O60pNlE9bt659X8ev6ckfzaXxh0pVUbBUAXTmyROMI+8UP sxDU9cH0bpjkZVS+38hlVimG6iGPQGTaARJ6Juru5Z2+o0BIwfvqVTt+Kkcc4B+9EwFjMZ 3IBtJcry0+3q1pIDmj9cLFeS+lzVOpeBtrT2FGmyaWAeJbhgxUL4MzIXAV3NHg== 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 4ZJCGb5xlqzqKy; Thu, 20 Mar 2025 04:27:19 +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 52K4RJJj019076; Thu, 20 Mar 2025 04:27:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4RJmL019073; Thu, 20 Mar 2025 04:27:19 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:27:19 GMT Message-Id: <202503200427.52K4RJmL019073@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: dd503d7b4ce7 - stable/13 - ntp: Replace the workaround from 98e34e8e2557 with a patch from upstream 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/13 X-Git-Reftype: branch X-Git-Commit: dd503d7b4ce735335fefeef006259204467f27d1 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=dd503d7b4ce735335fefeef006259204467f27d1 commit dd503d7b4ce735335fefeef006259204467f27d1 Author: Cy Schubert AuthorDate: 2025-01-31 23:36:59 +0000 Commit: Cy Schubert CommitDate: 2025-03-20 03:10:43 +0000 ntp: Replace the workaround from 98e34e8e2557 with a patch from upstream 98e34e8e2557 circumvented an upstream patch which caused an IPv6 pool regresson. This patch removes the circumvention and replaces it with an upstream patch planned for the new release of ntp. (cherry picked from commit bc02e655872021595c434850fbcbdb8dd11d4a46) --- contrib/ntp/ntpd/ntp_io.c | 4 +--- contrib/ntp/ntpd/ntp_proto.c | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/contrib/ntp/ntpd/ntp_io.c b/contrib/ntp/ntpd/ntp_io.c index 69fae606f5c7..9c4f6c1553e3 100644 --- a/contrib/ntp/ntpd/ntp_io.c +++ b/contrib/ntp/ntpd/ntp_io.c @@ -1486,9 +1486,7 @@ is_linklocal( if (IS_IPV6(psau)) { p6addr = &psau->sa6.sin6_addr; - if ( IN6_IS_ADDR_LINKLOCAL(p6addr) - || IN6_IS_ADDR_SITELOCAL(p6addr)) { - + if (IN6_IS_ADDR_LINKLOCAL(p6addr)) { return TRUE; } } else if (IS_IPV4(psau)) { diff --git a/contrib/ntp/ntpd/ntp_proto.c b/contrib/ntp/ntpd/ntp_proto.c index 6b875145802f..2e0d221c8472 100644 --- a/contrib/ntp/ntpd/ntp_proto.c +++ b/contrib/ntp/ntpd/ntp_proto.c @@ -471,7 +471,6 @@ 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) @@ -480,7 +479,6 @@ transmit( return; } } -#endif /* * In unicast modes the dance is much more intricate. It is