diff options
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/nss_files_functions.c | 6 | ||||
| -rw-r--r-- | nss/nss_module.c | 58 | ||||
| -rw-r--r-- | nss/nss_module.h | 10 |
3 files changed, 51 insertions, 23 deletions
diff --git a/nss/nss_files_functions.c b/nss/nss_files_functions.c index 85720b4311..46040fff70 100644 --- a/nss/nss_files_functions.c +++ b/nss/nss_files_functions.c @@ -34,10 +34,4 @@ __nss_files_functions (nss_module_functions_untyped pointers) #undef DEFINE_NSS_FUNCTION #define DEFINE_NSS_FUNCTION(x) *fptr++ = _nss_files_##x; #include "function.def" - -#ifdef PTR_MANGLE - void **end = fptr; - for (fptr = pointers; fptr != end; ++fptr) - PTR_MANGLE (*fptr); -#endif } diff --git a/nss/nss_module.c b/nss/nss_module.c index 7ea5ad9887..b28cb94a6a 100644 --- a/nss/nss_module.c +++ b/nss/nss_module.c @@ -26,11 +26,13 @@ #include <dlfcn.h> #include <gnu/lib-names.h> #include <libc-lock.h> +#include <nss_dns.h> +#include <nss_files.h> #include <stddef.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <nss_files.h> +#include <sysdep.h> /* Suffix after .so of NSS service modules. This is a bit of magic, but we assume LIBNSS_FILES_SO looks like "libnss_files.so.2" and we @@ -111,20 +113,12 @@ static const function_name nss_function_name_array[] = #include "function.def" }; +/* Loads a built-in module, binding the symbols using the supplied + callback function. Always returns true. */ static bool -module_load_nss_files (struct nss_module *module) +module_load_builtin (struct nss_module *module, + void (*bind) (nss_module_functions_untyped)) { -#ifdef USE_NSCD - if (is_nscd) - { - void (*cb) (size_t, struct traced_file *) = nscd_init_cb; -# ifdef PTR_DEMANGLE - PTR_DEMANGLE (cb); -# endif - _nss_files_init (cb); - } -#endif - /* Initialize the function pointers, following the double-checked locking idiom. */ __libc_lock_lock (nss_module_list_lock); @@ -132,7 +126,13 @@ module_load_nss_files (struct nss_module *module) { case nss_module_uninitialized: case nss_module_failed: - __nss_files_functions (module->functions.untyped); + bind (module->functions.untyped); + +#ifdef PTR_MANGLE + for (int i = 0; i < nss_module_functions_count; ++i) + PTR_MANGLE (module->functions.untyped[i]); +#endif + module->handle = NULL; /* Synchronizes with unlocked __nss_module_load atomic_load_acquire. */ atomic_store_release (&module->state, nss_module_loaded); @@ -145,12 +145,38 @@ module_load_nss_files (struct nss_module *module) return true; } +/* Loads the built-in nss_files module. */ +static bool +module_load_nss_files (struct nss_module *module) +{ +#ifdef USE_NSCD + if (is_nscd) + { + void (*cb) (size_t, struct traced_file *) = nscd_init_cb; +# ifdef PTR_DEMANGLE + PTR_DEMANGLE (cb); +# endif + _nss_files_init (cb); + } +#endif + return module_load_builtin (module, __nss_files_functions); +} + +/* Loads the built-in nss_dns module. */ +static bool +module_load_nss_dns (struct nss_module *module) +{ + return module_load_builtin (module, __nss_dns_functions); +} + /* Internal implementation of __nss_module_load. */ static bool module_load (struct nss_module *module) { if (strcmp (module->name, "files") == 0) return module_load_nss_files (module); + if (strcmp (module->name, "dns") == 0) + return module_load_nss_dns (module); void *handle; { @@ -398,7 +424,9 @@ __nss_module_freeres (void) struct nss_module *current = nss_module_list; while (current != NULL) { - if (current->state == nss_module_loaded && current->handle != NULL) + /* Ignore built-in modules (which have a NULL handle). */ + if (current->state == nss_module_loaded + && current->handle != NULL) __libc_dlclose (current->handle); struct nss_module *next = current->next; diff --git a/nss/nss_module.h b/nss/nss_module.h index c1a1d90b60..b52c2935d2 100644 --- a/nss/nss_module.h +++ b/nss/nss_module.h @@ -33,10 +33,16 @@ struct nss_module_functions #include "function.def" }; +/* Number of elements of the nss_module_functions_untyped array. */ +enum + { + nss_module_functions_count = (sizeof (struct nss_module_functions) + / sizeof (void *)) + }; + /* Untyped version of struct nss_module_functions, for consistent processing purposes. */ -typedef void *nss_module_functions_untyped[sizeof (struct nss_module_functions) - / sizeof (void *)]; +typedef void *nss_module_functions_untyped[nss_module_functions_count]; /* Locate the nss_files functions, as if by dlopen/dlsym. */ void __nss_files_functions (nss_module_functions_untyped pointers) |