* nscd/nscd_getgr_r.c (nscd_getgr_r): Store result of successful

read from nscd.
This commit is contained in:
Ulrich Drepper 2007-10-15 03:19:44 +00:00
parent 8d62c8ab01
commit 895a08c089
2 changed files with 11 additions and 10 deletions

View File

@ -1,5 +1,8 @@
2007-10-14 Ulrich Drepper <drepper@redhat.com> 2007-10-14 Ulrich Drepper <drepper@redhat.com>
* nscd/nscd_getgr_r.c (nscd_getgr_r): Store result of successful
read from nscd.
* sysdeps/posix/getaddrinfo.c (struct sort_result): Add * sysdeps/posix/getaddrinfo.c (struct sort_result): Add
service_order. service_order.
(rfc3484_sort): Make sure that even if qsort doesn't support (rfc3484_sort): Make sure that even if qsort doesn't support

View File

@ -266,10 +266,9 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type,
/* If there are no group members TOTAL_LEN is zero. */ /* If there are no group members TOTAL_LEN is zero. */
if (gr_name == NULL) if (gr_name == NULL)
{ {
if (total_len > 0) if (total_len > 0
{ && __builtin_expect (__readall (sock, resultbuf->gr_mem[0],
size_t n = __readall (sock, resultbuf->gr_mem[0], total_len); total_len) != total_len, 0))
if (__builtin_expect (n != total_len, 0))
{ {
/* The `errno' to some value != ERANGE. */ /* The `errno' to some value != ERANGE. */
__set_errno (ENOENT); __set_errno (ENOENT);
@ -278,7 +277,6 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type,
else else
*result = resultbuf; *result = resultbuf;
} }
}
else else
{ {
/* Copy the group member names. */ /* Copy the group member names. */