mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-21 12:30:06 +00:00
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:
parent
0ac35d181e
commit
c6b577caef
@ -1353,7 +1353,7 @@ endif
|
|||||||
all-subdirs = csu assert ctype locale intl catgets math setjmp signal \
|
all-subdirs = csu assert ctype locale intl catgets math setjmp signal \
|
||||||
stdlib stdio-common libio malloc string wcsmbs time dirent \
|
stdlib stdio-common libio malloc string wcsmbs time dirent \
|
||||||
posix io termios resource misc socket sysvipc gmon \
|
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 \
|
localedata timezone rt conform debug mathvec support \
|
||||||
dlfcn elf
|
dlfcn elf
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef _SHADOW_H
|
#ifndef _SHADOW_H
|
||||||
#include <shadow/shadow.h>
|
#include <nss/shadow.h>
|
||||||
|
|
||||||
# ifndef _ISOMAC
|
# ifndef _ISOMAC
|
||||||
|
|
||||||
|
27
nss/Makefile
27
nss/Makefile
@ -27,6 +27,7 @@ headers := \
|
|||||||
gshadow.h \
|
gshadow.h \
|
||||||
nss.h \
|
nss.h \
|
||||||
pwd.h \
|
pwd.h \
|
||||||
|
shadow.h \
|
||||||
# headers
|
# headers
|
||||||
|
|
||||||
# This is the trivial part which goes into libc itself.
|
# This is the trivial part which goes into libc itself.
|
||||||
@ -125,6 +126,30 @@ CFLAGS-getpwent.c += -fexceptions
|
|||||||
CFLAGS-getpwent_r.c += -fexceptions
|
CFLAGS-getpwent_r.c += -fexceptions
|
||||||
endif
|
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.
|
# These are the databases that go through nss dispatch.
|
||||||
# Caution: if you add a database here, you must add its real name
|
# Caution: if you add a database here, you must add its real name
|
||||||
# in databases.def, too.
|
# in databases.def, too.
|
||||||
@ -177,7 +202,9 @@ tests := \
|
|||||||
tst-putgrent \
|
tst-putgrent \
|
||||||
tst-putpwent \
|
tst-putpwent \
|
||||||
tst-putsgent \
|
tst-putsgent \
|
||||||
|
tst-putspent \
|
||||||
tst-sgetsgent \
|
tst-sgetsgent \
|
||||||
|
tst-shadow \
|
||||||
# tests
|
# tests
|
||||||
|
|
||||||
xtests = bug-erange
|
xtests = bug-erange
|
||||||
|
13
nss/Versions
13
nss/Versions
@ -9,25 +9,37 @@ libc {
|
|||||||
# e*
|
# e*
|
||||||
endgrent;
|
endgrent;
|
||||||
endpwent;
|
endpwent;
|
||||||
|
endspent;
|
||||||
|
|
||||||
# f*
|
# f*
|
||||||
fgetgrent; fgetgrent_r;
|
fgetgrent; fgetgrent_r;
|
||||||
fgetpwent; fgetpwent_r;
|
fgetpwent; fgetpwent_r;
|
||||||
|
fgetspent; fgetspent_r;
|
||||||
|
|
||||||
# g*
|
# g*
|
||||||
getgrent; getgrent_r; getgrgid; getgrgid_r; getgrnam; getgrnam_r;
|
getgrent; getgrent_r; getgrgid; getgrgid_r; getgrnam; getgrnam_r;
|
||||||
getgroups;
|
getgroups;
|
||||||
getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r;
|
getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r;
|
||||||
|
getspent; getspent_r; getspnam; getspnam_r;
|
||||||
|
|
||||||
# i*
|
# i*
|
||||||
initgroups;
|
initgroups;
|
||||||
|
|
||||||
|
# l*
|
||||||
|
lckpwdf;
|
||||||
|
|
||||||
# p*
|
# p*
|
||||||
putpwent;
|
putpwent;
|
||||||
|
putspent;
|
||||||
|
|
||||||
# s*
|
# s*
|
||||||
setgrent;
|
setgrent;
|
||||||
setpwent;
|
setpwent;
|
||||||
|
setspent;
|
||||||
|
sgetspent; sgetspent_r;
|
||||||
|
|
||||||
|
# u*
|
||||||
|
ulckpwdf;
|
||||||
}
|
}
|
||||||
GLIBC_2.1 {
|
GLIBC_2.1 {
|
||||||
# p*
|
# p*
|
||||||
@ -37,6 +49,7 @@ libc {
|
|||||||
# g*
|
# g*
|
||||||
getgrent_r; getgrgid_r; getgrnam_r;
|
getgrent_r; getgrgid_r; getgrnam_r;
|
||||||
getpwent_r; getpwuid_r; getpwnam_r;
|
getpwent_r; getpwuid_r; getpwnam_r;
|
||||||
|
getspent_r; getspnam_r;
|
||||||
}
|
}
|
||||||
GLIBC_2.2.2 {
|
GLIBC_2.2.2 {
|
||||||
__nss_hostname_digits_dots;
|
__nss_hostname_digits_dots;
|
||||||
|
@ -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
|
|
@ -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;
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user