From patchwork Mon Oct 2 12:55:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arjun Shankar X-Patchwork-Id: 1842110 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=hD7wM0dR; 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 4Rzh2C4Kb0z1ypV for ; Tue, 3 Oct 2023 00:02:43 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A18D43830B72 for ; Mon, 2 Oct 2023 13:02:41 +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.133.124]) by sourceware.org (Postfix) with ESMTPS id AC75D38560AA for ; Mon, 2 Oct 2023 13:02:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AC75D38560AA 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=1696251731; 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=pQsYY/PaRUVjyfbf7VPMSDsfQbY0C/uFvofik2zi8NY=; b=hD7wM0dR4z2T0jKc/W0G3HTwTnNDLAIM7+s013d/opqyvwErRA9hkqUshMZmXZsLMDvzCD EvsMdAoYZlkFLt1UzHl2o33Wg+OFsH4MkLINswD7POtd/y/H4VlJ047T5NbRS7aCY6OMI8 JCEwf/5FAR9SFrUM7jki1eWzhknyLVM= 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-644-MeJeRsBbMx6g8rkr5cX8wA-1; Mon, 02 Oct 2023 09:02:09 -0400 X-MC-Unique: MeJeRsBbMx6g8rkr5cX8wA-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 C2E7E29AB45C for ; Mon, 2 Oct 2023 13:02:08 +0000 (UTC) Received: from localhost.localdomain (dhcp129-93.brq.redhat.com [10.34.129.93]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A72FC158BA; Mon, 2 Oct 2023 13:02:08 +0000 (UTC) From: Arjun Shankar To: libc-alpha@sourceware.org, Arjun Shankar Subject: [PATCH 06/16] Remove 'shadow' and merge into 'nss' Date: Mon, 2 Oct 2023 14:55:18 +0200 Message-ID: <20231002130150.1497733-7-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, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, 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 majority of shadow routines are entry points for nss functionality. This commit removes the 'shadow' subdirectory and moves all functionality and tests to 'nss'. References to shadow/ are accordingly changed. Reviewed-by: Adhemerval Zanella --- Makeconfig | 2 +- include/shadow.h | 2 +- nss/Makefile | 27 +++++++++++++++++++++++ nss/Versions | 13 +++++++++++ {shadow => nss}/fgetspent.c | 0 {shadow => nss}/fgetspent_r.c | 0 {shadow => nss}/getspent.c | 0 {shadow => nss}/getspent_r.c | 0 {shadow => nss}/getspnam.c | 0 {shadow => nss}/getspnam_r.c | 0 {shadow => nss}/lckpwdf.c | 0 {shadow => nss}/putspent.c | 0 {shadow => nss}/sgetspent.c | 0 {shadow => nss}/sgetspent_r.c | 0 {shadow => nss}/shadow.h | 0 {shadow => nss}/tst-putspent.c | 0 {shadow => nss}/tst-shadow.c | 0 shadow/Makefile | 40 ---------------------------------- shadow/Versions | 31 -------------------------- 19 files changed, 42 insertions(+), 73 deletions(-) rename {shadow => nss}/fgetspent.c (100%) rename {shadow => nss}/fgetspent_r.c (100%) rename {shadow => nss}/getspent.c (100%) rename {shadow => nss}/getspent_r.c (100%) rename {shadow => nss}/getspnam.c (100%) rename {shadow => nss}/getspnam_r.c (100%) rename {shadow => nss}/lckpwdf.c (100%) rename {shadow => nss}/putspent.c (100%) rename {shadow => nss}/sgetspent.c (100%) rename {shadow => nss}/sgetspent_r.c (100%) rename {shadow => nss}/shadow.h (100%) rename {shadow => nss}/tst-putspent.c (100%) rename {shadow => nss}/tst-shadow.c (100%) delete mode 100644 shadow/Makefile delete mode 100644 shadow/Versions diff --git a/Makeconfig b/Makeconfig index e5badddbc4..fc35aee10b 100644 --- a/Makeconfig +++ b/Makeconfig @@ -1353,7 +1353,7 @@ endif all-subdirs = csu assert ctype locale intl catgets math setjmp signal \ stdlib stdio-common libio malloc string wcsmbs time dirent \ posix io termios resource misc socket sysvipc gmon \ - gnulib iconv iconvdata wctype manual shadow po argp \ + gnulib iconv iconvdata wctype manual po argp \ localedata timezone rt conform debug mathvec support \ dlfcn elf diff --git a/include/shadow.h b/include/shadow.h index fb1681909f..bbb8be2ff0 100644 --- a/include/shadow.h +++ b/include/shadow.h @@ -1,5 +1,5 @@ #ifndef _SHADOW_H -#include +#include # ifndef _ISOMAC diff --git a/nss/Makefile b/nss/Makefile index 28648ea884..84cf62af2b 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -27,6 +27,7 @@ headers := \ gshadow.h \ nss.h \ pwd.h \ + shadow.h \ # headers # This is the trivial part which goes into libc itself. @@ -125,6 +126,30 @@ CFLAGS-getpwent.c += -fexceptions CFLAGS-getpwent_r.c += -fexceptions endif +# shadow routines +routines += \ + fgetspent \ + fgetspent_r \ + getspent \ + getspent_r \ + getspnam \ + getspnam_r \ + lckpwdf \ + putspent \ + sgetspent \ + sgetspent_r \ + # routines + +ifeq ($(have-thread-library),yes) +CFLAGS-getspent_r.c += -fexceptions +CFLAGS-getspent.c += -fexceptions +CFLAGS-fgetspent.c += -fexceptions +CFLAGS-fgetspent_r.c += -fexceptions $(libio-mtsafe) +CFLAGS-putspent.c += -fexceptions $(libio-mtsafe) +CFLAGS-getspnam.c += -fexceptions +CFLAGS-getspnam_r.c += -fexceptions +endif + # These are the databases that go through nss dispatch. # Caution: if you add a database here, you must add its real name # in databases.def, too. @@ -177,7 +202,9 @@ tests := \ tst-putgrent \ tst-putpwent \ tst-putsgent \ + tst-putspent \ tst-sgetsgent \ + tst-shadow \ # tests xtests = bug-erange diff --git a/nss/Versions b/nss/Versions index 58ca73c9df..632af25be4 100644 --- a/nss/Versions +++ b/nss/Versions @@ -9,25 +9,37 @@ libc { # e* endgrent; endpwent; + endspent; # f* fgetgrent; fgetgrent_r; fgetpwent; fgetpwent_r; + fgetspent; fgetspent_r; # g* getgrent; getgrent_r; getgrgid; getgrgid_r; getgrnam; getgrnam_r; getgroups; getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r; + getspent; getspent_r; getspnam; getspnam_r; # i* initgroups; + # l* + lckpwdf; + # p* putpwent; + putspent; # s* setgrent; setpwent; + setspent; + sgetspent; sgetspent_r; + + # u* + ulckpwdf; } GLIBC_2.1 { # p* @@ -37,6 +49,7 @@ libc { # g* getgrent_r; getgrgid_r; getgrnam_r; getpwent_r; getpwuid_r; getpwnam_r; + getspent_r; getspnam_r; } GLIBC_2.2.2 { __nss_hostname_digits_dots; diff --git a/shadow/fgetspent.c b/nss/fgetspent.c similarity index 100% rename from shadow/fgetspent.c rename to nss/fgetspent.c diff --git a/shadow/fgetspent_r.c b/nss/fgetspent_r.c similarity index 100% rename from shadow/fgetspent_r.c rename to nss/fgetspent_r.c diff --git a/shadow/getspent.c b/nss/getspent.c similarity index 100% rename from shadow/getspent.c rename to nss/getspent.c diff --git a/shadow/getspent_r.c b/nss/getspent_r.c similarity index 100% rename from shadow/getspent_r.c rename to nss/getspent_r.c diff --git a/shadow/getspnam.c b/nss/getspnam.c similarity index 100% rename from shadow/getspnam.c rename to nss/getspnam.c diff --git a/shadow/getspnam_r.c b/nss/getspnam_r.c similarity index 100% rename from shadow/getspnam_r.c rename to nss/getspnam_r.c diff --git a/shadow/lckpwdf.c b/nss/lckpwdf.c similarity index 100% rename from shadow/lckpwdf.c rename to nss/lckpwdf.c diff --git a/shadow/putspent.c b/nss/putspent.c similarity index 100% rename from shadow/putspent.c rename to nss/putspent.c diff --git a/shadow/sgetspent.c b/nss/sgetspent.c similarity index 100% rename from shadow/sgetspent.c rename to nss/sgetspent.c diff --git a/shadow/sgetspent_r.c b/nss/sgetspent_r.c similarity index 100% rename from shadow/sgetspent_r.c rename to nss/sgetspent_r.c diff --git a/shadow/shadow.h b/nss/shadow.h similarity index 100% rename from shadow/shadow.h rename to nss/shadow.h diff --git a/shadow/tst-putspent.c b/nss/tst-putspent.c similarity index 100% rename from shadow/tst-putspent.c rename to nss/tst-putspent.c diff --git a/shadow/tst-shadow.c b/nss/tst-shadow.c similarity index 100% rename from shadow/tst-shadow.c rename to nss/tst-shadow.c diff --git a/shadow/Makefile b/shadow/Makefile deleted file mode 100644 index 0102a4d0e3..0000000000 --- a/shadow/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (C) 1996-2023 Free Software Foundation, Inc. -# This file is part of the GNU C Library. - -# The GNU C Library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. - -# The GNU C Library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. - -# You should have received a copy of the GNU Lesser General Public -# License along with the GNU C Library; if not, see -# . - -# -# Makefile for shadow. -# -subdir := shadow - -include ../Makeconfig - -headers = shadow.h -routines = getspent getspnam sgetspent fgetspent putspent \ - getspent_r getspnam_r sgetspent_r fgetspent_r \ - lckpwdf - -tests = tst-shadow tst-putspent - -CFLAGS-getspent_r.c += -fexceptions -CFLAGS-getspent.c += -fexceptions -CFLAGS-fgetspent.c += -fexceptions -CFLAGS-fgetspent_r.c += -fexceptions $(libio-mtsafe) -CFLAGS-putspent.c += -fexceptions $(libio-mtsafe) -CFLAGS-getspnam.c += -fexceptions -CFLAGS-getspnam_r.c += -fexceptions - -include ../Rules diff --git a/shadow/Versions b/shadow/Versions deleted file mode 100644 index 38ab368fff..0000000000 --- a/shadow/Versions +++ /dev/null @@ -1,31 +0,0 @@ -libc { - GLIBC_2.0 { - # e* - endspent; - - # f* - fgetspent; fgetspent_r; - - # g* - getspent; getspent_r; getspnam; getspnam_r; - - # l* - lckpwdf; - - # p* - putspent; - - # s* - setspent; - - # s* - sgetspent; sgetspent_r; - - # u* - ulckpwdf; - } - GLIBC_2.1.2 { - # g* - getspent_r; getspnam_r; - } -}