You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
43 lines
1.7 KiB
43 lines
1.7 KiB
7 years ago
|
From 624fcda36dd376707e3af088b592fe3764b99acf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jan Synacek <jsynacek@redhat.com>
|
||
|
|
Date: Tue, 2 May 2017 14:34:17 +0200
|
||
|
|
Subject: [PATCH] myhostname: don't return any ipv6 entries when ipv6 is
|
||
|
|
disabled
|
||
|
|
|
||
|
|
This commit amends the rhel-only 6e5117b83af5998359916f276a9b32f755c0e6f4.
|
||
|
|
|
||
|
|
Resolves: #1444824
|
||
|
|
---
|
||
|
|
src/nss-myhostname/nss-myhostname.c | 10 ++++------
|
||
|
|
1 file changed, 4 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
|
||
|
|
index e197cc752..144c83171 100644
|
||
|
|
--- a/src/nss-myhostname/nss-myhostname.c
|
||
|
|
+++ b/src/nss-myhostname/nss-myhostname.c
|
||
|
|
@@ -351,6 +351,8 @@ enum nss_status _nss_myhostname_gethostbyname3_r(
|
||
|
|
*h_errnop = NO_DATA;
|
||
|
|
return NSS_STATUS_UNAVAIL;
|
||
|
|
}
|
||
|
|
+ if (af == AF_INET6 && !socket_ipv6_is_supported())
|
||
|
|
+ return NSS_STATUS_UNAVAIL;
|
||
|
|
|
||
|
|
if (is_localhost(name)) {
|
||
|
|
canonical = "localhost";
|
||
|
|
@@ -381,13 +383,9 @@ enum nss_status _nss_myhostname_gethostbyname3_r(
|
||
|
|
return NSS_STATUS_NOTFOUND;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (af == AF_INET6 && !socket_ipv6_is_supported()) {
|
||
|
|
+ n_addresses = local_addresses(NULL, 0, af, &addresses);
|
||
|
|
+ if (n_addresses < 0)
|
||
|
|
n_addresses = 0;
|
||
|
|
- } else {
|
||
|
|
- n_addresses = local_addresses(NULL, 0, af, &addresses);
|
||
|
|
- if (n_addresses < 0)
|
||
|
|
- n_addresses = 0;
|
||
|
|
- }
|
||
|
|
|
||
|
|
canonical = hn;
|
||
|
|
additional = n_addresses <= 0 && af == AF_INET6 ? "localhost" : NULL;
|