From nobody Sat Sep 24 08:30:53 2022 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 4MZMfj4Pqzz4cpMc; Sat, 24 Sep 2022 08:30:53 +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 4MZMfj3zsfz3hmN; Sat, 24 Sep 2022 08:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664008253; 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=vGLYuDxIYlVRpP1JgHTS2xUYzRxlQFLfedCQgvuNjTo=; b=EJGqFRbo/8ouaduVBK1WHkbTa9Cnsj1ApPo1wililc55RnZvBBeWDG4Qj13dT0t59dQQnQ 9B7419ebAxARo+p7xLlD8srjEg1JZqLrLYIS1Emb4Ss1ttnJ+de8AZQEN4OH+Me9LGbMgp c0ss6J+yFJOGxuhxJ/fBBtbp/eq5WyBP+aT48DUnikXg0q5fuBL1Gp50MBMqDPXQNB8hgl wPnhWrPngFI/zQ7MZyvrxAA3reCeuG1YdtyYmbRjF1lWNLI13/Z7LFwIhZfbpi9Vg3CtKL 1S8yBA8K8YI6+VoIzfKDPAJug9CO5h44JtYlwpEa5y9DDQZvHMn4KRN7zODhrQ== 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 4MZMfj35Y8z127v; Sat, 24 Sep 2022 08:30:53 +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 28O8Ur3K049823; Sat, 24 Sep 2022 08:30:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28O8UrjI049822; Sat, 24 Sep 2022 08:30:53 GMT (envelope-from git) Date: Sat, 24 Sep 2022 08:30:53 GMT Message-Id: <202209240830.28O8UrjI049822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 2b1bb1d4a66d - stable/13 - man5/{hosts,resolver}.5: note that IPv6 addresses are allowed. 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: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2b1bb1d4a66d6d791ebbbe05cfad7c49646daa22 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664008253; 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=vGLYuDxIYlVRpP1JgHTS2xUYzRxlQFLfedCQgvuNjTo=; b=V192EWvKZgxTM1OPPXJiuWbeItloIyyyOSAuo/WmQT3e3Tn+jytDi5GYQBj4TjRYjv4pCA g3Eue6SZHDNEfS4SV5P2l+lHtp3br2MilNwIKxS51If7A687nf/sl9grucmYj0p8k0RR52 wjt8u+EwwwiKOr9um8y5ehOR6JKuP1ywRCluPvn87NW24XwSL9sLuNR/wldZw84QjtWTWi q3oYAl81DVb6bGiHQ4SG/pP4K0v2eVcs77DE14K561GQ6fewlN3gdbI1I5Wm+OHe5kRUYz O7luB7x8lgpekrMvZHr6nlghAqJvyGpRsVjhBQtcCdIwAJdQPLlJT9XF6azeFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664008253; a=rsa-sha256; cv=none; b=jNaBy/jnKSaB3QfJP2i/cCYY3wovjl4jwsY9R50XWUMQfom6RBMoR52K6uMCQYioTuaV81 8vU2FyciU1MYwEi3djZqCdi2gPj6cNxr/tPguRtdUipr4V8g5izk5yPowYpgnJTsR8PA5K NK3HCjjL2ch3WaBBV7xJOcDzdpT7TSAhKG4zQQDCDASVywWngRR+7TjFvr+Yrr7D4H2p2F lbVH4cMYf5wMJlUZQ5f8t3wbPxZLaTd/hTqzxU8pKD9U5D7GxyH33IxpJ7Q7z4DwbPiV4q rzqs/HHhnlZNQnvRomzduDrd6Myk/S21+SPrl3LzjoZHUCztAp8B5gBdZASK+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=2b1bb1d4a66d6d791ebbbe05cfad7c49646daa22 commit 2b1bb1d4a66d6d791ebbbe05cfad7c49646daa22 Author: Ceri Davies AuthorDate: 2021-05-25 15:16:24 +0000 Commit: Gordon Bergling CommitDate: 2022-09-24 08:30:24 +0000 man5/{hosts,resolver}.5: note that IPv6 addresses are allowed. The patch in the PR largely no longer applied due to age, but thanks to Evgeniy Khramtsov for the patches in the PR. PR: 120024 Reported by: bcran Approved by: blackend (mentor) Obtained from: Evgeniy Khramtsov (partly) (cherry picked from commit a23b08cf98d92ff82adeebc84673e9bd3cd0a6da) --- share/man/man5/hosts.5 | 10 ++++++---- share/man/man5/resolver.5 | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/share/man/man5/hosts.5 b/share/man/man5/hosts.5 index d80c544b3644..ca7586f039b7 100644 --- a/share/man/man5/hosts.5 +++ b/share/man/man5/hosts.5 @@ -28,7 +28,7 @@ .\" @(#)hosts.5 8.2 (Berkeley) 12/11/93 .\" $FreeBSD$ .\" -.Dd December 25, 2013 +.Dd May 25, 2021 .Dt HOSTS 5 .Os .Sh NAME @@ -64,9 +64,10 @@ These include addresses for the local interfaces that .Xr ifconfig 8 needs at boot time and a few machines on the local network. .Pp -Network addresses are specified in the conventional -``.'' (dot) notation using the -.Xr inet_addr 3 +Network addresses are specified in either the conventional +``.'' (dot) notation for IPv4 or colon hexadecimal notation for IPv6, +as understood by the +.Xr inet_pton 3 routine from the Internet address manipulation library, .Xr inet 3 . @@ -83,6 +84,7 @@ file resides in .El .Sh SEE ALSO .Xr gethostbyname 3 , +.Xr inet 3 , .Xr nsswitch.conf 5 , .Xr ifconfig 8 .Rs diff --git a/share/man/man5/resolver.5 b/share/man/man5/resolver.5 index 21e1f8f99131..468c635839c6 100644 --- a/share/man/man5/resolver.5 +++ b/share/man/man5/resolver.5 @@ -54,7 +54,7 @@ and the domain search path is constructed from the domain name. The different configuration options are: .Bl -tag -width nameserver .It Sy nameserver -Internet address (in dot notation) of a name server +IPv4 or IPv6 address of a name server that the resolver should query. Up to .Dv MAXNS