diff options
author | Ulrich Drepper <drepper@redhat.com> | 2008-04-19 16:42:41 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2008-04-19 16:42:41 +0000 |
commit | c52137d39101515cacb67a2bcd43b77bd06284e0 (patch) | |
tree | 301583f49438de52f3a7cf54676d958b4158ec8f /nscd/Makefile | |
parent | 87a71b8d67e501d422528b8435e733e8e78a165a (diff) | |
download | glibc-c52137d39101515cacb67a2bcd43b77bd06284e0.tar.gz glibc-c52137d39101515cacb67a2bcd43b77bd06284e0.tar.xz glibc-c52137d39101515cacb67a2bcd43b77bd06284e0.zip |
[BZ #5209, BZ #5381]
2008-04-15 Ulrich Drepper <drepper@redhat.com> [BZ #5209] * sysdeps/unix/sysv/linux/times.c: New file. [BZ #5381] * nscd/nscd.h: Define enum in_flight, mem_in_flight, and mem_in_flight_list variables. Add new parameter to mempool_alloc prototype. * nscd/mem.c (mempool_alloc): Take additional parameter. Initialize appropriate mem_in_flight element. (gc): Take allocations which have not yet been committed to the database into account. * nscd/cache.c (cache_add): Add new parameter to mempool_alloc call. Reset mem_in_flight before returning. * nscd/connections.c (nscd_run_worker): Initialize mem_in_flight and cue it up in mem_in_flight_list. * nscd/aicache.c: Adjust mempool_alloc call. * nscd/grpcache.c: Likewise. * nscd/hstcache.c: Likewise. * nscd/initgrcache.c: Likewise. * nscd/pwdcache.c: Likewise. * nscd/servicescache.c: Likewise. * nscd/Makefile (nscd-flags): Until ld is fixed, use -fpic instead of -fpie. * nscd/connections.c (handle_request): Provide better error message in case SELinux forbids the service. * version.h (VERSION): Bump to 2.8.90.
Diffstat (limited to 'nscd/Makefile')
-rw-r--r-- | nscd/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nscd/Makefile b/nscd/Makefile index f83e40049a..74df824769 100644 --- a/nscd/Makefile +++ b/nscd/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1998,2000,2002,2003,2004,2005,2006,2007 +# Copyright (C) 1998,2000,2002,2003,2004,2005,2006,2007,2008 # Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -90,7 +90,8 @@ CFLAGS-nscd_initgroups.c = -fexceptions nscd-cflags = -DIS_IN_nscd=1 -D_FORTIFY_SOURCE=2 ifeq (yesyes,$(have-fpie)$(build-shared)) -nscd-cflags += -fpie +#nscd-cflags += -fpie +nscd-cflags += -fpic endif ifeq (yes,$(have-ssp)) nscd-cflags += -fstack-protector |