This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.13-91-g00401ad


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  00401ad5b08e86f2a912a640487c34006c7c27e3 (commit)
      from  ab8eed78a6614f7e7e5a908efdcb9f390f849563 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=00401ad5b08e86f2a912a640487c34006c7c27e3

commit 00401ad5b08e86f2a912a640487c34006c7c27e3
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Tue Apr 19 17:16:11 2011 -0400

    Fix little issue with last change.

diff --git a/nss/nss_files/files-initgroups.c b/nss/nss_files/files-initgroups.c
index 2d84cd8..1c288e5 100644
--- a/nss/nss_files/files-initgroups.c
+++ b/nss/nss_files/files-initgroups.c
@@ -63,7 +63,9 @@ _nss_files_initgroups_dyn (const char *user, gid_t group, long int *start,
 	}
 
       struct group grp;
-      while (_nss_files_parse_grent (line, &grp, buffer, buflen, errnop) == -1)
+      int res;
+      while ((res = _nss_files_parse_grent (line, &grp, buffer, buflen,
+					    errnop)) == -1)
 	{
 	  size_t newbuflen = 2 * buflen;
 	  if (buffer_use_malloc || ! __libc_use_alloca (buflen + newbuflen))
@@ -83,7 +85,7 @@ _nss_files_initgroups_dyn (const char *user, gid_t group, long int *start,
 	    buffer = extend_alloca (buffer, buflen, newbuflen);
 	}
 
-      if (grp.gr_gid != group)
+      if (res > 0 && grp.gr_gid != group)
 	for (char **m = grp.gr_mem; *m != NULL; ++m)
 	  if (strcmp (*m, user) == 0)
 	    {

-----------------------------------------------------------------------

Summary of changes:
 nss/nss_files/files-initgroups.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]