From nobody Thu Mar 20 04:27:03 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 4ZJCGJ4bbkz5rG8S; Thu, 20 Mar 2025 04:27: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCGH720Bz3wn2; Thu, 20 Mar 2025 04:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742444824; 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=82LShVDlTZfsVewy48I/EW1d3MzPzloPAApw7cXM8hY=; b=tEW4mEI6/Bcth0QQXI677crJcDHirBlro+pNWqMREQtKzI9/dlJUe3kL5Bm3AZn8IpykRB xD9v9KWs7AB4OGtMVfcl3V9pJf6FUc5dpKU7qkQU13SZ+T0kk4Fs/IFlu7ynLvrf9Dea4V JFznsELtoyQCez5vK0xQf5x2K0U6KiE0cpUNpC1ej6LN1m8WFYU5aoZxSeie/j1uGyc/QW ZQefT94My+yYC8tFU+C/N1GzejW4VTQToPoQOKr5KWEeavHxYsYw6kw+DRjgpprCQWE2Hw 0HxXpAXL+NoKjTVNwa35CPEKuoEUyMi++5zPkgnv5eXIZKTCxpJ5fFfNzMxpPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742444824; a=rsa-sha256; cv=none; b=L3oD4Npm1sCfkc3KZYPFryGTqjou1JZOPTGGDRvJvaeLz5pDAISG0DuwZmwC0DlQ2kD4+P cErRVV5q8au8fEwE3kN0hi/E+p8CW0kA1Zdy5+ZWnvowmgPmkjwBjJybO4QBSSYq8lZY/U oD2/Jm6imBTntQiwpXRrlPdGTpw5EsXbGFWOxH7fH7e+jEaZWpULFzuIVe3+8AmBhR+9Uy bj2Q3OsgMMaFIFDYRzZV2E+C8F3RTaS4g0wb+Zvb4tLonzxbtB0Je/hVh9YqHIQot+OlXF KbAQBA6j8TieaA68IMLpSfNHOWdrHaMJOPUM4Ay12jlPlk7eik6W6Xxj4SgqFA== 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=1742444824; 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=82LShVDlTZfsVewy48I/EW1d3MzPzloPAApw7cXM8hY=; b=fPxcLfgrkUDzhLkAstNdQwTLpSZX4AhWQOJtsp2crdFqU3Gfajv0adUAVkwswYaAs2Pfra AK2on07/FMy5Atrnc/0npBAsUdpuPI9CTBAGjHw6SKg+VYHbfD+Z011SeVIZQZVADGgpY7 qWp9gbBLEveuXJXE/dz9cJzc9tsIvMMS1K/X2zZx1IXu4ENfS73XtVw0GABhxC/h35XziR LKfQT91euiCLpzRboN9kf7UuDFa/ifi42uq+gJp5xOUJAICQO0g2cu2VkXsYv6z20UxqIZ RkpzRtqcQ0movapN06WLa2SiNl6jDu111Plf2GbRclynlIgdGEV+U6uHhIsYvw== 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 4ZJCGH5Trqzr2Y; Thu, 20 Mar 2025 04:27:03 +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 52K4R37L018821; Thu, 20 Mar 2025 04:27:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4R39c018818; Thu, 20 Mar 2025 04:27:03 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:27:03 GMT Message-Id: <202503200427.52K4R39c018818@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: 4ac2d0f2537c - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 4ac2d0f2537cbc1049d1f58f8b868c2130bd54e2 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=4ac2d0f2537cbc1049d1f58f8b868c2130bd54e2 commit 4ac2d0f2537cbc1049d1f58f8b868c2130bd54e2 Author: Cy Schubert AuthorDate: 2025-01-31 23:36:59 +0000 Commit: Cy Schubert CommitDate: 2025-03-20 04:26:46 +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