From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Tue, 5 May 2020 18:12:38 +0000 (+0100)
Subject: local-nss-upgrade
X-Git-Tag: archive/raspbian/2.30-7+rpi1^2~19
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a58ca6120cfa0882582da482f05dfd2a76596f6a;p=glibc.git

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.

# 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
---

diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index c4a9ffb57..58763112a 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -359,9 +359,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)