From owner-dev-commits-src-all@freebsd.org Sun Mar 7 23:27:29 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C3DD5533E9; Sun, 7 Mar 2021 23:27:29 +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 4DtyLS5pQGz4mmr; Sun, 7 Mar 2021 23:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 BA8C01EC75; Sun, 7 Mar 2021 23:27:28 +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 127NRSMq006209; Sun, 7 Mar 2021 23:27:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 127NRSLU006208; Sun, 7 Mar 2021 23:27:28 GMT (envelope-from git) Date: Sun, 7 Mar 2021 23:27:28 GMT Message-Id: <202103072327.127NRSLU006208@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: 576313b983dc - main - dumpon: do not print errno for resolver failure MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 576313b983dca243d7ba6af8b57517bed419ecb4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Mar 2021 23:27:29 -0000 The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=576313b983dca243d7ba6af8b57517bed419ecb4 commit 576313b983dca243d7ba6af8b57517bed419ecb4 Author: Eric van Gyzen AuthorDate: 2021-03-05 16:39:53 +0000 Commit: Eric van Gyzen CommitDate: 2021-03-07 23:23:04 +0000 dumpon: do not print errno for resolver failure When the netdump host name fails to resolve, don't print errno, since it's irrelevant. We might as well use a different exit status, too. Sponsored by: Dell EMC Isilon --- sbin/dumpon/dumpon.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c index 2b710a611af3..183ce5f08cb3 100644 --- a/sbin/dumpon/dumpon.c +++ b/sbin/dumpon/dumpon.c @@ -532,10 +532,11 @@ main(int argc, char *argv[]) hints.ai_protocol = IPPROTO_UDP; res = NULL; error = getaddrinfo(server, NULL, &hints, &res); - if (error != 0) - err(1, "%s", gai_strerror(error)); - if (res == NULL) - errx(1, "failed to resolve '%s'", server); + if (error != 0) { + if (error == EAI_SYSTEM) + err(EX_OSERR, "%s", gai_strerror(error)); + errx(EX_NOHOST, "%s", gai_strerror(error)); + } server = inet_ntoa( ((struct sockaddr_in *)(void *)res->ai_addr)->sin_addr); freeaddrinfo(res);