summary refs log tree commit diff
path: root/nss/nsswitch.c
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 /nss/nsswitch.c
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 'nss/nsswitch.c')
-rw-r--r--nss/nsswitch.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 1b3bb23e0b..326687f68a 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1997,1998,1999,2001,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-1999,2001,2002,2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -39,6 +39,7 @@
 #endif
 
 #include "nsswitch.h"
+#include "../nscd/nscd_proto.h"
 
 /* Prototypes for the local functions.  */
 static name_database *nss_parse_file (const char *fname) internal_function;
@@ -696,6 +697,17 @@ nss_new_service (name_database *database, const char *name)
 }
 
 
+/* Called by nscd and nscd alone.  */
+void
+__nss_disable_nscd (void)
+{
+  /* Disable all uses of NSCD.  */
+  __nss_not_use_nscd_passwd = -1;
+  __nss_not_use_nscd_group = -1;
+  __nss_not_use_nscd_hosts = -1;
+}
+
+
 /* Free all resources if necessary.  */
 libc_freeres_fn (free_mem)
 {