From 9b456c5da968ee832ea4b2b73a18a5bf6d2118a6 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Mon, 15 Feb 2021 21:34:23 -0500 Subject: nss: fix nss_database_lookup2's alternate handling [BZ #27416] __nss_database_lookup2's extra arguments were left unused in the nsswitch reloading patch set; this broke compat (default config ignored) and shadow files (secondary name ignored) which relies on these fallbacks. This patch adds in the previous behavior by correcting the initialization of the database list to reflect the fallbacks. This means that the nss_database_lookup2 interface no longer needs to be passed the fallback info, so API and callers were adjusted. Since all callers needed to be edited anyway, the calls were changed from __nss_database_lookup2 to the faster __nss_database_get. This was an intended optimization which was deferred during the initial lookup changes to avoid touching so many files. The test case verifies that compat targets work (passwd) and that the default configuration works (group). Tested on x86-64. --- nscd/aicache.c | 4 +--- nscd/initgrcache.c | 3 +-- nscd/netgroupcache.c | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'nscd') diff --git a/nscd/aicache.c b/nscd/aicache.c index 1b4245ea53..737ace11cc 100644 --- a/nscd/aicache.c +++ b/nscd/aicache.c @@ -77,9 +77,7 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req, int rc4 = 0; int herrno = 0; - no_more = __nss_database_lookup2 ("hosts", NULL, - "dns [!UNAVAIL=return] files", - &nip); + no_more = !__nss_database_get (nss_database_hosts, &nip); /* Initialize configurations. */ struct resolv_context *ctx = __resolv_context_get (); diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c index f7e326811f..62d7316f70 100644 --- a/nscd/initgrcache.c +++ b/nscd/initgrcache.c @@ -82,8 +82,7 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req, int no_more; if (group_database == NULL) - no_more = __nss_database_lookup2 ("group", NULL, "files", - &group_database); + no_more = !__nss_database_get (nss_database_group, &group_database); else no_more = 0; nip = group_database; diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c index ad2daddafd..2f71bf2999 100644 --- a/nscd/netgroupcache.c +++ b/nscd/netgroupcache.c @@ -143,7 +143,7 @@ addgetnetgrentX (struct database_dyn *db, int fd, request_header *req, *tofreep = NULL; if (netgroup_database == NULL - && __nss_database_lookup2 ("netgroup", NULL, NULL, &netgroup_database)) + && !__nss_database_get (nss_database_netgroup, &netgroup_database)) { /* No such service. */ cacheable = do_notfound (db, fd, req, key, &dataset, &total, &timeout, -- cgit 1.4.1