From patchwork Mon Oct 2 12:55:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arjun Shankar X-Patchwork-Id: 1842112 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=cgexpQKx; 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 4Rzh2b4qPWz1ypV for ; Tue, 3 Oct 2023 00:03:03 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3D286388553B for ; Mon, 2 Oct 2023 13:02:57 +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 6D672385F015 for ; Mon, 2 Oct 2023 13:02:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6D672385F015 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=1696251735; 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=y5bQYDSQ/VwetDC9JbYeWlrIUPGJX/ZO/IvofoWKGbk=; b=cgexpQKxPwRmKeKhVBMg+j8EyEHoj9ThTDkc3uOhYSMjeR6S5KqpI834hpDHcOc7Qb/CVa J+Gvcx2BPgGwM1VdbjhudoZ1Fc6Q+pxu16rKnuKEbjKfV8OHqM4HjZ2rK6avZsaPpzJMJl aeIAsf2Un7zNZBovd/Y5iqWB0tG4NgA= 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-311-BFOsigEHNNaZa9gtfBcyfQ-1; Mon, 02 Oct 2023 09:02:12 -0400 X-MC-Unique: BFOsigEHNNaZa9gtfBcyfQ-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 47B4329AB452 for ; Mon, 2 Oct 2023 13:02:12 +0000 (UTC) Received: from localhost.localdomain (dhcp129-93.brq.redhat.com [10.34.129.93]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C38F3C15BB8; Mon, 2 Oct 2023 13:02:11 +0000 (UTC) From: Arjun Shankar To: libc-alpha@sourceware.org, Arjun Shankar Subject: [PATCH 09/16] Move 'hosts' routines from 'inet' into 'nss' Date: Mon, 2 Oct 2023 14:55:21 +0200 Message-ID: <20231002130150.1497733-10-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 The gethostby* and gethostent* routines are entry points for nss functionality. This commit moves them from the 'inet' subdirectory to 'nss'. Reviewed-by: Adhemerval Zanella --- inet/Makefile | 17 ----------------- inet/Versions | 4 +--- nss/Makefile | 24 ++++++++++++++++++++++++ nss/Versions | 2 ++ {inet => nss}/gethstbyad.c | 0 {inet => nss}/gethstbyad_r.c | 0 {inet => nss}/gethstbynm.c | 0 {inet => nss}/gethstbynm2.c | 0 {inet => nss}/gethstbynm2_r.c | 0 {inet => nss}/gethstbynm_r.c | 0 {inet => nss}/gethstent.c | 0 {inet => nss}/gethstent_r.c | 0 {inet => nss}/tst-gethnm.c | 0 13 files changed, 27 insertions(+), 20 deletions(-) rename {inet => nss}/gethstbyad.c (100%) rename {inet => nss}/gethstbyad_r.c (100%) rename {inet => nss}/gethstbynm.c (100%) rename {inet => nss}/gethstbynm2.c (100%) rename {inet => nss}/gethstbynm2_r.c (100%) rename {inet => nss}/gethstbynm_r.c (100%) rename {inet => nss}/gethstent.c (100%) rename {inet => nss}/gethstent_r.c (100%) rename {inet => nss}/tst-gethnm.c (100%) diff --git a/inet/Makefile b/inet/Makefile index 4d053de748..d378542549 100644 --- a/inet/Makefile +++ b/inet/Makefile @@ -46,14 +46,6 @@ routines := \ ether_line \ ether_ntoa \ ether_ntoa_r \ - gethstbyad \ - gethstbyad_r \ - gethstbynm \ - gethstbynm2 \ - gethstbynm2_r \ - gethstbynm_r \ - gethstent \ - gethstent_r \ getipv4sourcefilter \ getnameinfo \ getnetbyad \ @@ -123,7 +115,6 @@ tests := \ tst-checks-posix \ tst-ether_aton \ tst-ether_line \ - tst-gethnm \ tst-getni1 \ tst-getni2 \ tst-if_index-long \ @@ -154,14 +145,6 @@ include ../gen-locales.mk ifeq ($(have-thread-library),yes) -CFLAGS-gethstbyad_r.c += -fexceptions -CFLAGS-gethstbyad.c += -fexceptions -CFLAGS-gethstbynm_r.c += -fexceptions -CFLAGS-gethstbynm.c += -fexceptions -CFLAGS-gethstbynm2_r.c += -fexceptions -CFLAGS-gethstbynm2.c += -fexceptions -CFLAGS-gethstent_r.c += -fexceptions -CFLAGS-gethstent.c += -fexceptions CFLAGS-rcmd.c += -fexceptions CFLAGS-getnetbynm_r.c += -fexceptions CFLAGS-getnetbynm.c += -fexceptions diff --git a/inet/Versions b/inet/Versions index a7c1a0fb6f..d937e9835c 100644 --- a/inet/Versions +++ b/inet/Versions @@ -14,9 +14,7 @@ libc { ether_ntoa_r; # g* - getdomainname; gethostbyaddr; gethostbyaddr_r; gethostbyname; - gethostbyname2; gethostbyname2_r; gethostbyname_r; gethostent; - gethostent_r; getnetbyaddr; getnetbyaddr_r; getnetbyname; + getdomainname; getnetbyaddr; getnetbyaddr_r; getnetbyname; getnetbyname_r; getnetent; getnetent_r; getnetgrent; getnetgrent_r; getprotobyname; getprotobyname_r; getprotobynumber; getprotobynumber_r; getprotoent; getprotoent_r; diff --git a/nss/Makefile b/nss/Makefile index 148c6dc1cf..d0b564a033 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -125,6 +125,29 @@ CFLAGS-getsgnam.c += -fexceptions CFLAGS-getsgnam_r.c += -fexceptions endif +# hosts routines: +routines += \ + gethstbyad \ + gethstbyad_r \ + gethstbynm \ + gethstbynm2 \ + gethstbynm2_r \ + gethstbynm_r \ + gethstent \ + gethstent_r \ + # routines + +ifeq ($(have-thread-library),yes) +CFLAGS-gethstbyad.c += -fexceptions +CFLAGS-gethstbyad_r.c += -fexceptions +CFLAGS-gethstbynm.c += -fexceptions +CFLAGS-gethstbynm_r.c += -fexceptions +CFLAGS-gethstbynm2.c += -fexceptions +CFLAGS-gethstbynm2_r.c += -fexceptions +CFLAGS-gethstent.c += -fexceptions +CFLAGS-gethstent_r.c += -fexceptions +endif + # pwd routines: routines += \ fgetpwent \ @@ -210,6 +233,7 @@ tests := \ test-netdb \ testgrp \ tst-fgetsgent_r \ + tst-gethnm \ tst-getpw \ tst-gshadow \ tst-nss-getpwent \ diff --git a/nss/Versions b/nss/Versions index 99208cb9df..74ba4470d8 100644 --- a/nss/Versions +++ b/nss/Versions @@ -21,6 +21,8 @@ libc { getaliasbyname; getaliasbyname_r; getaliasent; getaliasent_r; getgrent; getgrent_r; getgrgid; getgrgid_r; getgrnam; getgrnam_r; getgroups; + gethostbyaddr; gethostbyaddr_r; gethostbyname; gethostbyname2; + gethostbyname2_r; gethostbyname_r; gethostent; gethostent_r; getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r; getspent; getspent_r; getspnam; getspnam_r; diff --git a/inet/gethstbyad.c b/nss/gethstbyad.c similarity index 100% rename from inet/gethstbyad.c rename to nss/gethstbyad.c diff --git a/inet/gethstbyad_r.c b/nss/gethstbyad_r.c similarity index 100% rename from inet/gethstbyad_r.c rename to nss/gethstbyad_r.c diff --git a/inet/gethstbynm.c b/nss/gethstbynm.c similarity index 100% rename from inet/gethstbynm.c rename to nss/gethstbynm.c diff --git a/inet/gethstbynm2.c b/nss/gethstbynm2.c similarity index 100% rename from inet/gethstbynm2.c rename to nss/gethstbynm2.c diff --git a/inet/gethstbynm2_r.c b/nss/gethstbynm2_r.c similarity index 100% rename from inet/gethstbynm2_r.c rename to nss/gethstbynm2_r.c diff --git a/inet/gethstbynm_r.c b/nss/gethstbynm_r.c similarity index 100% rename from inet/gethstbynm_r.c rename to nss/gethstbynm_r.c diff --git a/inet/gethstent.c b/nss/gethstent.c similarity index 100% rename from inet/gethstent.c rename to nss/gethstent.c diff --git a/inet/gethstent_r.c b/nss/gethstent_r.c similarity index 100% rename from inet/gethstent_r.c rename to nss/gethstent_r.c diff --git a/inet/tst-gethnm.c b/nss/tst-gethnm.c similarity index 100% rename from inet/tst-gethnm.c rename to nss/tst-gethnm.c