From nobody Tue Feb 18 17:12:03 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 4Yy5fq75lZz5ntjH; Tue, 18 Feb 2025 17:12: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yy5fq2rWwz3Cws; Tue, 18 Feb 2025 17:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739898723; 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=O/gyU7b2oloQdrEDAn8x9kyEGKr3Wip6xxxdhjE5N0Q=; b=E4mjRGk9M4SYg5hfGAuauXZWAFvAMPqXJX7nhFagy2njZ8BgEnwxT85J+O+HIswXPsKAop 4aObMTCSK6NEcDWBpycqoDyLJGPC1gOJaU1zvKAzisCDxxEA8YedTFoLplcm8TFX/lkZ3I Qbr1HbdSJLgiI392g5GqhK5jzTgW2K6gEsU0QRzM0GYuTDVlXjtuTxkMdEwF6FBxLtpkHO Z2PL7/uisa0/C4EmGpPT9GQTKIVyKfw8ijN5H17CwOHFj9C6436otO+0q+lh/yaK4mcZXP HGvKzt4NdZfspuckqPbx6NRvTrvA0wm3Lkv4eeniKbCDMmHGYQj6sFKKgqBrjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739898723; a=rsa-sha256; cv=none; b=HPHCEuS7e4CMbecz5/AQMX+HQ+wmFFT+wintDcuYg58O8Lv6jfYod0DiDigKAbwS6sTuBB YN0l8ILu+c35T0w1my78sdu5ZEbl5BuUv87Hnfz9wG36qOwtZftC9YtcpZ1SLYyvQJZxJ/ Hw/J6Zizy+7E+2NZ0pR/6iR1TtZ3vsdjUy3NY2f2dnZUYTp+jsCH8gcNhPyLwuTOMFinEz 8KIG75dd4nQMGg4JViztNl6CJLsxS/ny9i6bHuyYAEi75PyTGYfChdVtfJXCPgTLh3bWSE Sozg38Ba0bk2touzLgTAv2fR+NAQ9r1IWAFTd9YJSXW33NqHNG3AaCn1sOTjrQ== 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=1739898723; 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=O/gyU7b2oloQdrEDAn8x9kyEGKr3Wip6xxxdhjE5N0Q=; b=G9vejBZkbBbYM105CrLI/JieQzyZju13qzUhNIBS56bqpj3VZ5rEFZqHG7oBHBjECl3yiE 8W990nWDAWy6qBbippX6EkyiRwkl0ahGGeJd342nW2O40lJeKNgxOP82SiTgVvtV+GM5Na bjDByqfcO5rXmAdbfUmWLIjx5oi4izMIFIESmZlxptRyAocqbJBvbxs4a4oQNobWv6oUSy +8mzVmrBEUGQzTpVdX2++zia9849kOkKXXqZQ1xFNlXvawmmM7Ww7lLOaW1WJQY/Hp0poS 9u7DQlk4wjvqD5+H+5dNTWWnzusUQMswTMNZ0hKSN0CFDKakn1J1/C/fqBAVvg== 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 4Yy5fq2RmkzCq2; Tue, 18 Feb 2025 17:12: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 51IHC3Gw064709; Tue, 18 Feb 2025 17:12:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51IHC3UV064706; Tue, 18 Feb 2025 17:12:03 GMT (envelope-from git) Date: Tue, 18 Feb 2025 17:12:03 GMT Message-Id: <202502181712.51IHC3UV064706@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: bc02e6558720 - main - ntp: Replace the workaround from 98e34e8e2557 with a patch from upstream 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: bc02e655872021595c434850fbcbdb8dd11d4a46 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=bc02e655872021595c434850fbcbdb8dd11d4a46 commit bc02e655872021595c434850fbcbdb8dd11d4a46 Author: Cy Schubert AuthorDate: 2025-01-31 23:36:59 +0000 Commit: Cy Schubert CommitDate: 2025-02-18 17:11:45 +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. MFC after: 1 month --- 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 0df543c5af04..6a796101b0e8 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 f9605b8feacb..170294c68bb6 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