From nobody Sun Mar 17 15:26:51 2024 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 4TyMKR5nCsz5DYs7; Sun, 17 Mar 2024 15:26:51 +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 4TyMKR3YdRz4vtc; Sun, 17 Mar 2024 15:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710689211; 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=QwXI+V7qVdNgtSjImycdV5hZDRQ5+pNlqF8+y2HP1ZI=; b=ABp8Xeu4I4i7dO+B7AH1GHHfc4YKXEQ7rGzG1eCofizWkQnoodMz3Fe9N1vh98WH5nJFWP IwX4RUb4KPdCx0usCxeS1QzLCofE9YaesYu639FlO38Nb1I27Nkoy44L3pGhW3zRlCmTec BH7MEbDc6hGPE1Ry7yhOIU5XQsmZMfiyUKURzN/zUrpDT0QIUfXSyP0BLqszAEmlnBAS9X 6ObIt13HKEI0v6Kj/xw7DSj2vxOILKYa6ygyG44VIso9xntsth+h3tS8mjan4wJ7gDcjMY g7pnwcPIgjHOzVJdePJVEC1I7W3xv7L5bA2N1Dz47lrYXQdzaqdJHNQVuUk+0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710689211; a=rsa-sha256; cv=none; b=Yq6DNgzoYi8SmLHoqfYT5jYjO4LuHnTXswGbewNV8Vd9rF4RAgfPIA00KOFW2z7mwlB4tB y49hQ5yBRPSN2BPTj6E6DgrOllIb6Lol/6JRVVDVqTd9zuHFYgC9F+/Vm35eUIXuJauVgw UV+HHempmcdOAUByRs5tLSLbMr5ch55PUMAkzgpCZJ8fXiv5pzCIBMfzXoWoZmImHEQNy5 GqCsFXqOCZdMiDvWxEDklZb4JJXCX1tJSHSfOWZt5cg6uhuDHv8U1/VuJxB9dUeDWj1TgM 9JldWCjPdBZp9pAyePKrO4CoJYp5vpneSL4wvt3KUn4LEfhrjItlSPPExL6CgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710689211; 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=QwXI+V7qVdNgtSjImycdV5hZDRQ5+pNlqF8+y2HP1ZI=; b=Zk+XbkevSOE8s/LAZmownmI82jnfnv6Go31DibfDoKEHgEpay5UbSxmaLaySrKbPdB39Wh 6HrzKSV+9oDGevrZz9b7hMcr3Gfm1jxPM1yF9HQKdOZrbiKwTJDxWk5+B7LZBC8yR5/xoP owUGm5YYRdp7S8UuFJQjW1i5CHCM6x0RebowuAL4AfqPsoOlj61OpZSJgqL/jiClDDiqtV Piq8mOO3h6u5LlH78KbddeV8tceEwfI4pExIldK+SUPxk6BcYorUXrVoy8EmLDw2Mz/tUG EMxy8F/BCpoOYkBT8tcByZGikq38njLP3Jnc55wm8ucEbMYDofPM4U3EX3GNhw== 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 4TyMKR39RGzkJn; Sun, 17 Mar 2024 15:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42HFQpAi014666; Sun, 17 Mar 2024 15:26:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42HFQpik014663; Sun, 17 Mar 2024 15:26:51 GMT (envelope-from git) Date: Sun, 17 Mar 2024 15:26:51 GMT Message-Id: <202403171526.42HFQpik014663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 4187a7dbbe79 - stable/13 - ping: Fix protocol selection with NOINET6 kernel. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4187a7dbbe793cffaef2399b42aa557f21aa750b Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4187a7dbbe793cffaef2399b42aa557f21aa750b commit 4187a7dbbe793cffaef2399b42aa557f21aa750b Author: Dag-Erling Smørgrav AuthorDate: 2024-03-12 19:40:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-17 14:37:59 +0000 ping: Fix protocol selection with NOINET6 kernel. A missing else caused the correct resolver hint (AF_INET) to be overwritten with AF_UNSPEC when the kernel supports IPv4 but not IPv6. MFC after: 3 days PR: 277592 Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44304 (cherry picked from commit b53ae8a8333d730bb977276c511743b98c881423) --- sbin/ping/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ping/main.c b/sbin/ping/main.c index 2e2d3170fd13..c91959e35634 100644 --- a/sbin/ping/main.c +++ b/sbin/ping/main.c @@ -126,7 +126,7 @@ main(int argc, char *argv[]) hints.ai_socktype = SOCK_RAW; if (feature_present("inet") && !feature_present("inet6")) hints.ai_family = AF_INET; - if (feature_present("inet6") && !feature_present("inet")) + else if (feature_present("inet6") && !feature_present("inet")) hints.ai_family = AF_INET6; else hints.ai_family = AF_UNSPEC;