Remove 'shadow' and merge into 'nss'

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  <adhemerval.zanella@linaro.org>
This commit is contained in:
Arjun Shankar 2023-10-02 14:55:18 +02:00
parent 0ac35d181e
commit c6b577caef
19 changed files with 42 additions and 73 deletions

View File

@ -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

View File

@ -1,5 +1,5 @@
#ifndef _SHADOW_H
#include <shadow/shadow.h>
#include <nss/shadow.h>
# ifndef _ISOMAC

View File

@ -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

View File

@ -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;

View File

@ -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
# <https://www.gnu.org/licenses/>.
#
# 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

View File

@ -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;
}
}