From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 D54343875437 for ; Mon, 2 Oct 2023 13:02:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D54343875437 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=5w1TMGf59SvJowqykJBSpqpufUFsGngPBys20GFrz88=; b=ayaGWEPts1nmWE42zwcHG6aYgSu+PNLVJ0VXmoBm4aD0ezZCBxfjm1FRCcI4JYINVX9qXp kbKrAGib80vOW6292g2ATr9+puarf6b7yULxarX+k9eKrifMTNSTYLvoQT+LCT8GxIKbk0 vv/4H9dg5HSDCvE0JXYH6DAz7E3k11c= 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-691-JliiwX2KNPuP6x1EoqVSJg-1; Mon, 02 Oct 2023 09:02:11 -0400 X-MC-Unique: JliiwX2KNPuP6x1EoqVSJg-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 2483029AB442 for ; Mon, 2 Oct 2023 13:02:11 +0000 (UTC) Received: from localhost.localdomain (dhcp129-93.brq.redhat.com [10.34.129.93]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A12CDC15BB8; Mon, 2 Oct 2023 13:02:10 +0000 (UTC) From: Arjun Shankar To: libc-alpha@sourceware.org, Arjun Shankar Subject: [PATCH 08/16] Move 'ethers' routines from 'inet' into 'nss' Date: Mon, 2 Oct 2023 14:55:20 +0200 Message-ID: <20231002130150.1497733-9-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 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 List-Id: ether_hostton and ether_ntohost are entry points for nss functionality. This commit moves them from the 'inet' subdirectory to 'nss', and adjusts any references accordingly. --- inet/Makefile | 2 -- inet/Versions | 4 ++-- nss/Makefile | 6 ++++++ nss/Versions | 1 + {inet => nss}/ether_hton.c | 2 +- {inet => nss}/ether_ntoh.c | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) rename {inet => nss}/ether_hton.c (98%) rename {inet => nss}/ether_ntoh.c (98%) diff --git a/inet/Makefile b/inet/Makefile index bd3dc58322..4d053de748 100644 --- a/inet/Makefile +++ b/inet/Makefile @@ -43,11 +43,9 @@ routines := \ deadline \ ether_aton \ ether_aton_r \ - ether_hton \ ether_line \ ether_ntoa \ ether_ntoa_r \ - ether_ntoh \ gethstbyad \ gethstbyad_r \ gethstbynm \ diff --git a/inet/Versions b/inet/Versions index e6d1e6f1ba..a7c1a0fb6f 100644 --- a/inet/Versions +++ b/inet/Versions @@ -10,8 +10,8 @@ libc { endaliasent; endhostent; endnetent; endnetgrent; endprotoent; endservent; # e* - ether_aton; ether_aton_r; ether_hostton; ether_line; ether_ntoa; - ether_ntoa_r; ether_ntohost; + ether_aton; ether_aton_r; ether_line; ether_ntoa; + ether_ntoa_r; # g* getdomainname; gethostbyaddr; gethostbyaddr_r; gethostbyname; diff --git a/nss/Makefile b/nss/Makefile index 2dfa7ebef9..148c6dc1cf 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -68,6 +68,12 @@ CFLAGS-getaliasent_r.c += -fexceptions CFLAGS-getaliasent.c += -fexceptions endif +# ethers routines: +routines += \ + ether_hton \ + ether_ntoh \ + # routines + # grp routines: routines += \ fgetgrent \ diff --git a/nss/Versions b/nss/Versions index 5d1b1dac3d..99208cb9df 100644 --- a/nss/Versions +++ b/nss/Versions @@ -10,6 +10,7 @@ libc { endgrent; endpwent; endspent; + ether_hostton; ether_ntohost; # f* fgetgrent; fgetgrent_r; diff --git a/inet/ether_hton.c b/nss/ether_hton.c similarity index 98% rename from inet/ether_hton.c rename to nss/ether_hton.c index 1b49a57f48..5419464756 100644 --- a/inet/ether_hton.c +++ b/nss/ether_hton.c @@ -20,7 +20,7 @@ #include #include -#include "../nss/nsswitch.h" +#include "nsswitch.h" /* Type of the lookup function we need here. */ typedef int (*lookup_function) (const char *, struct etherent *, char *, int, diff --git a/inet/ether_ntoh.c b/nss/ether_ntoh.c similarity index 98% rename from inet/ether_ntoh.c rename to nss/ether_ntoh.c index 9f9d7c1a63..2f1eb4ec3d 100644 --- a/inet/ether_ntoh.c +++ b/nss/ether_ntoh.c @@ -20,7 +20,7 @@ #include #include -#include +#include /* Type of the lookup function we need here. */ -- 2.41.0