From nobody Fri May 05 04:39:13 2023 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 4QCHyT6Bkgz49VnC; Fri, 5 May 2023 04:39:13 +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 4QCHyT4XC4z3q5S; Fri, 5 May 2023 04:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683261553; 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=PRrQlKl5sJZAgaptLVotKT91ctYLiiicY5cVhmKU6M4=; b=XvQkp9wERWSO/EWf0YN16dCo2rQG/iL+O2s3r0uiUtBbVshC4hmEevUyUR9b29CMY0Ajnp QoOYCxkDjOe+k2v9iHGgTH0XpeJS93v1oh1UIqoxv0AE+mMCeTzi316ttVggJBKVFG5kOd d40B5oUiS/h23wp2RgB63xC4G2obwpw3yhXXdgPBUMhKxKhDlFa4f4/KQOpwxp0Nb8r3Ia E/dIzHGopP1rOeLcSkweW3ASE9gPQ6eJ36n/Rv4lePtXNVV0dyRIGJTfKUSmcgIV8/npky eV+WamVIRL6B9aKw5I/U44upsCfueRC2RmNooMW741mQJkIrt38vl4g5Lu5Wag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683261553; 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=PRrQlKl5sJZAgaptLVotKT91ctYLiiicY5cVhmKU6M4=; b=c0fpRcQC87ZQtnrcEhZuCeke50OOjgq/hDOrpGrhsPAJimW4ERz5RE6sb95woX2O/iNfP0 V/21W3alUGfxpReaN0pe7riKb0+sipI+C3WAuT1lbEuITqmOQC61Vqj0C8J8sGvR9u9AI+ vzrzJViRYpc6plA6FUSTImIUfFE0B+MQgEEB6djZ77uTin8I9JKWFMOKlsHgHYnc9uLXNh aQEHYkb4FMbsgaC8HH9YzK0aDCCVuzfPQX8gL2wvjnjrR538V2kwrBDbukH6PhywuySq1l Dd4MO2H70xou5OF9EJsoAmS7ODLnJeuyildaCrLs84rG/ovbiyzkBG/6TBFRjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683261553; a=rsa-sha256; cv=none; b=VptVnbwfxbDSOgxtKUd+maAWuFYhZsBdgghzJuRoxttY2PRfDbowxENkgw+xeZUtZSsXuH gxY0onl3UltwZqP6+3HYlfRgjOE+2+DnRhE7R0Gz0LBgb8emImPMl1U8lnfef6TE7EpWVS wy41Nnl7vakSarqijSGJl0RV2y1X/2itwtjGdfOsaIOfhMaqY5E99pyPX4vPHo6kgjDHgZ KVJp+aqWqJJaomzWeFvalmNyK/sTPkWGi5YVbOG7mkvYDJ9D3WvutlsvAfOhQfb6jo9x/V zQiuNJcYf8k9VBkrN4gM3aS2IQmMZtjqnaqmm2WGivhLxQQYC0WF9EmZLRVqJg== 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 4QCHyT3FqzzgRZ; Fri, 5 May 2023 04:39:13 +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 3454dDxK041360; Fri, 5 May 2023 04:39:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3454dDvB041359; Fri, 5 May 2023 04:39:13 GMT (envelope-from git) Date: Fri, 5 May 2023 04:39:13 GMT Message-Id: <202305050439.3454dDvB041359@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: fff1551c0357 - main - ntpd: Support IPv6-only hosts 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: fff1551c0357cc43f6138fecfad1d79d8d8baa15 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=fff1551c0357cc43f6138fecfad1d79d8d8baa15 commit fff1551c0357cc43f6138fecfad1d79d8d8baa15 Author: Mina Galic AuthorDate: 2023-05-05 04:33:18 +0000 Commit: Cy Schubert CommitDate: 2023-05-05 04:37:02 +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 MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/731 Differential Revision: https://reviews.freebsd.org/D39954 --- 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