From patchwork Tue Aug 10 01:03:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain GEISSLER X-Patchwork-Id: 44620 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BEBF1393C01D for ; Tue, 10 Aug 2021 01:04:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BEBF1393C01D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1628557453; bh=/chqZ/jcYAz7lQWbcuwMJtLy6ciZzGcTdtdwa6G2bjU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=l6Oy++wDTmHiFhkU5G85oHrbfCTFQCZsFOrjz3sADnWuHV7p0Vkc9ZUEA9R0S8ToP spYHQprAY50PTN76jjaz/sJvgaE2TGwrV9NPzvGZX4xzv9V1LJQyoi6CDou5CvNhyB LXpE5Pz/+3Tu/y/v3sqoW86jA1Gie/b10O/AutkI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02on0609.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe05::609]) by sourceware.org (Postfix) with ESMTPS id E7054385700B for ; Tue, 10 Aug 2021 01:03:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E7054385700B ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QqUEeQpVzkIrBaw1+wu6n0v9brN3TWUu/HMTXYltwXq/RZhec1SClZ0vdI9tVOCkiB5Zey+GS5S4QAm3b6rx6PyRzzHU0yRLcSqDzctDbtq5lEzjewyjur/qeRBqGZvi3qnzbrVhZol0BHyV5GpT50aJRIbMEfX+GZfJOnScTcfuUvnzA7rly/kCGAx3j2EpxorGnJ2lhkcolXE8ojQgsY+pK5k7FV+dEMlh7rrg1/v4e5WMPh19MSKKgvGYTxwjn7qvQYkckqqR57g5MUSPPC0Y27tL5lZDOa1wKG03nUQqcJ8V4fEkVjjFeEYEwnr8P+gpSij5E+PORNpZc3sScQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/chqZ/jcYAz7lQWbcuwMJtLy6ciZzGcTdtdwa6G2bjU=; b=hIkjyzf6klGOLUxQ07+wsL/uxRfK+89BMrY41iKYQQ04mtyQCDXrDlWQr1rGsgrFIeOub35qx29uK1DUsRxNw01bfF7OD0Y1fQmRSQBcPHILgfEIm3TitDjTH1LfYYAGQjpjOtr38po4I3TG58EIuGjywZ5JG/iVo2OR2GNcQ1eWTkGtZZ9AsYwiOxRxGaW2Zx3kFvKxU8AgeaO3FnJ966o358iwsvrWq7GN8JevzhqOdpNMqh+akZarhTosmiwtzQe9O0RUgjwVnhO/K3iDkAW/f7U5WI4UZDDiYqNY1p7Y5p44bJMWnFnw1RsIFy9oIxHbFaBGzjNLk9BwexhDxA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amadeus.com; dmarc=pass action=none header.from=amadeus.com; dkim=pass header.d=amadeus.com; arc=none Received: from PR3PR10MB3772.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:4d::12) by PAXPR10MB4876.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:203::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.17; Tue, 10 Aug 2021 01:03:38 +0000 Received: from PR3PR10MB3772.EURPRD10.PROD.OUTLOOK.COM ([fe80::84e9:c93b:af68:b407]) by PR3PR10MB3772.EURPRD10.PROD.OUTLOOK.COM ([fe80::84e9:c93b:af68:b407%8]) with mapi id 15.20.4394.023; Tue, 10 Aug 2021 01:03:38 +0000 To: "libc-alpha@sourceware.org" Subject: [PATCH] [BZ 24816] Fix nss/tst-nss-files-hosts-long and tst-nss-files-hosts-multi when there is no IPv6 support Thread-Topic: [PATCH] [BZ 24816] Fix nss/tst-nss-files-hosts-long and tst-nss-files-hosts-multi when there is no IPv6 support Thread-Index: AQHXjYON+kvm7a9xaEyz0uGztSdWIg== Date: Tue, 10 Aug 2021 01:03:38 +0000 Message-ID: <20210810010331.GA51141@ncerndobedev6097.etv.nce.amadeus.net> Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Mutt/1.10.1 (2018-07-13) x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a0454ff9-260c-4d4b-5609-08d95b9aafe8 x-ms-traffictypediagnostic: PAXPR10MB4876: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2276; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: rB358WjIA2/tcx2hPSUzsKGIuBq47oPrOVeDPBG2c1HT1dGmG+3qpwamCZQlzenBq7tNq5x3oZglUWhuwyeXaVwLw7O80ib3ynBRPzsqYdXf6XtiLswMH+B0N2gwQjgwKQBOq44QvuJCMbuq4b9AWry9YBBlldxX7Hk90n3oEtTdPdbd2oDIyjpsZ+Npx5uFr4iUZX0UnesBGHc02dy6LRqFDrEDbpH4oM0acXGlaYG727xNvKpYMu7Fmq47PeLZq3erfKWnOfdncjmaEDdR86Xm9YQpzhR4eNl8kf0dMtAb0l8w7S7s5pX//QHfz/sOmNHZNZGvB87TQZHyaBP6AHw9G/MlNZnnm5JmQmi29shYOiU2lleZdFrve9SLKCKgb4UyAPYZplWtfTE/gFnaiPtC42Ix1rTPtdtCD4knvnJMVbsFG1OCsv+z0jpyWU3G3wFnalub6uQiQEuZft4moVCMRHtPOG1X4Rq6Odr9mPiecgFwyggIuTDqwenGryCTs1RbGgGoe27ooOf1w6fjCKq4Y60ykW0PIuwmUqYD0DYCmXAUkXu9BC6tJAx8PSxU+Y2YpSVUD8qScbHrqUR/tWxz0uAd1xisYWhrN5TGgZYchYkW0a7xgNSsKGnFGtfQbwNSuMpWiVk9ncpO//E8lD0aryqkQQ2EWwdX2eLRZcXnj6i/AYaGBAS6KMSo5yzWe+M7Wkme0B7AOfd+OVoJZnk5F1cThfaSwnpzqixUoOlXqMNAJciiSivZC6RmKn90aLHQrVlKESTfjTQMSG3tqg== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PR3PR10MB3772.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(396003)(136003)(39860400002)(346002)(366004)(376002)(6506007)(186003)(478600001)(1076003)(26005)(33656002)(53546011)(38100700002)(122000001)(5660300002)(83380400001)(86362001)(2906002)(6486002)(66946007)(64756008)(66556008)(66476007)(66446008)(6916009)(71200400001)(316002)(966005)(76116006)(9686003)(8676002)(6512007)(8936002)(38070700005); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: lkX/S0CaXjPqY6SEz3VQQHD0NIxaGkRQBt/k2Ylh41pnLsnpIvv5IrZj21QfFyK48PH0HUzrvuM4+Pa5yy7CruYy4HrjVlQZsyuRb+WvlJ9VsHMhPhXllsR+1cCYBmOKZzofrWwMfMbBJ/h8TM/2lTNY1P7R/tzMlN0zgDxTveoDHmcdjX8xy4dsj2CBWu0ceLRF1D7LbdNPgOdqly/GAY5Sq57saMcCdSSvDRP+bj3H3kZGy6r424V8UW8kKosn3YAakFQuGe/Zrmhk1XuDVXOtSKrbJOa9BPKWM0ylzB5VnQXQ10Zvwg/MJanKx72rNHYTd5SX5i2r5FVc/kaAZVF9ydPeAdiwgyQU4iie0OsSDxXCyhj2cW7M510Zuxz7Fx2eLSKZV5Tmcig4ma1plRU+I5fI4f3oTtMW2LjNL28Ie3cacsi+ygOzRKx4Biqd0YF0cr2reov4ytZx3FzPd71yCr2yu7zycoYYDTTEEe/MrfvNkVURCtg49uDoUN3xRIoX3pxXmVILWa1pqYEINChIVzkTxkEwvMQ7898wF9HWuIaYOwQp/UW8o84+x5i28TJxe2+uE+KS4yjtK8QqcQ+kr6IfKnBfEioxMPTCm4XEhGA39YFvS5XHQICVPrffO6+ORxBoS9+gKIo61sXD0TQBLE2x2emy3BoxMH4TKWCO8tkQdWkrgbpIFratVX5D2euxRMBwKDnxfAT43kEpATryAQouYKIeCKSGOy7QS5Tg7llU26PYg9SYawiuXZNW9KQuWodfODtRcH8z+sr42aqkS2iKZxvJW0FuY65k48c3SC7QKanj9iChfev+hc30mOh+owtTHdqUsSoag1dsU28pG+mU7ANJulwtiMCcAN35tlzoK3NYTygXtEh8sSLrYMaCKe4zWRxNP82jlVL44w7XzGtCR5BaFWNTKEpzFtYAgDTw/8FJU8stNjkG1C6L+PMCuopyLLCPGw3bfl3zYohAw4UgTTyjAB3VKKmSwmQnNM7pE1vPD8+7XUWXEODKSLG1a26XHNGc/FtQMOpj/2759rAVAjlXYi7WgavacBr350ezo3AQjvFOndbnZgTQGXhz5s1ZAWQ3kelqv38bWqxRXAj6r/N53Lz0JVb0LcV1w6Fb64mWpbeU9VLrcDKNcLoD/e6gyp3V9+4jzvsKdiwR0vzlYIhYlu6j0nPcGKPKs2dsxzmVJto4fj8FO6Hzy4tJp6fB4nPCBRfyJ7RgSJfn5sfeXWC/uounncP7uPzJ5cEKCj+WVFZ8k0ttx9ZTELBAAMH/Qkcq+VCKR9SoWPXUnZ1KtU9Ii4AAILoEvw21wuzxslHoyYiJclw727pj x-ms-exchange-transport-forked: True Content-ID: <629A2206B6E37649A622D770B3A85D62@EURPRD10.PROD.OUTLOOK.COM> MIME-Version: 1.0 X-OriginatorOrg: amadeus.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PR3PR10MB3772.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: a0454ff9-260c-4d4b-5609-08d95b9aafe8 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Aug 2021 01:03:38.3090 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b3f4f7c2-72ce-4192-aba4-d6c7719b5766 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: zNASeDNhJe0DKroXtwk479nEa6qXSeDMcst/2FWua0bvNNKX0L2dbFzlGEs1Ov/JVPaVqMvt4YtvyEfAUv+JAWM0rrz1op9o4mZE0KoatkU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR10MB4876 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FORGED_SPF_HELO, GIT_PATCH_0, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Romain GEISSLER via Libc-alpha From: Romain GEISSLER Reply-To: Romain GEISSLER Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Hi, This is an updated version of a patch I posted some years ago already: https://sourceware.org/pipermail/libc-alpha/2019-July/105107.html With glibc 2.34, now tst-nss-files-hosts-multi also needs to be updated as well, as it seems my docker container I use to build/test glibc lacks proper ipv6 configuration. I tested this on x86-64. Cheers, Romain From 04f5a832acd7417190d272c10db0c47e55fc3a16 Mon Sep 17 00:00:00 2001 From: Romain Geissler Date: Wed, 17 Jul 2019 12:29:21 +0000 Subject: [PATCH] [BZ 24816] Fix nss/tst-nss-files-hosts-long and tst-nss-files-hosts-multi when there is no IPv6 support. --- nss/tst-nss-files-hosts-long.c | 47 +++++++++++++++++++++++++++------ nss/tst-nss-files-hosts-multi.c | 34 ++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 8 deletions(-) diff --git a/nss/tst-nss-files-hosts-long.c b/nss/tst-nss-files-hosts-long.c index 00f8bea409e..52f21dc1faf 100644 --- a/nss/tst-nss-files-hosts-long.c +++ b/nss/tst-nss-files-hosts-long.c @@ -22,6 +22,31 @@ #include #include #include +#include + +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); } diff --git a/nss/tst-nss-files-hosts-multi.c b/nss/tst-nss-files-hosts-multi.c index 87986d95342..8ce6a8c2cec 100644 --- a/nss/tst-nss-files-hosts-multi.c +++ b/nss/tst-nss-files-hosts-multi.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -37,6 +38,30 @@ struct support_chroot *chroot_env; +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 void prepare (int argc, char **argv) { @@ -204,6 +229,15 @@ run_gbhn_gai (struct test_params *params) if (test_verbose > 0) printf ("info: %s\n", ctx); + if (!supports_inet_family(params->family)) + { + printf("Test %s is not supported, skipping this inet family", ctx); + free (ctx); + + return; + } + + /* Check gethostbyname, gethostbyname2. */ if (params->family == AF_INET) {