about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-05-06 12:54:12 -0400
committerUlrich Drepper <drepper@gmail.com>2011-05-06 12:54:12 -0400
commitacd41f47eae558eb35871de3af7114c43093ff99 (patch)
treee01b8b5779274ea580b2fe2ecb1bf91991764289
parenta04469764964a82863e0f61659bfa2d875f6fb7e (diff)
downloadglibc-acd41f47eae558eb35871de3af7114c43093ff99.tar.gz
glibc-acd41f47eae558eb35871de3af7114c43093ff99.tar.xz
glibc-acd41f47eae558eb35871de3af7114c43093ff99.zip
Report if no record is found by initgroups in nss_files.
-rw-r--r--ChangeLog5
-rw-r--r--nss/nss_files/files-initgroups.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 18e5a48d8e..83c0f9bdd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-06  Ulrich Drepper  <drepper@gmail.com>
+
+	* nss/nss_files/files-initgroups.c (_nss_files_initgroups_dyn): Return
+	NSS_STATUS_NOTFOUND if no record was found.
+
 2011-05-05  Andreas Schwab  <schwab@redhat.com>
 
 	* sunrpc/Makefile (headers): Add rpc/netdb.h.
diff --git a/nss/nss_files/files-initgroups.c b/nss/nss_files/files-initgroups.c
index 4c7b9f8e6f..113abf2821 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;
 }