diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-09-17 00:04:18 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-09-17 00:04:18 +0000 |
| commit | 74a30a5851087f40ff53f2716374c8870cd4a48a (patch) | |
| tree | 2ac1d833b6114746a43a48d3113ebf8d1df4b571 /nscd/Makefile | |
| parent | 2fff3d93b552dbddc406c41786ecfd0a1074b564 (diff) | |
| download | glibc-74a30a5851087f40ff53f2716374c8870cd4a48a.tar.gz glibc-74a30a5851087f40ff53f2716374c8870cd4a48a.tar.xz glibc-74a30a5851087f40ff53f2716374c8870cd4a48a.zip | |
Update.
2004-09-16 Ulrich Drepper <drepper@redhat.com> * configure.in: Add test for required SELinux features. * config.make.in: Add have-selinux entry. * config.h.in: Add HAVE_SELINUX entry. * nscd/Makefile (nscd-modules): Add selinux. (CFLAGS-selinux.c): Add -fpie. Define selinux-LIBS and use in link line. * nscd/connections.c (handle_request): Check access SELinux permissions before processing request. * nscd/nscd.c (main): Initialize selinux_enabled and stop avc thread. * nscd/nscd_stat.c: Transmit and print AVC statistics. * nscd/selinux.c: New file. * nscd/selinux.h: New file. 2004-09-16 Jakub Jelinek <jakub@redhat.com> * nscd/nscd_helper.c (__nscd_unmap, get_mapping): Use __munmap instead of munmap. * nscd/Makefile (CFLAGS-aicache.c): Set to -fpie. 2004-09-16 Thorsten Kukuk <kukuk@suse.de> * sysdeps/posix/getaddrinfo.c (gaih_inet): Check __nss_not_use_nscd_hosts variable if nscd should be used or not. 2004-09-16 Ulrich Drepper <drepper@redhat.com> * nscd/nscd_proto.h: Define NSS_NSCD_RETRY. Add __nscd_getai prototype. * nss/getXXbyYY_r.c: Remode definition of NSS_NSCD_RETRY. * nscd/nscd-client.h: Remove __nscd_getai prototype. * nscd/nscd_getai.c: Include nscd_proto.h. * elf/ldd.bash.in: Add support for SELinux environments. Patch by Stephen Smalley <sds@epoch.ncsc.mil>.
Diffstat (limited to 'nscd/Makefile')
| -rw-r--r-- | nscd/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nscd/Makefile b/nscd/Makefile index 3e6a8b5182..d24bf9c2a6 100644 --- a/nscd/Makefile +++ b/nscd/Makefile @@ -51,6 +51,11 @@ otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \ $(resolvobjdir)/libresolv.a endif +ifeq (yes,$(have-selinux)) +nscd-modules += selinux +selinux-LIBS := -lselinux +endif + distribute := nscd.h nscd-client.h dbg_log.h \ $(addsuffix .c, $(filter-out xmalloc, $(nscd-modules))) \ nscd_nischeck.c TODO nscd.conf nscd.init nscd_proto.h \ @@ -83,6 +88,7 @@ CFLAGS-xstrdup.c = -fpie CFLAGS-mem.c = -fpie CFLAGS-nscd_setup_thread.c = -fpie CFLAGS-aicache.c = -fpie +CFLAGS-selinux.c = -fpie $(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o)) $(LINK.o) -pie -Wl,-O1 \ @@ -91,7 +97,7 @@ $(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o)) $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \ $(LDFLAGS) $(LDFLAGS-$(@F)) \ -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) \ - -o $@ $^ $(common-objpfx)libc_nonshared.a + -o $@ $^ $(selinux-LIBS) $(common-objpfx)libc_nonshared.a endif # This makes sure -DNOT_IN_libc is passed for all these modules. |