From patchwork Mon Oct 2 12:55:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arjun Shankar X-Patchwork-Id: 1842123 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=VD/EgpDJ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rzh4W3hHwz1ypV for ; Tue, 3 Oct 2023 00:04:43 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0F3823952530 for ; Mon, 2 Oct 2023 13:04:11 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 9D22D385CCBA for ; Mon, 2 Oct 2023 13:02:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9D22D385CCBA Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696251742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n1+2MoigsqYlfLSFR2t5I+lE/YpUDvX/IZx5i1zrCKU=; b=VD/EgpDJ9S2sf/XSLwd8xbBuXj3fQeFhxmcPzWPkkn+bfCg6VnxpIp27LQ2CiSOtDXTm13 NRZCvb2lGiPztpuPd683jngcALDn0nU0svqImFfQpkwYWTjpiTvGGOO5bX5cOD8glncsEo ezmszq8+rwxeJyDqj4zyELAnbvvihOI= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-287-Y1PJz_hTNhG8KUW6GH3rsA-1; Mon, 02 Oct 2023 09:02:21 -0400 X-MC-Unique: Y1PJz_hTNhG8KUW6GH3rsA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EEF4D29AB448 for ; Mon, 2 Oct 2023 13:02:20 +0000 (UTC) Received: from localhost.localdomain (dhcp129-93.brq.redhat.com [10.34.129.93]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 773DBC15BB8; Mon, 2 Oct 2023 13:02:20 +0000 (UTC) From: Arjun Shankar To: libc-alpha@sourceware.org, Arjun Shankar Subject: [PATCH 16/16] Move getnameinfo from 'inet' to 'nss' Date: Mon, 2 Oct 2023 14:55:28 +0200 Message-ID: <20231002130150.1497733-17-arjun@redhat.com> In-Reply-To: <20231002130150.1497733-1-arjun@redhat.com> References: <20231002130150.1497733-1-arjun@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, RCVD_IN_SBL_CSS, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org getnameinfo is an entry points for nss functionality. This commit moves it from the 'inet' subdirectory to 'nss'. The corresponding Versions entry is also moved from 'posix' into 'nss'. Reviewed-by: Adhemerval Zanella --- inet/Makefile | 1 - nss/Makefile | 1 + nss/Versions | 3 +++ {inet => nss}/getnameinfo.c | 2 +- posix/Versions | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) rename {inet => nss}/getnameinfo.c (99%) diff --git a/inet/Makefile b/inet/Makefile index d275f51b3f..b691fef921 100644 --- a/inet/Makefile +++ b/inet/Makefile @@ -47,7 +47,6 @@ routines := \ ether_ntoa \ ether_ntoa_r \ getipv4sourcefilter \ - getnameinfo \ getsourcefilter \ herrno \ herrno-loc \ diff --git a/nss/Makefile b/nss/Makefile index da5bd207aa..213b68720b 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -136,6 +136,7 @@ routines += \ gethstbynm_r \ gethstent \ gethstent_r \ + getnameinfo \ # routines ifeq ($(have-thread-library),yes) diff --git a/nss/Versions b/nss/Versions index 158a9175a4..d765e1d3b6 100644 --- a/nss/Versions +++ b/nss/Versions @@ -58,6 +58,9 @@ libc { ulckpwdf; } GLIBC_2.1 { + # g* + getnameinfo; + # p* putgrent; } diff --git a/inet/getnameinfo.c b/nss/getnameinfo.c similarity index 99% rename from inet/getnameinfo.c rename to nss/getnameinfo.c index 40c20b4be6..062652c229 100644 --- a/inet/getnameinfo.c +++ b/nss/getnameinfo.c @@ -71,7 +71,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include +#include #include #ifndef min diff --git a/posix/Versions b/posix/Versions index b24c7c87ff..0624d24bcc 100644 --- a/posix/Versions +++ b/posix/Versions @@ -72,7 +72,7 @@ libc { __pread64; __pwrite64; # g* - gai_strerror; getnameinfo; glob64; globfree64; + gai_strerror; glob64; globfree64; # p* pread; pread64; pwrite; pwrite64;