Merge changes between r20213 and r20391 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@20392 7b3dc134-2b1b-0410-93df-9e9f96275f8d

11 files changed, 42 insertions, 11 deletions

diff --git a/libc/nscd/Makefile b/libc/nscd/Makefile
index 4e0d9204c..bc2f94530 100644
--- a/libc/nscd/Makefile
+++ b/libc/nscd/Makefile
@@ -22,12 +22,14 @@ include ../option-groups.mak
 
 subdir	:= nscd
 
+include ../Makeconfig
+
+ifneq ($(use-nscd),no)
 routines-$(OPTION_EGLIBC_INET) += \
 	     nscd_getpw_r nscd_getgr_r nscd_gethst_r nscd_getai \
 	    nscd_initgroups nscd_getserv_r nscd_netgroup
 aux-$(OPTION_EGLIBC_INET) += nscd_helper
-
-include ../Makeconfig
+endif
 
 # To find xmalloc.c
 vpath %.c ../locale/programs
@@ -43,7 +45,7 @@ ifneq (y,$(OPTION_EGLIBC_NIS))
 # own copy of nis_hash.
 nscd-modules += nis_hash
 endif
-ifeq ($(have-thread-library),yes)
+ifeq ($(build-nscd)$(have-thread-library),yesyes)
 
 others-$(OPTION_EGLIBC_INET) += nscd
 others-pie-$(OPTION_EGLIBC_INET) += nscd
diff --git a/libc/nscd/gai.c b/libc/nscd/gai.c
index 1c6527cf0..060933293 100644
--- a/libc/nscd/gai.c
+++ b/libc/nscd/gai.c
@@ -32,6 +32,9 @@
 /* nscd uses 1MB or 2MB thread stacks.  */
 #define __libc_use_alloca(size) (size <= __MAX_ALLOCA_CUTOFF)
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef  USE_NSCD
+
 #include <getaddrinfo.c>
 
 /* Support code.  */
diff --git a/libc/nscd/getgrgid_r.c b/libc/nscd/getgrgid_r.c
index 09b6cbf1c..5b433321b 100644
--- a/libc/nscd/getgrgid_r.c
+++ b/libc/nscd/getgrgid_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -25,4 +25,7 @@
 #define ADD_VARIABLES	gid
 #define BUFLEN		NSS_BUFLEN_GROUP
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef	USE_NSCD
+
 #include <nss/getXXbyYY_r.c>
diff --git a/libc/nscd/getgrnam_r.c b/libc/nscd/getgrnam_r.c
index 53e572d13..aff6fcc53 100644
--- a/libc/nscd/getgrnam_r.c
+++ b/libc/nscd/getgrnam_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -24,4 +24,7 @@
 #define ADD_PARAMS	const char *name
 #define ADD_VARIABLES	name
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef	USE_NSCD
+
 #include <nss/getXXbyYY_r.c>
diff --git a/libc/nscd/gethstbyad_r.c b/libc/nscd/gethstbyad_r.c
index bb9fab98e..c0988b862 100644
--- a/libc/nscd/gethstbyad_r.c
+++ b/libc/nscd/gethstbyad_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2000, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -30,6 +30,9 @@
 #define NEED__RES	1
 #define NEED__RES_HCONF 1
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY_r.c"
 
 
diff --git a/libc/nscd/gethstbynm3_r.c b/libc/nscd/gethstbynm3_r.c
index 86038ba77..a7d25548a 100644
--- a/libc/nscd/gethstbynm3_r.c
+++ b/libc/nscd/gethstbynm3_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-1998, 2000, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -40,6 +40,9 @@
 
 #define __inet_aton inet_aton
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY_r.c"
 
 
diff --git a/libc/nscd/getpwnam_r.c b/libc/nscd/getpwnam_r.c
index 7b6c5b31e..06e57044b 100644
--- a/libc/nscd/getpwnam_r.c
+++ b/libc/nscd/getpwnam_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -25,4 +25,7 @@
 #define ADD_VARIABLES	name
 #define BUFLEN		NSS_BUFLEN_PASSWD
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef	USE_NSCD
+
 #include <nss/getXXbyYY_r.c>
diff --git a/libc/nscd/getpwuid_r.c b/libc/nscd/getpwuid_r.c
index f3a01c64f..ce8e2dfef 100644
--- a/libc/nscd/getpwuid_r.c
+++ b/libc/nscd/getpwuid_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -25,4 +25,7 @@
 #define ADD_VARIABLES	uid
 #define BUFLEN		NSS_BUFLEN_PASSWD
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef	USE_NSCD
+
 #include <nss/getXXbyYY_r.c>
diff --git a/libc/nscd/getsrvbynm_r.c b/libc/nscd/getsrvbynm_r.c
index c8b374415..a1c25c705 100644
--- a/libc/nscd/getsrvbynm_r.c
+++ b/libc/nscd/getsrvbynm_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2002, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -24,4 +24,7 @@
 #define ADD_PARAMS		const char *name, const char *proto
 #define ADD_VARIABLES		name, proto
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY_r.c"
diff --git a/libc/nscd/getsrvbypt_r.c b/libc/nscd/getsrvbypt_r.c
index cb73426d8..3c05771f1 100644
--- a/libc/nscd/getsrvbypt_r.c
+++ b/libc/nscd/getsrvbypt_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2002, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -24,4 +24,7 @@
 #define ADD_PARAMS		int port, const char *proto
 #define ADD_VARIABLES		port, proto
 
+/* We are nscd, so we don't want to be talking to ourselves.  */
+#undef	USE_NSCD
+
 #include "../nss/getXXbyYY_r.c"
diff --git a/libc/nscd/nscd.c b/libc/nscd/nscd.c
index c63c878ed..6adb3d819 100644
--- a/libc/nscd/nscd.c
+++ b/libc/nscd/nscd.c
@@ -305,8 +305,10 @@ main (int argc, char **argv)
 # endif
 #endif
 
+#ifdef USE_NSCD
   /* Make sure we do not get recursive calls.  */
   __nss_disable_nscd (register_traced_file);
+#endif
 
   /* Init databases.  */
   nscd_init ();