Remove 'gshadow' and merge into 'nss'

The majority of gshadow routines are entry points for nss functionality.
This commit removes the 'gshadow' subdirectory and moves all
functionality and tests to 'nss'.  References to gshadow/ are
accordingly changed.
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Arjun Shankar 2023-10-02 14:55:16 +02:00
parent b121fdc552
commit 98b107e308
20 changed files with 49 additions and 62 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 \
pwd posix io termios resource misc socket sysvipc gmon \
gnulib iconv iconvdata wctype manual shadow gshadow po argp \
gnulib iconv iconvdata wctype manual shadow po argp \
localedata timezone rt conform debug mathvec support \
dlfcn elf

View File

@ -1,39 +0,0 @@
# Copyright (C) 2009-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 gshadow.
#
subdir := gshadow
include ../Makeconfig
headers = gshadow.h
routines = getsgent getsgnam sgetsgent fgetsgent putsgent \
getsgent_r getsgnam_r sgetsgent_r fgetsgent_r
tests = tst-gshadow tst-putsgent tst-fgetsgent_r tst-sgetsgent
CFLAGS-getsgent_r.c += -fexceptions
CFLAGS-getsgent.c += -fexceptions
CFLAGS-fgetsgent.c += -fexceptions
CFLAGS-fgetsgent_r.c += -fexceptions $(libio-mtsafe)
CFLAGS-putsgent.c += -fexceptions $(libio-mtsafe)
CFLAGS-getsgnam.c += -fexceptions
CFLAGS-getsgnam_r.c += -fexceptions
include ../Rules

View File

@ -1,21 +0,0 @@
libc {
GLIBC_2.10 {
# e*
endsgent;
# f*
fgetsgent; fgetsgent_r;
# g*
getsgent; getsgent_r; getsgnam; getsgnam_r;
# p*
putsgent;
# s*
setsgent;
# s*
sgetsgent; sgetsgent_r;
}
}

View File

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

View File

@ -24,6 +24,7 @@ include ../Makeconfig
headers := \
grp.h \
gshadow.h \
nss.h \
# headers
@ -79,6 +80,29 @@ CFLAGS-initgroups.c += -fexceptions
CFLAGS-putgrent.c += -fexceptions $(libio-mtsafe)
endif
# gshadow routines:
routines += \
fgetsgent \
fgetsgent_r \
getsgent \
getsgent_r \
getsgnam \
getsgnam_r \
putsgent \
sgetsgent \
sgetsgent_r \
# routines
ifeq ($(have-thread-library),yes)
CFLAGS-getsgent_r.c += -fexceptions
CFLAGS-getsgent.c += -fexceptions
CFLAGS-fgetsgent.c += -fexceptions
CFLAGS-fgetsgent_r.c += -fexceptions $(libio-mtsafe)
CFLAGS-putsgent.c += -fexceptions $(libio-mtsafe)
CFLAGS-getsgnam.c += -fexceptions
CFLAGS-getsgnam_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.
@ -118,6 +142,8 @@ tests := \
test-digits-dots \
test-netdb \
testgrp \
tst-fgetsgent_r \
tst-gshadow \
tst-nss-getpwent \
tst-nss-hash \
tst-nss-test1 \
@ -126,6 +152,8 @@ tests := \
tst-nss-test5 \
tst-nss-test_errno \
tst-putgrent \
tst-putsgent \
tst-sgetsgent \
# tests
xtests = bug-erange

View File

@ -37,6 +37,25 @@ libc {
# g*
getgrouplist;
}
GLIBC_2.10 {
# e*
endsgent;
# f*
fgetsgent; fgetsgent_r;
# g*
getsgent; getsgent_r; getsgnam; getsgnam_r;
# p*
putsgent;
# s*
setsgent;
# s*
sgetsgent; sgetsgent_r;
}
GLIBC_2.27 {
}
GLIBC_PRIVATE {