diff options
| author | Petr Vorel <pvorel@suse.cz> | 2020-07-08 13:06:55 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2020-07-08 17:25:57 +0200 |
| commit | ae7a94e5e3edf78f4da562edc05ece229614c716 (patch) | |
| tree | be0969c61080fc1dbd69293944a3362b20db7cff /nss/nsswitch.c | |
| parent | acb527929d0c2b3bb0798472c42ddb3203729708 (diff) | |
| download | glibc-ae7a94e5e3edf78f4da562edc05ece229614c716.zip glibc-ae7a94e5e3edf78f4da562edc05ece229614c716.tar.gz glibc-ae7a94e5e3edf78f4da562edc05ece229614c716.tar.bz2 | |
Remove --enable-obsolete-nsl configure flag
this means that *always* libnsl is only built as shared library for
backward compatibility and the NSS modules libnss_nis and libnss_nisplus
are not built at all, libnsl's headers aren't installed.
This compatibility is kept only for architectures and ABIs that have
been added in or before version 2.28.
Replacement implementations based on TIRPC, which additionally support
IPv6, are available from <https://github.com/thkukuk/>.
This change does not affect libnss_compat which does not depended
on libnsl since 2.27 and thus can be used without NIS.
libnsl code depends on Sun RPC, e.g. on --enable-obsolete-rpc (installed
libnsl headers use installed Sun RPC headers), which will be removed in
the following commit.
Diffstat (limited to 'nss/nsswitch.c')
| -rw-r--r-- | nss/nsswitch.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/nss/nsswitch.c b/nss/nsswitch.c index 319e22c..8d7b69d 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -42,14 +42,6 @@ #include <sysdep.h> #include <config.h> -#ifdef LINK_OBSOLETE_NSL -# define DEFAULT_CONFIG "compat [NOTFOUND=return] files" -# define DEFAULT_DEFCONFIG "nis [NOTFOUND=return] files" -#else -# define DEFAULT_CONFIG "files" -# define DEFAULT_DEFCONFIG "files" -#endif - /* Prototypes for the local functions. */ static name_database *nss_parse_file (const char *fname); static name_database_entry *nss_getline (char *line); @@ -161,7 +153,7 @@ __nss_database_lookup2 (const char *database, const char *alternate_name, or null to use the most common default. */ if (*ni == NULL) { - *ni = nss_parse_service_list (defconfig ?: DEFAULT_DEFCONFIG); + *ni = nss_parse_service_list (defconfig ?: "files"); if (*ni != NULL) { /* Record the memory we've just allocated in defconfig_entries list, @@ -845,8 +837,8 @@ __nss_disable_nscd (void (*cb) (size_t, struct traced_file *)) is_nscd = true; /* Find all the relevant modules so that the init functions are called. */ - nss_load_all_libraries ("passwd", DEFAULT_CONFIG); - nss_load_all_libraries ("group", DEFAULT_CONFIG); + nss_load_all_libraries ("passwd", "files"); + nss_load_all_libraries ("group", "files"); nss_load_all_libraries ("hosts", "dns [!UNAVAIL=return] files"); nss_load_all_libraries ("services", NULL); |