* nis/nss_nis/nis-service.c (internal_nis_getservent_r): . If map

is empty simply return and use next service.
	* nis/nss_nis/nis-rpc.c (internal_nis_getrpcent_r): Likewise.
This commit is contained in:
Ulrich Drepper 2006-08-19 18:37:10 +00:00
parent 8a6537b001
commit ed3691bab2
3 changed files with 12 additions and 0 deletions

View File

@ -1,5 +1,9 @@
2006-08-19 Ulrich Drepper <drepper@redhat.com>
* nis/nss_nis/nis-service.c (internal_nis_getservent_r): . If map
is empty simply return and use next service.
* nis/nss_nis/nis-rpc.c (internal_nis_getrpcent_r): Likewise.
* locale/programs/charmap.c (charmap_read): Add new parameter. It
tells us when not finding a charmap file is an error.
* locale/programs/charmap.h: Adjust charmap_read prototype.

View File

@ -117,6 +117,10 @@ internal_nis_getrpcent_r (struct rpcent *rpc, char *buffer, size_t buflen,
if (intern->start == NULL)
internal_nis_setrpcent (intern);
if (intern->next == NULL)
/* Not one entry in the map. */
return NSS_STATUS_NOTFOUND;
/* Get the next entry until we found a correct one. */
do
{

View File

@ -188,6 +188,10 @@ internal_nis_getservent_r (struct servent *serv, char *buffer,
if (intern.start == NULL)
internal_nis_setservent ();
if (intern.next == NULL)
/* Not one entry in the map. */
return NSS_STATUS_NOTFOUND;
/* Get the next entry until we found a correct one. */
do
{