about summary refs log tree commit diff
path: root/nscd
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-04-17 08:42:06 +0000
committerUlrich Drepper <drepper@redhat.com>2003-04-17 08:42:06 +0000
commitef4d5b32b37ba6af985d427ee7c120532d62cc6b (patch)
tree945c2817fe187e384b324cc877fa75137441d14f /nscd
parentf542ba5b79d38e5bafa3fcdcae3742b736175a31 (diff)
downloadglibc-ef4d5b32b37ba6af985d427ee7c120532d62cc6b.tar.gz
glibc-ef4d5b32b37ba6af985d427ee7c120532d62cc6b.tar.xz
glibc-ef4d5b32b37ba6af985d427ee7c120532d62cc6b.zip
Update.
2003-04-17  Ulrich Drepper  <drepper@redhat.com>

	* nss/getXXbyYY_r.c [USE_NSCD] (REENTRANT_NAME): Only retry
	contacting nscd if NOT_USENSCD_NAME > 0.
	* nss/nsswitch.c (__nss_disable_nscd): New function.
	* nss/nsswitch.h: Declare it.
	* nss/Versions [GLIBC_PRIVATE]: Export __nss_disable_nscd.
	* nscd/nscd.c (main): Call __nss_disable_nscd.
Diffstat (limited to 'nscd')
-rw-r--r--nscd/nscd.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/nscd/nscd.c b/nscd/nscd.c
index af4b181c7d..97400d1cf1 100644
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -41,6 +41,7 @@
 
 #include "dbg_log.h"
 #include "nscd.h"
+#include "../nss/nsswitch.h"
 #include <device-nrs.h>
 
 /* Get libc version number.  */
@@ -213,6 +214,9 @@ main (int argc, char **argv)
   /* Cleanup files created by a previous `bind'.  */
   unlink (_PATH_NSCDSOCKET);
 
+  /* Make sure we do not get recursive calls.  */
+  __nss_disable_nscd ();
+
   /* Init databases.  */
   nscd_init (conffile);