[commits] r15496 - in /fsf/glibc-2_14-branch/libc: ChangeLog NEWS nss/nss_files/files-initgroups.c version.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Mon Oct 10 00:02:57 2011
New Revision: 15496

Log:
Import glibc-2.14 for 2011-10-10

Modified:
    fsf/glibc-2_14-branch/libc/ChangeLog
    fsf/glibc-2_14-branch/libc/NEWS
    fsf/glibc-2_14-branch/libc/nss/nss_files/files-initgroups.c
    fsf/glibc-2_14-branch/libc/version.h

Modified: fsf/glibc-2_14-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_14-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_14-branch/libc/ChangeLog Mon Oct 10 00:02:57 2011
@@ -1,3 +1,12 @@
+2011-10-07  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* version.h (VERSION): Bump for 2.14.1 release.
+
+2011-09-27  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* nss/nss_files/files-initgroups.c (_nss_files_initgroups_dyn):
+	Reread the line before reparsing it.
+
 2011-08-29  Jiri Olsa <jolsa@xxxxxxxxxx>
 
 	* sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Fix cfi

Modified: fsf/glibc-2_14-branch/libc/NEWS
==============================================================================
--- fsf/glibc-2_14-branch/libc/NEWS (original)
+++ fsf/glibc-2_14-branch/libc/NEWS Mon Oct 10 00:02:57 2011
@@ -1,9 +1,16 @@
-GNU C Library NEWS -- history of user-visible changes.  2011-6-4
+GNU C Library NEWS -- history of user-visible changes.  2011-10-07
 Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Please send GNU C library bug reports via <http://sources.redhat.com/bugzilla/>
 using `glibc' in the "product" field.
+
+Version 2.14.1
+
+* The following bugs are resolved with this release:
+
+  9696, 11724, 12841, 12849, 12852, 12868, 12885, 12922, 12935, 13007,
+  13114
 
 Version 2.14
 

Modified: fsf/glibc-2_14-branch/libc/nss/nss_files/files-initgroups.c
==============================================================================
--- fsf/glibc-2_14-branch/libc/nss/nss_files/files-initgroups.c (original)
+++ fsf/glibc-2_14-branch/libc/nss/nss_files/files-initgroups.c Mon Oct 10 00:02:57 2011
@@ -52,8 +52,10 @@
   gid_t *groups = *groupsp;
 
   /* We have to iterate over the entire file.  */
-  while (!feof_unlocked (stream))
+  while (1)
     {
+      fpos_t pos;
+      fgetpos (stream, &pos);
       ssize_t n = getline (&line, &linelen, stream);
       if (n < 0)
 	{
@@ -64,9 +66,8 @@
 	}
 
       struct group grp;
-      int res;
-      while ((res = _nss_files_parse_grent (line, &grp, buffer, buflen,
-					    errnop)) == -1)
+      int res = _nss_files_parse_grent (line, &grp, buffer, buflen, errnop);
+      if (res == -1)
 	{
 	  size_t newbuflen = 2 * buflen;
 	  if (buffer_use_malloc || ! __libc_use_alloca (buflen + newbuflen))
@@ -85,6 +86,9 @@
 	    }
 	  else
 	    buffer = extend_alloca (buffer, buflen, newbuflen);
+	  /* Reread current line, the parser has clobbered it.  */
+	  fsetpos (stream, &pos);
+	  continue;
 	}
 
       if (res > 0 && grp.gr_gid != group)

Modified: fsf/glibc-2_14-branch/libc/version.h
==============================================================================
--- fsf/glibc-2_14-branch/libc/version.h (original)
+++ fsf/glibc-2_14-branch/libc/version.h Mon Oct 10 00:02:57 2011
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
 #define RELEASE "stable"
-#define VERSION "2.14"
+#define VERSION "2.14.1"