From nobody Mon Nov 14 08:22:19 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 4N9j3J1sW9z4hRLk; Mon, 14 Nov 2022 08:22:20 +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 4N9j3J15n5z4ZQL; Mon, 14 Nov 2022 08:22:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668414140; 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=5Eaa/lPzyRak1ho04A12ywR31xsg0INCycp5V2wbzI0=; b=dDocdfnaTJYU6rVtMKVCO6tw4DWkrSi+n2LV8Mc5u2aUsrUPdpx0QN4GOoIi6X2tPQoNAZ Uq5QTCoU/Z7NqsFhAggl0M0tdqYNs3FpiI2tQuGZrU2Q8rwbGGzni/FSQMrDeoYF/j1CrN CANKxAeKeEBaEYiT6osT2cxpiQ7ci4eqwTARaSBKwQ3ABGHzFYrr3ha8wT2iipw2vxekm9 QzoJbeSoauR+KHPoxerbz5AqKlg2SYfdYIvDLPC36uSDaP3KePzI04XsidUwJFvvrnICfT lhEOty+qENV3j5NLqTj+22mRqnO9Fn+D+1WX9QPMTh/dy+42DaiCoKcBhz87hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668414140; 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=5Eaa/lPzyRak1ho04A12ywR31xsg0INCycp5V2wbzI0=; b=uItkw9Ske+xHJAcE/dbw13+j4qPvAlz/gQcKPlX8OKRQiNPc8We2gLeq9jxWHSt949ZDns RV15RA7kdTkGlWNAP+bfnyhJzJvPX1zZplimcEHAMJUi45rocM6ubBL5gBC0ruh4p2gu+3 AvICyXSq8X9wVYEKsP1RIeFbfFUUiwZe82EgSdIQs61pZaqyifIkUwzEvLFXiogpMaoj1C ZqghgsSmZesZP+kcDTIptsWCpubX9kAtHUNwf9YvTrTnN2Xkh9X31FZGAi8/V3NkTc/zLW 5n5N/JeXlKAx8TxruL1+AlhNeXaT0LTG4cM84JID1/6pwiQPrI0MPnER+xqIbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668414140; a=rsa-sha256; cv=none; b=xLAWPDWGtiDz3KL211rUyeRouWm8Pi1zR2HWopZvENTlG5uy4y4W4qIcarCdUiXnW5U8zk H8kC1iCsk3KZQTdAVCFAUQw5KloKEVuxGhpUsDfKRII431Xq4BxT65xRfbtXiE6dzbrSfw N6gLAaSyUCyIQbQLFRWDNj+esGvs+V9PgdVQGJTse4UeSm/945Ho7hjv8SY4bMEG16P7xm dKUa4x+5fEOws4h9r1gG1RQYJTpZ0yeHcmfrKHujNoncVhRlbddQp8FoHlPR7kWKZ7uo6m hNDuoD1NOsB/f/m8TU8sJ31jGtDhfhTfZx16yF0qnAwrL41HozGydLqVauBlFg== 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 4N9j3J07LszZsf; Mon, 14 Nov 2022 08:22:20 +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 2AE8MJaJ083694; Mon, 14 Nov 2022 08:22:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AE8MJZh083693; Mon, 14 Nov 2022 08:22:19 GMT (envelope-from git) Date: Mon, 14 Nov 2022 08:22:19 GMT Message-Id: <202211140822.2AE8MJZh083693@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: 6d105d73ca5c - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 6d105d73ca5c6301d4cd5942771082054a9c6df1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=6d105d73ca5c6301d4cd5942771082054a9c6df1 commit 6d105d73ca5c6301d4cd5942771082054a9c6df1 Author: Ceri Davies AuthorDate: 2021-05-25 15:16:24 +0000 Commit: Gordon Bergling CommitDate: 2022-11-14 08:16:46 +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 | 4 ++-- 2 files changed, 8 insertions(+), 6 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 cc439f123442..d5c02599bafb 100644 --- a/share/man/man5/resolver.5 +++ b/share/man/man5/resolver.5 @@ -28,7 +28,7 @@ .\" @(#)resolver.5 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd August 16, 2018 +.Dd May 25, 2021 .Dt RESOLVER 5 .Os .Sh NAME @@ -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