From a3b993ca3fb6fc0b837745c1ae82aca684951842 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 9 Feb 2023 05:55:42 +0900 Subject: nss-myhostname: fix inverted condition in Fixes a bug introduced by db50d326a46beca3cc24b6354b6e1b3591902d45. --- src/nss-myhostname/nss-myhostname.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c index 3af1d2f0c1..1b340e11d4 100644 --- a/src/nss-myhostname/nss-myhostname.c +++ b/src/nss-myhostname/nss-myhostname.c @@ -461,7 +461,7 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( } else { assert(af == AF_INET6); - if (socket_ipv6_is_enabled()) + if (!socket_ipv6_is_enabled()) goto not_found; if (memcmp(addr, LOCALADDRESS_IPV6, 16) == 0) { -- cgit v1.2.1 From 1c3762937e9184c9abbc8d5541b4228841ccc24f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 9 Feb 2023 06:07:13 +0900 Subject: nss-myhostname: do not return empty result with NSS_STATUS_SUCCESS Fixes a bug introduced by db50d326a46beca3cc24b6354b6e1b3591902d45. Fixes RHBZ#2167468 (https://bugzilla.redhat.com/show_bug.cgi?id=2167468). --- src/nss-myhostname/nss-myhostname.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c index 1b340e11d4..ed417306f0 100644 --- a/src/nss-myhostname/nss-myhostname.c +++ b/src/nss-myhostname/nss-myhostname.c @@ -346,9 +346,10 @@ enum nss_status _nss_myhostname_gethostbyname3_r( return NSS_STATUS_UNAVAIL; } + if (af == AF_INET6 && !socket_ipv6_is_enabled()) + goto not_found; + if (is_localhost(name)) { - if (af == AF_INET6 && !socket_ipv6_is_enabled()) - goto not_found; canonical = "localhost"; local_address_ipv4 = htobe32(INADDR_LOOPBACK); -- cgit v1.2.1