mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 11:43:34 +08:00
9b456c5da9
__nss_database_lookup2's extra arguments were left unused in the nsswitch reloading patch set; this broke compat (default config ignored) and shadow files (secondary name ignored) which relies on these fallbacks. This patch adds in the previous behavior by correcting the initialization of the database list to reflect the fallbacks. This means that the nss_database_lookup2 interface no longer needs to be passed the fallback info, so API and callers were adjusted. Since all callers needed to be edited anyway, the calls were changed from __nss_database_lookup2 to the faster __nss_database_get. This was an intended optimization which was deferred during the initial lookup changes to avoid touching so many files. The test case verifies that compat targets work (passwd) and that the default configuration works (group). Tested on x86-64.
191 lines
6.0 KiB
Makefile
191 lines
6.0 KiB
Makefile
# Copyright (C) 1996-2021 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 name service switch.
|
|
#
|
|
subdir := nss
|
|
|
|
include ../Makeconfig
|
|
|
|
headers := nss.h
|
|
|
|
# This is the trivial part which goes into libc itself.
|
|
routines = nsswitch getnssent getnssent_r digits_dots \
|
|
valid_field valid_list_field rewrite_field \
|
|
$(addsuffix -lookup,$(databases)) \
|
|
compat-lookup nss_hash nss_files_fopen \
|
|
nss_readline nss_parse_line_result \
|
|
nss_fgetent_r nss_module nss_action \
|
|
nss_action_parse nss_database
|
|
|
|
# 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.
|
|
databases = proto service hosts network grp pwd ethers \
|
|
spwd netgrp alias sgrp
|
|
|
|
ifneq (,$(filter sunrpc,$(subdirs)))
|
|
databases += key rpc
|
|
have-sunrpc := 1
|
|
else
|
|
have-sunrpc := 0
|
|
endif
|
|
CPPFLAGS-getent.c = -DHAVE_SUNRPC=$(have-sunrpc)
|
|
|
|
others := getent makedb
|
|
install-bin := getent makedb
|
|
makedb-modules = xmalloc hash-string
|
|
others-extras = $(makedb-modules)
|
|
extra-objs += $(makedb-modules:=.o)
|
|
|
|
tests-static = tst-field
|
|
tests-internal = tst-field
|
|
tests = test-netdb test-digits-dots tst-nss-getpwent bug17079 \
|
|
tst-nss-test1 \
|
|
tst-nss-test2 \
|
|
tst-nss-test4 \
|
|
tst-nss-test5
|
|
xtests = bug-erange
|
|
|
|
tests-container = \
|
|
tst-nss-compat1 \
|
|
tst-nss-test3 \
|
|
tst-nss-files-hosts-long \
|
|
tst-nss-db-endpwent \
|
|
tst-nss-db-endgrent \
|
|
tst-reload1 tst-reload2
|
|
|
|
# Tests which need libdl
|
|
ifeq (yes,$(build-shared))
|
|
tests += tst-nss-files-hosts-erange
|
|
tests += tst-nss-files-hosts-multi
|
|
tests += tst-nss-files-hosts-getent
|
|
tests += tst-nss-files-alias-leak
|
|
tests += tst-nss-files-alias-truncated
|
|
endif
|
|
|
|
# If we have a thread library then we can test cancellation against
|
|
# some routines like getpwuid_r.
|
|
ifeq (yes,$(have-thread-library))
|
|
tests += tst-cancel-getpwuid_r
|
|
endif
|
|
|
|
# Specify rules for the nss_* modules. We have some services.
|
|
services := files db compat
|
|
|
|
extra-libs = $(services:%=libnss_%)
|
|
# These libraries will be built in the `others' pass rather than
|
|
# the `lib' pass, because they depend on libc.so being built already.
|
|
extra-libs-others = $(extra-libs)
|
|
|
|
# The sources are found in the appropriate subdir.
|
|
subdir-dirs = $(services:%=nss_%)
|
|
vpath %.c $(subdir-dirs) ../locale/programs ../intl
|
|
|
|
|
|
libnss_files-routines := $(addprefix files-, \
|
|
$(filter-out key, $(databases))) \
|
|
files-initgroups files-init
|
|
|
|
libnss_db-dbs := $(addprefix db-,\
|
|
$(filter-out hosts network key alias,\
|
|
$(databases))) \
|
|
db-initgroups
|
|
libnss_db-routines := $(libnss_db-dbs) db-open db-init hash-string
|
|
generated += $(filter-out db-alias.c db-netgrp.c, \
|
|
$(addsuffix .c,$(libnss_db-dbs)))
|
|
|
|
libnss_compat-routines := $(addprefix compat-,grp pwd spwd initgroups) \
|
|
nisdomain
|
|
|
|
install-others += $(inst_vardbdir)/Makefile
|
|
|
|
# Build static module into libc if requested
|
|
libnss_files-inhibit-o = $(filter-out .os,$(object-suffixes))
|
|
libnss_db-inhibit-o = $(filter-out .os,$(object-suffixes))
|
|
libnss_compat-inhibit-o = $(filter-out .os,$(object-suffixes))
|
|
ifeq ($(build-static-nss),yes)
|
|
routines += $(libnss_files-routines)
|
|
static-only-routines += $(libnss_files-routines)
|
|
tests-static += tst-nss-static
|
|
endif
|
|
extra-test-objs += nss_test1.os nss_test2.os
|
|
|
|
include ../Rules
|
|
|
|
ifeq (yes,$(have-selinux))
|
|
LDLIBS-makedb := -lselinux
|
|
endif
|
|
|
|
libnss-libc = $(common-objpfx)linkobj/libc.so
|
|
# Target-specific variable setting to link objects using deprecated
|
|
# RPC interfaces with the version of libc.so that makes them available
|
|
# for new links:
|
|
$(services:%=$(objpfx)libnss_%.so): libc-for-link = $(libnss-libc)
|
|
|
|
$(objpfx)libnss_db.so: $(objpfx)libnss_files.so
|
|
|
|
$(libnss_db-dbs:%=$(objpfx)%.c): $(objpfx)db-%.c: nss_files/files-%.c
|
|
@rm -f $@.new
|
|
(echo '#define EXTERN_PARSER';\
|
|
echo '#define GENERIC "../nss_db/db-XXX.c"';\
|
|
echo '#include "$<"') > $@.new
|
|
mv -f $@.new $@
|
|
|
|
|
|
$(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o)
|
|
|
|
$(inst_vardbdir)/Makefile: db-Makefile $(+force)
|
|
$(do-install)
|
|
|
|
libnss_test1.so-no-z-defs = 1
|
|
libnss_test2.so-no-z-defs = 1
|
|
|
|
rtld-tests-LDFLAGS += -Wl,--dynamic-list=nss_test.ver
|
|
|
|
libof-nss_test1 = extramodules
|
|
libof-nss_test2 = extramodules
|
|
$(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps)
|
|
$(build-module)
|
|
$(objpfx)/libnss_test2.so: $(objpfx)nss_test2.os $(link-libc-deps)
|
|
$(build-module)
|
|
$(objpfx)nss_test2.os : nss_test1.c
|
|
ifdef libnss_test1.so-version
|
|
$(objpfx)/libnss_test1.so$(libnss_test1.so-version): $(objpfx)/libnss_test1.so
|
|
$(make-link)
|
|
endif
|
|
ifdef libnss_test2.so-version
|
|
$(objpfx)/libnss_test2.so$(libnss_test2.so-version): $(objpfx)/libnss_test2.so
|
|
$(make-link)
|
|
endif
|
|
$(patsubst %,$(objpfx)%.out,$(tests) $(tests-container)) : \
|
|
$(objpfx)/libnss_test1.so$(libnss_test1.so-version) \
|
|
$(objpfx)/libnss_test2.so$(libnss_test2.so-version)
|
|
|
|
ifeq (yes,$(have-thread-library))
|
|
$(objpfx)tst-cancel-getpwuid_r: $(shared-thread-library)
|
|
endif
|
|
|
|
$(objpfx)tst-nss-files-hosts-erange: $(libdl)
|
|
$(objpfx)tst-nss-files-hosts-multi: $(libdl)
|
|
$(objpfx)tst-nss-files-hosts-getent: $(libdl)
|
|
$(objpfx)tst-nss-files-alias-leak: $(libdl)
|
|
$(objpfx)tst-nss-files-alias-leak.out: $(objpfx)/libnss_files.so
|
|
$(objpfx)tst-nss-files-alias-truncated: $(libdl)
|
|
$(objpfx)tst-nss-files-alias-truncated.out: $(objpfx)/libnss_files.so
|