lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

BZ#13696: Add --disable-nscd configure option.

Browse Source
This commit is contained in:
Roland McGrath
2012-08-22 13:31:12 -07:00
parent 07e5155066
commit 3cc3ef96d6
17 changed files with 164 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nss/nsswitch.c
View File

@ -92,10 +92,12 @@ static name_database *service_table;
static name_database_entry *defconfig_entries;
#ifdef USE_NSCD
/* Nonzero if this is the nscd process. */
static bool is_nscd;
/* The callback passed to the init functions when nscd is used. */
static void (*nscd_init_cb) (size_t, struct traced_file *);
#endif
/* -1 == database not found
@ -358,6 +360,7 @@ nss_load_library (service_user *ni)
ni->library->lib_handle = (void *) -1l;
__set_errno (saved_errno);
}
# ifdef USE_NSCD
else if (is_nscd)
{
/* Call the init function when nscd is used. */
@ -377,12 +380,13 @@ nss_load_library (service_user *ni)
if (ifct != NULL)
{
void (*cb) (size_t, struct traced_file *) = nscd_init_cb;
# ifdef PTR_DEMANGLE
# ifdef PTR_DEMANGLE
PTR_DEMANGLE (cb);
# endif
# endif
ifct (cb);
}
}
# endif
}
return 0;
@ -808,7 +812,7 @@ nss_new_service (name_database *database, const char *name)
}
#ifdef SHARED
#if defined SHARED && defined USE_NSCD
/* Load all libraries for the service. */
static void
nss_load_all_libraries (const char *service, const char *def)