mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 01:00:07 +00:00
384ca55174
gethstbynm3_r. * nscd/gethstbynm2_r.c: Remove. * nscd/gethstbynm3_r.c: New file. * nscd/aicache.c (addhstaiX): Use __gethostbyaddr2_r instead of __gethostbyaddr_r. * nscd/gethstbyad_r.c: Generate __gethostbyaddr2_r function. Define __gethostbyaddr_r compatibility wrapper. * nscd/hstcache.c (cache_addhst): Add ttl parameter. Use it when determining timeout of entry. (lookup): Take new parameter and pass it to __gethostbyname3_r and __gethostbyaddr2_r. (addhstbyX): Pass reference to variable for TTL to lookup and cache_addhst. * nss/Versions [glibc] (GLIBC_PRIVATE): Export __nss_passwd_lookup2, __nss_group_lookup2, __nss_hosts_lookup2, __nss_services_lookup2, and __nss_next2. Remove __nss_services_lookup. * nss/XXX-lookup.c: Name function now *_lookup2. Add new parameter. Add compat wrapper. * nss/getXXbyYY_r.c: Changes to call new *_lookup2 functions and __nss_next2. * nss/getXXent_r.c: Likewise. * nss/getnssent_r.c: Likewise. * nss/nsswitch.c (__nss_lookup): Add new parameter. If first function does not exist in module, try the optional second name. (__nss_next2): New function. (__nss_next): Now wrapper around __nss_next2. * nss/nsswitch.h: Adjust __nss_lookup prototype. Declare __nss_next2. Adjust definition of db_lookup_function type. * nss/service-lookup.c: Define NO_COMPAT. * include/netdb.h: Declare __gethostbyaddr2_r and __gethostbyname3_r. * inet/ether_hton.c: Use __nss_next2 instead of __nss_next. * inet/ether_ntoh.c: Likewise. * sunrpc/netname.c: Likewise. * sunrpc/publickey.c: Likewise. * inet/getnetgrent.c: Likewise. Adjust calls to __nss_lookup. * inet/gethstbyad_r.c (DB_LOOKUP_FCT): Change to __nss_hosts_lookup2. * inet/gethstbynm2_r.c (DB_LOOKUP_FCT): Likewise. * inet/gethstbynm_r.c (DB_LOOKUP_FCT): Likewise. * inet/gethstent_r.c (DB_LOOKUP_FCT): Likewise. * nscd/aicache.c (addhstaiX): Fix default TTL handling. * inet/getnetgrent.c (setup): Encrypt static pointer.
154 lines
4.8 KiB
Makefile
154 lines
4.8 KiB
Makefile
# Copyright (C) 1998,2000,2002,2003,2004,2005,2006,2007
|
|
# 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, write to the Free
|
|
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
# 02111-1307 USA.
|
|
|
|
#
|
|
# Sub-makefile for nscd portion of the library.
|
|
#
|
|
subdir := nscd
|
|
|
|
routines := nscd_getpw_r nscd_getgr_r nscd_gethst_r nscd_getai \
|
|
nscd_initgroups nscd_getserv_r
|
|
aux := nscd_helper
|
|
|
|
include ../Makeconfig
|
|
|
|
# To find xmalloc.c
|
|
vpath %.c ../locale/programs
|
|
|
|
nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
|
|
getgrnam_r getgrgid_r hstcache gethstbyad_r gethstbynm3_r \
|
|
getsrvbynm_r getsrvbypt_r servicescache \
|
|
dbg_log nscd_conf nscd_stat cache mem nscd_setup_thread \
|
|
xmalloc xstrdup aicache initgrcache gai res_hconf
|
|
|
|
ifeq ($(have-thread-library),yes)
|
|
|
|
ifneq (yesyes,$(have-fpie)$(build-shared))
|
|
others += nscd
|
|
endif
|
|
install-sbin := nscd
|
|
|
|
extra-objs := $(nscd-modules:=.o)
|
|
|
|
endif
|
|
|
|
ifeq (yes,$(build-static-nss))
|
|
otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
|
|
$(resolvobjdir)/libresolv.a
|
|
endif
|
|
|
|
all-nscd-modules := $(nscd-modules) selinux
|
|
ifeq (yes,$(have-selinux))
|
|
ifeq (yes,$(have-libaudit))
|
|
libaudit = -laudit
|
|
ifeq (yes,$(have-libcap))
|
|
libcap = -lcap
|
|
endif
|
|
endif
|
|
|
|
nscd-modules += selinux
|
|
selinux-LIBS := -lselinux $(libaudit) $(libcap)
|
|
|
|
# The configure.in check for libselinux and its headers did not use
|
|
# $SYSINCLUDES. The directory specified by --with-headers usually
|
|
# contains only the basic kernel interface headers, not something like
|
|
# libselinux. So the simplest thing is to presume that the standard
|
|
# system headers will be ok for this file.
|
|
$(objpfx)nscd_stat.o: sysincludes = # nothing
|
|
$(objpfx)selinux.o: sysincludes = # nothing
|
|
endif
|
|
|
|
LDLIBS-nscd = $(selinux-LIBS)
|
|
|
|
distribute := nscd.h nscd-client.h dbg_log.h \
|
|
$(addsuffix .c, $(filter-out xmalloc,$(all-nscd-modules))) \
|
|
nscd.conf nscd.init nscd_proto.h nscd-types.h
|
|
|
|
include ../Rules
|
|
|
|
CFLAGS-nscd_getpw_r.c = -fexceptions
|
|
CFLAGS-nscd_getgr_r.c = -fexceptions
|
|
CFLAGS-nscd_gethst_r.c = -fexceptions
|
|
CFLAGS-nscd_getai.c = -fexceptions
|
|
CFLAGS-nscd_initgroups.c = -fexceptions
|
|
|
|
nscd-cflags = -DIS_IN_nscd=1 -D_FORTIFY_SOURCE=2
|
|
ifeq (yesyes,$(have-fpie)$(build-shared))
|
|
nscd-cflags += -fpie
|
|
endif
|
|
ifeq (yes,$(have-ssp))
|
|
nscd-cflags += -fstack-protector
|
|
endif
|
|
|
|
CFLAGS-nscd.c += $(nscd-cflags)
|
|
CFLAGS-connections.c += $(nscd-cflags)
|
|
CFLAGS-pwdcache.c += $(nscd-cflags)
|
|
CFLAGS-getpwnam_r.c += $(nscd-cflags)
|
|
CFLAGS-getpwuid_r.c += $(nscd-cflags)
|
|
CFLAGS-grpcache.c += $(nscd-cflags)
|
|
CFLAGS-getgrnam_r.c += $(nscd-cflags)
|
|
CFLAGS-getgrgid_r.c += $(nscd-cflags)
|
|
CFLAGS-hstcache.c += $(nscd-cflags)
|
|
CFLAGS-gethstbyad_r.c += $(nscd-cflags)
|
|
CFLAGS-gethstbynm3_r.c += $(nscd-cflags)
|
|
CFLAGS-dbg_log.c += $(nscd-cflags)
|
|
CFLAGS-nscd_conf.c += $(nscd-cflags)
|
|
CFLAGS-nscd_stat.c += $(nscd-cflags)
|
|
CFLAGS-cache.c += $(nscd-cflags)
|
|
CFLAGS-xmalloc.c += $(nscd-cflags)
|
|
CFLAGS-xstrdup.c += $(nscd-cflags)
|
|
CFLAGS-mem.c += $(nscd-cflags)
|
|
CFLAGS-nscd_setup_thread.c += $(nscd-cflags)
|
|
CFLAGS-aicache.c += $(nscd-cflags)
|
|
CFLAGS-selinux.c += $(nscd-cflags)
|
|
CFLAGS-initgrcache.c += $(nscd-cflags)
|
|
CFLAGS-gai.c += $(nscd-cflags)
|
|
CFLAGS-servicescache.c += $(nscd-cflags)
|
|
CFLAGS-getsrvbynm_r.c += $(nscd-cflags)
|
|
CFLAGS-getsrvbypt_r.c += $(nscd-cflags)
|
|
CFLAGS-res_hconf.c += $(nscd-cflags)
|
|
|
|
ifeq (yesyes,$(have-fpie)$(build-shared))
|
|
relro-LDFLAGS += -Wl,-z,now
|
|
|
|
$(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o))
|
|
$(LINK.o) -pie -Wl,-O1 $(nscd-cflags) \
|
|
$(sysdep-LDFLAGS) $(config-LDFLAGS) $(relro-LDFLAGS) \
|
|
$(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \
|
|
$(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \
|
|
$(LDFLAGS) $(LDFLAGS-$(@F)) \
|
|
-L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) \
|
|
-o $@ $^ $(LDLIBS-nscd) $(common-objpfx)libc_nonshared.a
|
|
endif
|
|
|
|
# This makes sure -DNOT_IN_libc is passed for all these modules.
|
|
cpp-srcs-left := $(nscd-modules:=.c)
|
|
lib := nonlib
|
|
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
|
|
|
|
$(objpfx)nscd: $(nscd-modules:%=$(objpfx)%.o)
|
|
|
|
ifeq ($(build-shared),yes)
|
|
$(objpfx)nscd: $(common-objpfx)rt/librt.so $(shared-thread-library) \
|
|
$(common-objpfx)nis/libnsl.so
|
|
else
|
|
$(objpfx)nscd: $(common-objpfx)rt/librt.a $(static-thread-library) \
|
|
$(common-objpfx)nis/libnsl.a
|
|
endif
|