From acd41f47eae558eb35871de3af7114c43093ff99 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 6 May 2011 12:54:12 -0400 Subject: [PATCH] Report if no record is found by initgroups in nss_files. --- ChangeLog | 5 +++++ nss/nss_files/files-initgroups.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 18e5a48..83c0f9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-05-06 Ulrich Drepper + + * nss/nss_files/files-initgroups.c (_nss_files_initgroups_dyn): Return + NSS_STATUS_NOTFOUND if no record was found. + 2011-05-05 Andreas Schwab * sunrpc/Makefile (headers): Add rpc/netdb.h. diff --git a/nss/nss_files/files-initgroups.c b/nss/nss_files/files-initgroups.c index 4c7b9f8..113abf2 100644 --- a/nss/nss_files/files-initgroups.c +++ b/nss/nss_files/files-initgroups.c @@ -43,6 +43,7 @@ _nss_files_initgroups_dyn (const char *user, gid_t group, long int *start, char *line = NULL; size_t linelen = 0; enum nss_status status = NSS_STATUS_SUCCESS; + bool any = false; size_t buflen = 1024; void *buffer = alloca (buflen); @@ -118,6 +119,7 @@ _nss_files_initgroups_dyn (const char *user, gid_t group, long int *start, groups[*start] = grp.gr_gid; *start += 1; + any = true; break; } @@ -131,5 +133,5 @@ _nss_files_initgroups_dyn (const char *user, gid_t group, long int *start, fclose (stream); - return status; + return status == NSS_STATUS_SUCCESS && !any ? NSS_STATUS_NOTFOUND : status; } -- 2.7.4