* nis/nis_table.c (nis_list): Don't fail if __follow_path returned

NIS_NOTFOUND.
This commit is contained in:
Ulrich Drepper 2007-08-22 16:04:18 +00:00
parent 2e0e1a0512
commit 0008163a30
3 changed files with 15 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2007-08-17 Jakub Jelinek <jakub@redhat.com>
* nis/nis_table.c (nis_list): Don't fail if __follow_path returned
NIS_NOTFOUND.
2007-08-21 Ulrich Drepper <drepper@redhat.com> 2007-08-21 Ulrich Drepper <drepper@redhat.com>
[BZ #4566] [BZ #4566]

View File

@ -372,6 +372,7 @@ nis_list (const_nis_name name, unsigned int flags,
&bptr); &bptr);
if (clnt_status != NIS_SUCCESS) if (clnt_status != NIS_SUCCESS)
{ {
if (clnt_status == NIS_NOMEMORY)
NIS_RES_STATUS (res) = clnt_status; NIS_RES_STATUS (res) = clnt_status;
++done; ++done;
} }
@ -452,12 +453,16 @@ nis_list (const_nis_name name, unsigned int flags,
++done; ++done;
else else
{ {
NIS_RES_STATUS (res) clnt_status
= __follow_path (&tablepath, &tableptr, ibreq, &bptr); = __follow_path (&tablepath, &tableptr, ibreq, &bptr);
if (NIS_RES_STATUS (res) != NIS_SUCCESS) if (clnt_status != NIS_SUCCESS)
{
if (clnt_status == NIS_NOMEMORY)
NIS_RES_STATUS (res) = clnt_status;
++done; ++done;
} }
} }
}
break; break;
case NIS_SYSTEMERROR: case NIS_SYSTEMERROR:
case NIS_NOSUCHNAME: case NIS_NOSUCHNAME:

View File

@ -42,7 +42,7 @@ strfry (char *string)
{ {
int32_t j; int32_t j;
__random_r (&rdata, &j); __random_r (&rdata, &j);
j = j % len + 1; j = j % (len - i) + i;
char c = string[i]; char c = string[i];
string[i] = string[j]; string[i] = string[j];