From 59ed9e85a7c65bb2c7d8e0918d5f290eaf89ec21 Mon Sep 17 00:00:00 2001 From: GNU Libc Maintainers Date: Fri, 26 Jan 2018 22:35:29 +0000 Subject: [PATCH] local-nss-upgrade # DP: This patch makes future upgrades easier. It resolves problems with # DP: running daemons having NSS modules upgraded out from under them. Gbp-Pq: Topic any Gbp-Pq: Name local-nss-upgrade.diff --- nss/nsswitch.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/nss/nsswitch.c b/nss/nsswitch.c index 8f3165852..37d5dd91d 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -358,9 +358,20 @@ nss_load_library (service_user *ni) ni->library->lib_handle = __libc_dlopen (shlib_name); if (ni->library->lib_handle == NULL) { - /* Failed to load the library. */ - ni->library->lib_handle = (void *) -1l; - __set_errno (saved_errno); + /* Failed to load the library. Try a fallback. */ + int n = __snprintf(shlib_name, shlen, "libnss_%s.so.%d.%d", + ni->library->name, __GLIBC__, __GLIBC_MINOR__); + if (n >= shlen) + ni->library->lib_handle = NULL; + else + ni->library->lib_handle = __libc_dlopen (shlib_name); + + if (ni->library->lib_handle == NULL) + { + /* Ok, really fail now. */ + ni->library->lib_handle = (void *) -1l; + __set_errno (saved_errno); + } } # ifdef USE_NSCD else if (is_nscd) -- 2.30.2