aboutsummaryrefslogtreecommitdiff
path: root/nscd/nscd_initgroups.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-12-22 20:10:10 +0000
committerUlrich Drepper <drepper@redhat.com>2004-12-22 20:10:10 +0000
commita334319f6530564d22e775935d9c91663623a1b4 (patch)
treeb5877475619e4c938e98757d518bb1e9cbead751 /nscd/nscd_initgroups.c
parent0ecb606cb6cf65de1d9fc8a919bceb4be476c602 (diff)
downloadglibc-a334319f6530564d22e775935d9c91663623a1b4.tar
glibc-a334319f6530564d22e775935d9c91663623a1b4.tar.gz
glibc-a334319f6530564d22e775935d9c91663623a1b4.tar.bz2
glibc-a334319f6530564d22e775935d9c91663623a1b4.zip
(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.
Diffstat (limited to 'nscd/nscd_initgroups.c')
-rw-r--r--nscd/nscd_initgroups.c77
1 files changed, 31 insertions, 46 deletions
diff --git a/nscd/nscd_initgroups.c b/nscd/nscd_initgroups.c
index 866455a96c..2ea9e7f862 100644
--- a/nscd/nscd_initgroups.c
+++ b/nscd/nscd_initgroups.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
@@ -30,7 +30,7 @@
/* We use the same mapping as in nscd_getgr. */
-libc_locked_map_ptr (extern, __gr_map_handle) attribute_hidden;
+libc_locked_map_ptr (extern, __gr_map_handle);
int
@@ -39,7 +39,6 @@ __nscd_getgrouplist (const char *user, gid_t group, long int *size,
{
size_t userlen = strlen (user) + 1;
int gc_cycle;
- int nretries = 0;
/* If the mapping is available, try to search there instead of
communicating with the nscd. */
@@ -47,49 +46,44 @@ __nscd_getgrouplist (const char *user, gid_t group, long int *size,
mapped = __nscd_get_map_ref (GETFDGR, "group", &__gr_map_handle, &gc_cycle);
retry:;
+ const initgr_response_header *initgr_resp = NULL;
char *respdata = NULL;
int retval = -1;
int sock = -1;
- initgr_response_header initgr_resp;
if (mapped != NO_MAPPING)
{
- struct datahead *found = __nscd_cache_search (INITGROUPS, user,
- userlen, mapped);
+ const struct datahead *found = __nscd_cache_search (INITGROUPS, user,
+ userlen, mapped);
if (found != NULL)
{
- respdata = (char *) (&found->data[0].initgrdata + 1);
- initgr_resp = found->data[0].initgrdata;
+ initgr_resp = &found->data[0].initgrdata;
+ respdata = (char *) (initgr_resp + 1);
char *recend = (char *) found->data + found->recsize;
- /* Now check if we can trust initgr_resp fields. If GC is
- in progress, it can contain anything. */
- if (mapped->head->gc_cycle != gc_cycle)
- {
- retval = -2;
- goto out;
- }
-
- if (respdata + initgr_resp.ngrps * sizeof (int32_t) > recend)
+ if (respdata + initgr_resp->ngrps * sizeof (int32_t) > recend)
goto out;
}
}
/* If we do not have the cache mapped, try to get the data over the
socket. */
- if (respdata == NULL)
+ initgr_response_header initgr_resp_mem;
+ if (initgr_resp == NULL)
{
- sock = __nscd_open_socket (user, userlen, INITGROUPS, &initgr_resp,
- sizeof (initgr_resp));
+ sock = __nscd_open_socket (user, userlen, INITGROUPS, &initgr_resp_mem,
+ sizeof (initgr_resp_mem));
if (sock == -1)
{
- /* nscd not running or wrong version. */
+ /* nscd not running or wrong version or hosts caching disabled. */
__nss_not_use_nscd_group = 1;
goto out;
}
+
+ initgr_resp = &initgr_resp_mem;
}
- if (initgr_resp.found == 1)
+ if (initgr_resp->found == 1)
{
/* The following code assumes that gid_t and int32_t are the
same size. This is the case for al existing implementation.
@@ -97,46 +91,40 @@ __nscd_getgrouplist (const char *user, gid_t group, long int *size,
doesn't use memcpy but instead copies each array element one
by one. */
assert (sizeof (int32_t) == sizeof (gid_t));
- assert (initgr_resp.ngrps >= 0);
+ assert (initgr_resp->ngrps > 0);
/* Make sure we have enough room. We always count GROUP in even
though we might not end up adding it. */
- if (*size < initgr_resp.ngrps + 1)
+ if (*size < initgr_resp->ngrps + 1)
{
gid_t *newp = realloc (*groupsp,
- (initgr_resp.ngrps + 1) * sizeof (gid_t));
+ (initgr_resp->ngrps + 1) * sizeof (gid_t));
if (newp == NULL)
/* We cannot increase the buffer size. */
- goto out_close;
+ goto out;
*groupsp = newp;
- *size = initgr_resp.ngrps + 1;
+ *size = initgr_resp->ngrps + 1;
}
if (respdata == NULL)
{
/* Read the data from the socket. */
- if ((size_t) __readall (sock, *groupsp, initgr_resp.ngrps
- * sizeof (gid_t))
- == initgr_resp.ngrps * sizeof (gid_t))
- retval = initgr_resp.ngrps;
+ if ((size_t) TEMP_FAILURE_RETRY (__read (sock, *groupsp,
+ initgr_resp->ngrps
+ * sizeof (gid_t)))
+ == initgr_resp->ngrps * sizeof (gid_t))
+ retval = initgr_resp->ngrps;
}
else
{
/* Just copy the data. */
- retval = initgr_resp.ngrps;
+ retval = initgr_resp->ngrps;
memcpy (*groupsp, respdata, retval * sizeof (gid_t));
}
}
else
{
- if (__builtin_expect (initgr_resp.found == -1, 0))
- {
- /* The daemon does not cache this database. */
- __nss_not_use_nscd_group = 1;
- goto out_close;
- }
-
/* No group found yet. */
retval = 0;
@@ -155,25 +143,22 @@ __nscd_getgrouplist (const char *user, gid_t group, long int *size,
(*groupsp)[retval++] = group;
}
- out_close:
if (sock != -1)
close_not_cancel_no_status (sock);
out:
- if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0)
+ if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0 && retval != -1)
{
/* When we come here this means there has been a GC cycle while we
were looking for the data. This means the data might have been
inconsistent. Retry if possible. */
- if ((gc_cycle & 1) != 0 || ++nretries == 5 || retval == -1)
+ if ((gc_cycle & 1) != 0)
{
/* nscd is just running gc now. Disable using the mapping. */
- if (atomic_decrement_val (&mapped->counter) == 0)
- __nscd_unmap (mapped);
+ __nscd_unmap (mapped);
mapped = NO_MAPPING;
}
- if (retval != -1)
- goto retry;
+ goto retry;
}
return retval;