From nobody Thu Jan 09 04:04:59 2025 X-Original-To: dev-commits-src-main@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 4YTB575g4yz5kdnM; Thu, 09 Jan 2025 04:04:59 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YTB572bYRz41fj; Thu, 9 Jan 2025 04:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736395499; 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=e4Tz7ChW5HB7sx8XpdQ96U4aXckZ3jiEKhVCiZNVIDo=; b=gF2i9FuSJIyae9Fbg6CEA/ellaJsULSHufZqbVpzt2/9bqI9glX4H9h7dW6hWvV2NZLuXY DqEbIFM9MwTrqi51/mqHKMrFF5NELEG61qxcYdXXMpUGBv+qa24/6KN9jau3tZLxit1aCY Yny0jSED4b/uwe/nnzKWxwDGIuXe3cqNDy9PgWu6YBGFd1ssKSR9cqS/5IrqdimLzkJBnf ivwP4oWSbRR4yZgCOrmcmYswDBK72izbKyYY7/eI9xkyP7qfhn2PNQK9k9NbGAY+gxBK7G HxSJhjMrd6Uhd3XVkeyUiw7/nrhN5sfo9Q43Fxku4X7842mDbNSd8tp8VAHcGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736395499; 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=e4Tz7ChW5HB7sx8XpdQ96U4aXckZ3jiEKhVCiZNVIDo=; b=WQJ2uYRXADchdxIlxGJ9thbU8DQbA3AbJiBWzxl3O2rozFHdmwClgKRdsixyax0bFnd3Wv p6dt5Ex6Nyl2mcnPAj3fiBsWXXMwPfo1pk0NJDyIiKKiGPdQnmlFbWkDopsilc7GxoZU8I ZtViftID4ts2V0kgo3NYE7eR0nQHRDOyVnF7hqvRFvRjQ/6v0Ck8lZkPhAYMO3A79AMGft UzH7xaveXj94bYT5cMt12C7Nx6CXparMfAN2JhgZWWeGMmCBSqzjRMXz8ZRyB4DOv9OFp1 Hhk4In7G/hjjtzMyfHorbN84dBVemiX+gDy2Fi5gL8699npitUWY7UYdTmR+vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736395499; a=rsa-sha256; cv=none; b=ThTUbPPlWxmmmMC1UgpdT6upe0d6xfLMZjVNcvd7JLqXltC8bMm3P5fSlPSBooRyq/MWrN CT69KZ2cddlAlAcJHM/TVKobezourax+sbTD/D+/TsmnwjkK8gy6oQEkCUYrqFXGNoTnq/ c2bk/E6Er463XS42Y0AH/Cs8rKAB8C3h75ntLNyba45mWBRkT5xErlJB9POTqO38Xlm28J FvKP8m/CtUSAs5zj++JAzEXi3RKwqjodgUcEjddIUKlo8xFl3lnQfvasE+Kx/JrBuQwARJ ert9Slg0Py561AiWt5wNlGeSWNwU6S7wWJ27sp7lKBtlVax2xLHbJ/dnd558Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YTB57203qz1P9M; Thu, 09 Jan 2025 04:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50944xmw031333; Thu, 9 Jan 2025 04:04:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50944xSk031330; Thu, 9 Jan 2025 04:04:59 GMT (envelope-from git) Date: Thu, 9 Jan 2025 04:04:59 GMT Message-Id: <202501090404.50944xSk031330@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 8e8f8d86e305 - main - rpcbind: remove extraneous check for nconf not being unix(4) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e8f8d86e305fe1e90fcfc64c1958e61b359f4f4 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=8e8f8d86e305fe1e90fcfc64c1958e61b359f4f4 commit 8e8f8d86e305fe1e90fcfc64c1958e61b359f4f4 Author: Gleb Smirnoff AuthorDate: 2025-01-09 04:00:12 +0000 Commit: Gleb Smirnoff CommitDate: 2025-01-09 04:00:12 +0000 rpcbind: remove extraneous check for nconf not being unix(4) We are already inside an if block with exactly same predicate. --- usr.sbin/rpcbind/rpcbind.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/usr.sbin/rpcbind/rpcbind.c b/usr.sbin/rpcbind/rpcbind.c index 44adae366bed..a836afd24009 100644 --- a/usr.sbin/rpcbind/rpcbind.c +++ b/usr.sbin/rpcbind/rpcbind.c @@ -416,18 +416,14 @@ init_transport(struct netconfig *nconf) */ if (strcmp("*", hosts[nhostsbak]) == 0) hosts[nhostsbak] = NULL; - if ((strcmp(nconf->nc_netid, "local") != 0) && - (strcmp(nconf->nc_netid, "unix") != 0)) { - if ((aicode = getaddrinfo(hosts[nhostsbak], - servname, &hints, &res)) != 0) { - syslog(LOG_ERR, - "cannot get local address for %s: %s", + if ((aicode = getaddrinfo(hosts[nhostsbak], servname, &hints, + &res)) != 0) { + syslog(LOG_ERR, "cannot get local address for %s: %s", nconf->nc_netid, gai_strerror(aicode)); continue; - } - addrlen = res->ai_addrlen; - sa = (struct sockaddr *)res->ai_addr; } + addrlen = res->ai_addrlen; + sa = (struct sockaddr *)res->ai_addr; oldmask = umask(S_IXUSR|S_IXGRP|S_IXOTH); if (bind(fd, sa, addrlen) != 0) { syslog(LOG_ERR, "cannot bind %s on %s: %m",