aboutsummaryrefslogtreecommitdiff
path: root/nscd
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-05-15 13:51:35 +0200
committerFlorian Weimer <fweimer@redhat.com>2019-05-15 15:07:49 +0200
commita9368c34d70cef91ca59b09941f496df11d6b146 (patch)
tree238aa331f31e567299bcc80b49de7f4f8707a1a3 /nscd
parentsupport: Add support_install_rootsbindir (diff)
downloadglibc-a9368c34d70cef91ca59b09941f496df11d6b146.tar.gz
glibc-a9368c34d70cef91ca59b09941f496df11d6b146.tar.bz2
glibc-a9368c34d70cef91ca59b09941f496df11d6b146.zip
nss: Turn __nss_database_lookup into a compatibility symbol
The function uses the internal service_user type, so it is not really usable from the outside of glibc. Rename the function to __nss_database_lookup2 for internal use, and change __nss_database_lookup to always indicate failure to the caller. __nss_next already was a compatibility symbol. The new implementation always fails and no longer calls __nss_next2. unscd, the alternative nscd implementation, does not use __nss_database_lookup, so it is not affected by this change.
Diffstat (limited to 'nscd')
-rw-r--r--nscd/aicache.c6
-rw-r--r--nscd/initgrcache.c4
-rw-r--r--nscd/netgroupcache.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/nscd/aicache.c b/nscd/aicache.c
index 5b94e2aa9e..5d8222e3b7 100644
--- a/nscd/aicache.c
+++ b/nscd/aicache.c
@@ -92,9 +92,9 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
int herrno = 0;
if (hosts_database == NULL)
- no_more = __nss_database_lookup ("hosts", NULL,
- "dns [!UNAVAIL=return] files",
- &hosts_database);
+ no_more = __nss_database_lookup2 ("hosts", NULL,
+ "dns [!UNAVAIL=return] files",
+ &hosts_database);
else
no_more = 0;
nip = hosts_database;
diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
index 186a8b58b5..cf38c59b8e 100644
--- a/nscd/initgrcache.c
+++ b/nscd/initgrcache.c
@@ -88,8 +88,8 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
int no_more;
if (group_database == NULL)
- no_more = __nss_database_lookup ("group", NULL, DEFAULT_CONFIG,
- &group_database);
+ no_more = __nss_database_lookup2 ("group", NULL, DEFAULT_CONFIG,
+ &group_database);
else
no_more = 0;
nip = group_database;
diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c
index 9a9783318b..cda276eade 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_lookup ("netgroup", NULL, NULL, &netgroup_database))
+ && __nss_database_lookup2 ("netgroup", NULL, NULL, &netgroup_database))
{
/* No such service. */
cacheable = do_notfound (db, fd, req, key, &dataset, &total, &timeout,