This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[BZ 24816] Fix nss/tst-nss-files-hosts-long.c when there is no IPv6 support
- From: Romain Geissler <romain dot geissler at amadeus dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Wed, 17 Jul 2019 17:55:02 +0000
- Subject: [BZ 24816] Fix nss/tst-nss-files-hosts-long.c when there is no IPv6 support
Hi,
Here is a small patch to fix BZ 24816 (details are in the bug report).
Tested on Linux x64.
PS: I don't have a copyright assignment, and the diff while trivial, is bigger than 15 lines. Is this still ok or not ?
Cheers,
Romain
2019-07-17 Romain Geissler <romain.geissler@amadeus.com>
[BZ #24816]
* nss/tst-nss-files-hosts-long.c: Include <ifaddrs.h>.
(supports_inet_family): Define.
(do_test): Use supports_inet_family for AF_INET and AF_INET6.
>From 5c57c2ead3684a26924a87b8f2dd43b75470ab9b Mon Sep 17 00:00:00 2001
From: Romain Geissler <romain.geissler@amadeus.com>
Date: Wed, 17 Jul 2019 12:29:21 +0000
Subject: [PATCH] [BZ 24816] Fix nss/tst-nss-files-hosts-long.c when there is
no IPv6 support.
---
nss/tst-nss-files-hosts-long.c | 47 ++++++++++++++++++++++++++++------
1 file changed, 39 insertions(+), 8 deletions(-)
diff --git a/nss/tst-nss-files-hosts-long.c b/nss/tst-nss-files-hosts-long.c
index 32f849e481b..aa79b88e41a 100644
--- a/nss/tst-nss-files-hosts-long.c
+++ b/nss/tst-nss-files-hosts-long.c
@@ -22,6 +22,31 @@
#include <stdlib.h>
#include <nss.h>
#include <support/check.h>
+#include <ifaddrs.h>
+
+static int
+supports_inet_family(int family)
+{
+ struct ifaddrs *ifaddr, *ifa;
+ int ret = 0;
+
+ if (getifaddrs(&ifaddr) == -1)
+ FAIL_EXIT1("getifaddrs failed");
+
+ for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
+ if (ifa->ifa_addr == NULL)
+ continue;
+
+ if (ifa->ifa_addr->sa_family == family) {
+ ret = 1;
+ break;
+ }
+ }
+
+ freeifaddrs(ifaddr);
+
+ return ret;
+}
static int
do_test (void)
@@ -30,14 +55,20 @@ do_test (void)
/* Run getent to fetch the IPv4 address for host test4.
This forces /etc/hosts to be parsed. */
- ret = system("getent ahostsv4 test4");
- if (ret != 0)
- FAIL_EXIT1("ahostsv4 failed");
-
- /* Likewise for IPv6. */
- ret = system("getent ahostsv6 test6");
- if (ret != 0)
- FAIL_EXIT1("ahostsv6 failed");
+ if (supports_inet_family(AF_INET))
+ {
+ ret = system("getent ahostsv4 test4");
+ if (ret != 0)
+ FAIL_EXIT1("ahostsv4 failed");
+ }
+
+ /* Likewise for IPv6. */
+ if (supports_inet_family(AF_INET6))
+ {
+ ret = system("getent ahostsv6 test6");
+ if (ret != 0)
+ FAIL_EXIT1("ahostsv6 failed");
+ }
exit (0);
}
--
2.17.1