From nobody Sat Dec 03 16:01:54 2022 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 4NPZLp48mwz4jjVq; Sat, 3 Dec 2022 16:01:54 +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 4NPZLp3LCTz3tb6; Sat, 3 Dec 2022 16:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670083314; 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=DBOGrJtaueow5zgcCpETyMCGE/fqRaIZVGEem5Fnzg8=; b=xZIhH5n+JIRx/Ihd88cxZCIwrdXSOLjW+FEVhQx33mwqnkM2+4OOazBbhwMxfDhzevD3W9 J3z2HLN1cJzqb7ohHZ9lx6RHGypCWZ9/CVrgnSnIpmFgyKQfF+K36VGsn/1xvTUQMmwKNK yr7plyZWG5hgy6c/NnZfkT7ELOIq2IBytxa8yQ2d83XF+9iy8Ob4jiOkMzYERFyBNOCDCZ aXVUiqBTDPJd56qUN7EJAoJ7km0HHF6GYpl/EMKieAbG5FKvA5m+BDb98Gx77Sv0YqtLqM Eys7bN4YWcF11THjKOYu0xzwjyYgu7FAQVmzJIumaFKxZqZDNGGt0/W+xh6xyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670083314; 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=DBOGrJtaueow5zgcCpETyMCGE/fqRaIZVGEem5Fnzg8=; b=oSumAh6B+n1UVWPAGHf9GF7OIapFNQbqeZReyEwIBwtVqcJEakjPPjdpmqLnIiOzpfMPNX rq6biAUQmhzJEKfk6Ggp6yAAaW/2nKermJ59L1zyEvLnLq+BPonbb+T8sHEWlf28iGN/Ep ANv6l5JehS+NN53iNC6jI++2g+tK/xWKGScrVX1WgY95+oGr/hLJo5UC4zTIwue+65g/jp dSXeRd997yzC2fG42/Z05saCYI70FMeCC+2OQJcJADWkdMdoarSgB4wo75Fm+ZXs/V6AqQ L9/7vPOhR6Nu+o6r0WiaRDqpeZaWmffzWoivtOzTbhEQoel6N+SmwUHO1e5jrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670083314; a=rsa-sha256; cv=none; b=fJ7KECnDwNdn6mFd4AdudyoWCgS1XoAL2ZMiB32fL00gGt149tgqDx6ZD5c/OkFCG82edn MfIJjFgERwy5MVYlRh1zYVNZiksODBRx28/BEMvR6H6S+oUnXfhO6AJ4CwNZXGUlXLz7+7 UgQmQI5eU0emmd2bXhvX0q345NAAAQuEzfm5/UxEttFDrfy1BJ+LSZtPEitXbsNLGIvLwF tilphEaM9tuIhuyHUEB3qWE5m378Z9m4412x5riEZ58RZ3xnlZt/MnvVIRnilBBDhp+DNy yVbaWxpWdTjF85bHjsGVQxnusSJmRM8zOdzkW7ahxNfrZlbN9TE4Zgehe2vSQA== 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 4NPZLp2KQJz10f7; Sat, 3 Dec 2022 16:01:54 +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 2B3G1sDD007935; Sat, 3 Dec 2022 16:01:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B3G1shs007933; Sat, 3 Dec 2022 16:01:54 GMT (envelope-from git) Date: Sat, 3 Dec 2022 16:01:54 GMT Message-Id: <202212031601.2B3G1shs007933@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: 8d44502e7f64 - stable/13 - fetch: support EAI_ADDRFAMILY error, correct two error messages 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: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8d44502e7f6438e32bf1d9f48cbf341d3c985bed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=8d44502e7f6438e32bf1d9f48cbf341d3c985bed commit 8d44502e7f6438e32bf1d9f48cbf341d3c985bed Author: Mike Karels AuthorDate: 2022-11-02 15:59:09 +0000 Commit: Mike Karels CommitDate: 2022-12-03 15:17:10 +0000 fetch: support EAI_ADDRFAMILY error, correct two error messages With the change to return EAI_ADDRFAMILY from getaddrinfo(), fetch would print "Unknown resolver error" for that error. Add that error and its string to libfetch's table, using an #ifdef just in case. Correct error strings for EAI_NODATA (although it is currently unused) and EAI_NONAME. Should maybe rework the code to use gai_strerror(3), but that doesn't map directly, and the current strings are shortened. Reviewed in https://reviews.freebsd.org/D37139 with related changes. Reviewed by: bz (cherry picked from commit 631b82aca0fd41c8e0d48eebdb9c4e38b7306472) --- lib/libfetch/common.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index 47545e5178c3..7bf487b0db1d 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -67,12 +67,15 @@ __FBSDID("$FreeBSD$"); * Error messages for resolver errors */ static struct fetcherr netdb_errlist[] = { +#ifdef EAI_ADDRFAMILY + { EAI_ADDRFAMILY, FETCH_RESOLV, "Address family for host not supported" }, +#endif #ifdef EAI_NODATA - { EAI_NODATA, FETCH_RESOLV, "Host not found" }, + { EAI_NODATA, FETCH_RESOLV, "No address for host" }, #endif { EAI_AGAIN, FETCH_TEMP, "Transient resolver failure" }, { EAI_FAIL, FETCH_RESOLV, "Non-recoverable resolver failure" }, - { EAI_NONAME, FETCH_RESOLV, "No address record" }, + { EAI_NONAME, FETCH_RESOLV, "Host does not resolve" }, { -1, FETCH_UNKNOWN, "Unknown resolver error" } };