From nobody Mon May 08 17:34:09 2023 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 4QFT1F2sGKz4B984; Mon, 8 May 2023 17:34:09 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QFT1F2CNbz3p9x; Mon, 8 May 2023 17:34:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683567249; 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=AWiTrdUu7iTIepp9I0IW8fM6o7CwEDHSIGEtRyf6rN8=; b=Fm1hbgWQhT0GryLweFWguGcJNLCkPT6QaAK1M7epjmmqb46Fw/5KJNRKTS1v1yKvT9nIyi lykpnKO9mIE0NemlO0LWvlKJPVSs76BTnCMEwBisd/O5G2qVkPrzYZuvMt/eN1ezWBwSsN fjdpJC7be1qoR0ircxThRs63RUPMGeQPig3Qdju1qymsIM9e5Fe34UrToggUDTH4dQpf2+ gPv1msIxMZdi+Dsnw45dyoqIT+IE4Ykp+zGYBJHxm/eYeiX+IlYpqq6fwG/AHVUnF5MPb1 X9Cp9Tg+EiQ/UBqWmpokFKfR16EKvakET/J3XRZQwL6Pb2C4n4GmCK5zo2Y3yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683567249; 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=AWiTrdUu7iTIepp9I0IW8fM6o7CwEDHSIGEtRyf6rN8=; b=MzYa+F/Chntoc+YjzGZT+bwtqmp6Aetnw2FdpyTDkEewS7yylfLCioQxhh0WkUrN2v8kJL TT70f43YoFabGUcl+kc1bwYhJ8vv03PE15WSLsGMRY1BtIXEGQlx2hghJSrwkJdIr2rjzf QCkWh7ENaAJzPuwgDB2CPvceqpb3D7qHIdijWGHTcEJbPoJUXvYtwvfChCUdTZc8/OFLsU 97jD3HD0AXmMaRGdAct9j3BpCl3TuwIlm4rq0Xhvf8n/fqDTSEeczEhAZhgjB2QJ7GARqm yGJO7Etn8ZJibznm6MQHiqrSxJLEc3mdfFM1uCJw8s72GUJrgG0ZpuKbRCvEYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683567249; a=rsa-sha256; cv=none; b=xMaPnaLRMuETcFWOiz3ynwdU5s7NIHaBZT3jM6TXgWGwATBYmWsGa/mM0M25xDkXqG2PHw 0aMPqYwVFyNSfNQditSBYj1EN17a7Di49hF7yotvnNPD60Ij4ap9EE+Y2mlJQi6ho/QSJx 2iYigCQccF3mbozI/nbGzGxKAlHowFnyG+94k3okaxhfXPzbED2oKuzdDMen2fIOC8Pff+ Ygi3KwOs19Bc8R8vhDgdqPi0V8Kjmfz6ZBwhVW7cnWziIw5IDI6rtEZZdGPe/SnJClC+9T pOGssba/Sr573UC6zXnvNTiRDr/XSEKmw83OJ23s17+z1VyRUXCHRHbgRAsJQQ== 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 4QFT1F1Fncz18Y5; Mon, 8 May 2023 17:34:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 348HY96H058016; Mon, 8 May 2023 17:34:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 348HY9Eg058015; Mon, 8 May 2023 17:34:09 GMT (envelope-from git) Date: Mon, 8 May 2023 17:34:09 GMT Message-Id: <202305081734.348HY9Eg058015@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: d3ee609cf29e - stable/12 - ntpd: Support IPv6-only hosts 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/12 X-Git-Reftype: branch X-Git-Commit: d3ee609cf29eca3abc81db231a2f4afba42f5bb1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=d3ee609cf29eca3abc81db231a2f4afba42f5bb1 commit d3ee609cf29eca3abc81db231a2f4afba42f5bb1 Author: Mina Galic AuthorDate: 2023-05-05 04:33:18 +0000 Commit: Cy Schubert CommitDate: 2023-05-08 04:17:59 +0000 ntpd: Support IPv6-only hosts 0.pool.* returns only IPv4 addresses. 2.pool.* returns both, IPv6 and IPv4 addresses. conservatively extend our IPv4 only pool configuration by adding a second pool, which also returns IPv6 addresses. PR: 270536 Reported by: Lapo Luchini Pull Request: https://github.com/freebsd/freebsd-src/pull/731 Differential Revision: https://reviews.freebsd.org/D39954 (cherry picked from commit fff1551c0357cc43f6138fecfad1d79d8d8baa15) --- usr.sbin/ntp/ntpd/ntp.conf | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/usr.sbin/ntp/ntpd/ntp.conf b/usr.sbin/ntp/ntpd/ntp.conf index ae0a3d0e6cad..3a56ec9f599c 100644 --- a/usr.sbin/ntp/ntpd/ntp.conf +++ b/usr.sbin/ntp/ntpd/ntp.conf @@ -20,24 +20,27 @@ tos minclock 3 maxclock 6 # -# The following pool statement will give you a random set of NTP servers -# geographically close to you. A single pool statement adds multiple -# servers from the pool, according to the tos minclock/maxclock targets. +# The following pool statements will give you a random set of IPv4 and IPv6 +# NTP servers geographically close to you. A single pool statement adds +# multiple servers from the pool, according to the tos minclock/maxclock +# targets. # See http://www.pool.ntp.org/ for details. Note, pool.ntp.org encourages # users with a static IP and good upstream NTP servers to add a server -# to the pool. See http://www.pool.ntp.org/join.html if you are interested. +# to the pool. See http://www.pool.ntp.org/join.html if you are interested. # # The option `iburst' is used for faster initial synchronization. # pool 0.freebsd.pool.ntp.org iburst +pool 2.freebsd.pool.ntp.org iburst # # If you want to pick yourself which country's public NTP server -# you want to sync against, comment out the above pool, uncomment -# the next one, and replace CC with the country's abbreviation. -# Make sure that the hostname resolves to a proper IP address! +# you want to sync against, comment out the above pool statements, +# uncomment the next ones, and replace CC with the country's abbreviation. +# Make sure that the hostnames resolves to a proper IP address! # # pool 0.CC.pool.ntp.org iburst +# pool 2.CC.pool.ntp.org iburst # # To configure a specific server, such as an organization-wide local