From ee5ed99922ca90bcea4a2f9a48a0c9ae4b534ece Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 19 Jul 2021 07:55:27 +0200 Subject: nss: Directly load nss_dns, without going through dlsym/dlopen This partially fixes static-only NSS support (bug 27959): The dns module no longer needs dlopen. Support for disabling dlopen altogher remains to be added. This commit introduces module_load_builtin into nss/nss_module.c, which handles the common parts of loading the built-in nss_files and nss_dns modules. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- include/nss_dns.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'include/nss_dns.h') diff --git a/include/nss_dns.h b/include/nss_dns.h index 63b5853870..53205b27a6 100644 --- a/include/nss_dns.h +++ b/include/nss_dns.h @@ -24,13 +24,16 @@ NSS_DECLARE_MODULE_FUNCTIONS (dns) libc_hidden_proto (_nss_dns_getcanonname_r) -libc_hidden_proto (_nss_dns_gethostbyname3_r) -libc_hidden_proto (_nss_dns_gethostbyname2_r) -libc_hidden_proto (_nss_dns_gethostbyname_r) -libc_hidden_proto (_nss_dns_gethostbyname4_r) libc_hidden_proto (_nss_dns_gethostbyaddr2_r) libc_hidden_proto (_nss_dns_gethostbyaddr_r) -libc_hidden_proto (_nss_dns_getnetbyname_r) +libc_hidden_proto (_nss_dns_gethostbyname2_r) +libc_hidden_proto (_nss_dns_gethostbyname3_r) +libc_hidden_proto (_nss_dns_gethostbyname4_r) +libc_hidden_proto (_nss_dns_gethostbyname_r) libc_hidden_proto (_nss_dns_getnetbyaddr_r) +libc_hidden_proto (_nss_dns_getnetbyname_r) + +void __nss_dns_functions (nss_module_functions_untyped pointers) + attribute_hidden; #endif -- cgit 1.4.1