Page MenuHomeFreeBSD
Files F142090604

D47143.id144967.diff
No OneTemporary
Actions

D47143.id144967.diff
View Options

diff --git a/lib/libc/net/nsdispatch.c b/lib/libc/net/nsdispatch.c
--- a/lib/libc/net/nsdispatch.c
+++ b/lib/libc/net/nsdispatch.c
@@ -124,10 +124,10 @@
#ifdef NS_CACHING
/*
- * Cache lookup cycle prevention function - if !NULL then no cache lookups
+ * Cache lookup cycle prevention symbol - if !NULL then no cache lookups
* will be made
*/
-static void *nss_cache_cycle_prevention_func = NULL;
+static void *nss_cache_cycle_prevention_sym = NULL;
#endif
/*
@@ -394,8 +394,8 @@
#ifdef NS_CACHING
handle = libc_dlopen(NULL, RTLD_LAZY | RTLD_GLOBAL);
if (handle != NULL) {
- nss_cache_cycle_prevention_func = dlsym(handle,
- "_nss_cache_cycle_prevention_function");
+ nss_cache_cycle_prevention_sym = dlsym(handle,
+ "_nss_cache_cycle_prevention_symbol");
dlclose(handle);
}
#endif
@@ -641,6 +641,13 @@
nss_cache_data cache_data;
nss_cache_data *cache_data_p;
int cache_flag;
+ int cache_start;
+ int is_nscd;
+
+ cache_start = 0;
+ cache_flag = 0;
+ cache_data_p = NULL;
+ is_nscd = nss_cache_cycle_prevention_sym != NULL;
#endif
dbt = NULL;
@@ -685,19 +692,28 @@
srclistsize++;
}
+ for (i = 0; i < srclistsize; i++) {
#ifdef NS_CACHING
- cache_data_p = NULL;
- cache_flag = 0;
+ int is_cache;
+
+ is_cache = strcmp(srclist[i].name, NSSRC_CACHE) == 0;
+
+ if (is_cache) {
+ cache_start = 1;
+
+ if (is_nscd) {
+ /* don't try to call nscd inside nscd */
+ continue;
+ }
+ }
#endif
- for (i = 0; i < srclistsize; i++) {
result = NS_NOTFOUND;
method = nss_method_lookup(srclist[i].name, database,
method_name, disp_tab, &mdata);
if (method != NULL) {
#ifdef NS_CACHING
- if (strcmp(srclist[i].name, NSSRC_CACHE) == 0 &&
- nss_cache_cycle_prevention_func == NULL) {
+ if (is_cache) {
#ifdef NS_STRICT_LIBC_EID_CHECKING
if (issetugid() != 0)
continue;
@@ -733,8 +749,6 @@
va_end(ap);
#endif /* NS_CACHING */
- if (result & (srclist[i].flags))
- break;
} else {
if (fb_method != NULL) {
saved_depth = st->fallback_depth;
@@ -749,10 +763,12 @@
"and no fallback provided",
srclist[i].name, database, method_name);
}
+ if (result & (srclist[i].flags))
+ break;
}
#ifdef NS_CACHING
- if (cache_data_p != NULL &&
+ if (!is_nscd && cache_start && cache_data_p != NULL &&
(result & (NS_NOTFOUND | NS_SUCCESS)) && cache_flag == 0) {
va_start(ap, defaults);
if (result == NS_SUCCESS) {

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 16, 11:22 PM (19 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27672875
Default Alt Text
D47143.id144967.diff (2 KB)

Event Timeline