From nobody Sat Dec 3 16:01:51 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 4NPZLm1sv1z4jjgy; Sat, 3 Dec 2022 16:01:52 +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 4NPZLm1J1gz3tRP; Sat, 3 Dec 2022 16:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670083312; 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=Bg1xAWkFJssWZ2WyQ3pbDF6ESBrmOFkQiL2znDxIIjE=; b=YXausvJjp03HGspo+oJMIYcXE7udVAgldogAvJn4yscpJIzd01j83ycheCXjnp6UbPncRk nHjKDxyZaPcKKg/RJmloKnP+RxmbY23MUu+1H6ByJl+sOir7bm/NaZ4u/8vAVKSYph/kKj 4D1vS91oEGIlGpv8v7CFSso/xnZf9Eizr9JptekquEnWmEEnxz2mOZFd2gWUfCRD92fglg ikEc3/Fged5rHOEIWIq6LxwJXGf4iQovpqWhBbkB1NoWGPdbOI8Id8Jon4NLRQU2CApw3+ OaTLZQaBNEKfHW1Mo+EAXBBLWGqdVho7EbbTpFC7z/hsAvgNIBbspWpLlACG3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670083312; 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=Bg1xAWkFJssWZ2WyQ3pbDF6ESBrmOFkQiL2znDxIIjE=; b=gzw5W9pIdHafVq1pdL4OX7n+Dbt0P9zG/aQPAQ+7RJuh+RcLiwVWc8qkyfhCUOm8ZnLeB3 VNhNlj2pj8e8HcYBhZ+Ga+PY6FD4ecdP3J6vqZhhpVs3N1LOkokYwNGmdrCipRDrkqQznC hcyRytiekovBsjCULHJJ4gpv/RmFvH+3rambALbzJt4H2bLImc85Fy1U4yNNRgxaZ5JDPZ ZBbbMnffMQBWhDq93C+4JKg9PuAc5M4ZLjMRJd1wMX5KyHSbk6luone2L0Dz03F94quvZI gh0hcdHGgR/RlX1j38Oi6ARqPyuAaBwPPSjhI2dY3jby6vwEXjRMQbcNtV8u6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670083312; a=rsa-sha256; cv=none; b=cXNgx79g4AzXvlxamSBOAtpGIyhpbLste8RbfU6ZGiLlBiK/7FY1NvhcvGvQGZZVfxB+HD XBKDI4BmwBna6h/IuhYWYREEthwWrCvWXXSs8Xc54httYlk9ltjK6erYVS7uOiwKLJqyBZ AvJh78BUttHp2SGb3J1tHfkkzBpQTwxCSdfeZHQJ7GO7O4A1bGY6TE867Nzy+3IIo0yy3b op9gpWcDz6EDOnuLZQDwwTEjey7kxKjVu0Q5nY703QHmbYJSfdFIeZL++TyvxBu4jQBAsX xbmy+WzxGjBJ+O6VZWcSEttsyXXKA9U5cXlGcZPSDXpKKeqn/kVvulyLwxVHLQ== 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 4NPZLm0Plyz11Z3; Sat, 3 Dec 2022 16:01:52 +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 2B3G1pM1007886; Sat, 3 Dec 2022 16:01:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B3G1pmG007885; Sat, 3 Dec 2022 16:01:51 GMT (envelope-from git) Date: Sat, 3 Dec 2022 16:01:51 GMT Message-Id: <202212031601.2B3G1pmG007885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: a467b5003320 - stable/13 - gai_strerror.[c3]: re-enable EAI_ADDRFAMILY, EAI_NODATA 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: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a467b5003320b53ff153c91f8dccdf40f29e6181 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=a467b5003320b53ff153c91f8dccdf40f29e6181 commit a467b5003320b53ff153c91f8dccdf40f29e6181 Author: Mike Karels AuthorDate: 2022-11-02 15:55:32 +0000 Commit: Mike Karels CommitDate: 2022-12-03 15:16:24 +0000 gai_strerror.[c3]: re-enable EAI_ADDRFAMILY, EAI_NODATA gai_strerror.c still has messages for EAI_ADDRFAMILY and EAI_NODATA, but not the man page. Re-add to the man page, and update comments in the source. Document the errors that are not in RFC 3493 or POSIX. Reviewed in https://reviews.freebsd.org/D37139 with related changes. Reviewed by: bz, pauamma (cherry picked from commit e34adc71d3724a8b1add483310efbc63db9290a6) --- lib/libc/net/gai_strerror.3 | 17 ++++++++++++++--- lib/libc/net/gai_strerror.c | 10 ++++++---- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/lib/libc/net/gai_strerror.3 b/lib/libc/net/gai_strerror.3 index d948083447db..2653fc6d371a 100644 --- a/lib/libc/net/gai_strerror.3 +++ b/lib/libc/net/gai_strerror.3 @@ -18,7 +18,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 23, 2018 +.Dd November 2, 2022 .Dt GAI_STRERROR 3 .Os .Sh NAME @@ -42,7 +42,9 @@ or The following error codes and their meaning are defined in .In netdb.h : .Pp -.Bl -tag -width ".Dv EAI_BADFLAGS" -offset indent -compact +.Bl -tag -width ".Dv EAI_ADDRFAMILY" -offset indent -compact +.It Dv EAI_ADDRFAMILY +Address family for hostname not supported .It Dv EAI_AGAIN Name could not be resolved at this time .It Dv EAI_BADFLAGS @@ -56,6 +58,8 @@ Non-recoverable failure in name resolution Address family was not recognized .It Dv EAI_MEMORY Memory allocation failure +.It Dv EAI_NODATA +No address associated with hostname .It Dv EAI_NONAME Name does not resolve .It Dv EAI_OVERFLOW @@ -83,7 +87,14 @@ is out of range, an implementation-specific error message string is returned. .Xr getaddrinfo 3 , .Xr getnameinfo 3 .Sh STANDARDS -.Bl -tag -width ".It RFC 2743" +.Bl -tag -width ".It RFC 3493" .It RFC 3493 Basic Socket Interface Extensions for IPv6 .El +.Pp +EAI_ADDRFAMILY and EAI_NODATA were in previous RFCs, but not in RFC 3493. +They are not in POSIX (IEEE Std 1003.1-2017). +They were in +.Fx +before 5.2, and were re-added for 14.0. +EAI_BADHINTS, EAI_OVERFLOW, and EAI_PROTOCOL are not in RFC 3493 or POSIX. diff --git a/lib/libc/net/gai_strerror.c b/lib/libc/net/gai_strerror.c index f168c3093735..276ba91b95fd 100644 --- a/lib/libc/net/gai_strerror.c +++ b/lib/libc/net/gai_strerror.c @@ -44,17 +44,19 @@ __FBSDID("$FreeBSD$"); #endif #include "un-namespace.h" -/* Entries EAI_ADDRFAMILY (1) and EAI_NODATA (7) are obsoleted, but left */ -/* for backwards compatibility with userland code prior to RFC2553bis-02 */ +/* + * Entries EAI_ADDRFAMILY (1) and EAI_NODATA (7) were omitted from RFC 3493, + * but are or may be used as extensions or in old code. + */ static const char *ai_errlist[] = { "Success", /* 0 */ - "Address family for hostname not supported", /* 1: Obsolete */ + "Address family for hostname not supported", /* EAI_ADDRFAMILY */ "Name could not be resolved at this time", /* EAI_AGAIN */ "Flags parameter had an invalid value", /* EAI_BADFLAGS */ "Non-recoverable failure in name resolution", /* EAI_FAIL */ "Address family not recognized", /* EAI_FAMILY */ "Memory allocation failure", /* EAI_MEMORY */ - "No address associated with hostname", /* 7: Obsolete*/ + "No address associated with hostname", /* EAI_NODATA*/ "Name does not resolve", /* EAI_NONAME */ "Service was not recognized for socket type", /* EAI_SERVICE */ "Intended socket type was not recognized", /* EAI_SOCKTYPE */