diff options
| author | DJ Delorie <dj@redhat.com> | 2021-02-15 21:34:23 -0500 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2021-03-09 14:34:50 -0500 |
| commit | 9b456c5da968ee832ea4b2b73a18a5bf6d2118a6 (patch) | |
| tree | e0f9e838dd5862499207e16cf6e8b3d15d49d374 /sysdeps/posix | |
| parent | 24eb3be5db5befefe4bcf0f438bf6629a9c3a608 (diff) | |
| download | glibc-9b456c5da968ee832ea4b2b73a18a5bf6d2118a6.tar.gz glibc-9b456c5da968ee832ea4b2b73a18a5bf6d2118a6.tar.xz glibc-9b456c5da968ee832ea4b2b73a18a5bf6d2118a6.zip | |
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.
Diffstat (limited to 'sysdeps/posix')
| -rw-r--r-- | sysdeps/posix/getaddrinfo.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index 92d2a1c284..b7e1aee80f 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -720,9 +720,7 @@ gaih_inet (const char *name, const struct gaih_service *service, } #endif - no_more = __nss_database_lookup2 ("hosts", NULL, - "dns [!UNAVAIL=return] files", - &nip); + no_more = !__nss_database_get (nss_database_hosts, &nip); /* If we are looking for both IPv4 and IPv6 address we don't want the lookup functions to automatically promote IPv4 |