The branch main has been updated by des:
URL:
https://cgit.FreeBSD.org/src/commit/?id=b53ae8a8333d730bb977276c511743b98c881423
commit b53ae8a8333d730bb977276c511743b98c881423
Author: Dag-Erling Smørgrav <d...@freebsd.org>
AuthorDate: 2024-03-12 19:40:36 +0000
Commit: Dag-Erling Smørgrav <d...@freebsd.org>
CommitDate: 2024-03-12 19:40:36 +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
---
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 1d1816361788..8a572cb3c914 100644
--- a/sbin/ping/main.c
+++ b/sbin/ping/main.c
@@ -149,7 +149,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;
