diff options
| author | Luca Boccassi <bluca@debian.org> | 2023-02-09 10:04:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-09 10:04:14 +0000 |
| commit | dad1305ecabe0a94cff23ffa26c5d3e19d263558 (patch) | |
| tree | acc3e0919ddcc81b01d1e3cb6d4125ab36aa0bc8 | |
| parent | c80ff4a435109844e9f0ae298526959bbb3e97de (diff) | |
| parent | 1c3762937e9184c9abbc8d5541b4228841ccc24f (diff) | |
| download | systemd-dad1305ecabe0a94cff23ffa26c5d3e19d263558.tar.gz | |
Merge pull request #26366 from yuwata/nss-myhostname
nss-myhostname: two fixlets
| -rw-r--r-- | src/nss-myhostname/nss-myhostname.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c index 3af1d2f0c1..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); @@ -461,7 +462,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) { |