Merge changes between r8878 and r8915 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@8916 7b3dc134-2b1b-0410-93df-9e9f96275f8d

1 files changed, 3 insertions, 5 deletions

diff --git a/libc/hesiod/nss_hesiod/hesiod-grp.c b/libc/hesiod/nss_hesiod/hesiod-grp.c
index 50c53f789..f0c8c31e0 100644
--- a/libc/hesiod/nss_hesiod/hesiod-grp.c
+++ b/libc/hesiod/nss_hesiod/hesiod-grp.c
@@ -139,21 +139,19 @@ internal_gid_from_group (void *context, const char *groupname, gid_t *group)
     {
       char *p = *grp_res;
 
+      /* Skip to third field.  */
       while (*p != '\0' && *p != ':')
 	++p;
-      while (*p != '\0' && *p == ':')
+      if (*p != '\0')
 	++p;
       while (*p != '\0' && *p != ':')
 	++p;
-      while (*p != '\0' && *p == ':')
-	++p;
-      if (*p == ':')
+      if (*p != '\0')
 	{
 	  char *endp;
 	  char *q = ++p;
 	  long int val;
 
-	  q = p;
 	  while (*q != '\0' && *q != ':')
 	    ++q;