diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-09-25 22:55:11 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-09-25 22:55:11 +0000 |
| commit | 9c5a79048766f0ac89aa84ad0c9a2f6e6dffec17 (patch) | |
| tree | 7216456790ead0f00fb02de81dcaebf2015dd3ac | |
| parent | c1e3681907d81f8738bdcb3582f6a563e65b6f11 (diff) | |
| download | glibc-9c5a79048766f0ac89aa84ad0c9a2f6e6dffec17.tar.gz glibc-9c5a79048766f0ac89aa84ad0c9a2f6e6dffec17.tar.xz glibc-9c5a79048766f0ac89aa84ad0c9a2f6e6dffec17.zip | |
* inet/getnetgrent_r.c (innetgr): Call endfct even if result != 0.
Return 1 only if result == 1. Patch by Benoit Capelle.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | inet/getnetgrent_r.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index cbef36a57c..67320a445d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-09-24 Jakub Jelinek <jakub@redhat.com> + + * inet/getnetgrent_r.c (innetgr): Call endfct even if result != 0. + Return 1 only if result == 1. Patch by Benoit Capelle. + 2005-09-25 Ulrich Drepper <drepper@redhat.com> [BZ #278] diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c index 4dbccd94ea..97b2b809f0 100644 --- a/inet/getnetgrent_r.c +++ b/inet/getnetgrent_r.c @@ -409,9 +409,6 @@ innetgr (const char *netgroup, const char *host, const char *user, } } - if (result != 0) - break; - /* If we found one service which does know the given netgroup we don't try further. */ status = NSS_STATUS_RETURN; @@ -422,6 +419,9 @@ innetgr (const char *netgroup, const char *host, const char *user, if (endfct != NULL) (*endfct) (&entry); + if (result != 0) + break; + /* Look for the next service. */ no_more = __nss_next (&entry.nip, "setnetgrent", &setfct.ptr, status, 0); @@ -444,6 +444,6 @@ innetgr (const char *netgroup, const char *host, const char *user, /* Free the memory. */ free_memory (&entry); - return result; + return result == 1; } libc_hidden_def (innetgr) |