[Pkg-shadow-commits] r3096 - in upstream/trunk: . lib

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2010-03-10 22:30:03 +0000 (Wed, 10 Mar 2010)
New Revision: 3096

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/lib/gshadow.c
Log:
2010-02-14  Michael Bunk  <mb at computer-leipzig.com>

	* NEWS, lib/gshadow.c: Fix parsing of gshadow entries.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2010-03-04 18:11:13 UTC (rev 3095)
+++ upstream/trunk/ChangeLog	2010-03-10 22:30:03 UTC (rev 3096)
@@ -1,3 +1,7 @@
+2010-02-14  Michael Bunk  <mb at computer-leipzig.com>
+
+	* NEWS, lib/gshadow.c: Fix parsing of gshadow entries.
+
 2010-01-30  Paweł Hajdan, Jr.  <phajdan.jr at gentoo.org>
 
 	* NEWS: Add support for TCB.

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2010-03-04 18:11:13 UTC (rev 3095)
+++ upstream/trunk/NEWS	2010-03-10 22:30:03 UTC (rev 3096)
@@ -15,6 +15,8 @@
     sending a SIGTERM), and kill it only if it did not terminate by itself.
     No delay will be enforced if the child cooperates.
   * Default ENV_SUPATH is /sbin:/bin:/usr/sbin:/usr/bin
+- newgrp, sg, groupmems
+  * Fix parsing of gshadow entries.
 
 *** translation
   * Updated Czech translation.

Modified: upstream/trunk/lib/gshadow.c
===================================================================
--- upstream/trunk/lib/gshadow.c	2010-03-04 18:11:13 UTC (rev 3095)
+++ upstream/trunk/lib/gshadow.c	2010-03-10 22:30:03 UTC (rev 3096)
@@ -222,6 +222,7 @@
 		if (NULL == buf) {
 			return NULL;
 		}
+		buflen = BUFSIZ;
 	}
 
 	if (NULL == fp) {
@@ -229,9 +230,9 @@
 	}
 
 #ifdef	USE_NIS
-	while (fgetsx (buf, (int) sizeof buf, fp) == buf)
+	while (fgetsx (buf, (int) buflen, fp) == buf)
 #else
-	if (fgetsx (buf, (int) sizeof buf, fp) == buf)
+	if (fgetsx (buf, (int) buflen, fp) == buf)
 #endif
 	{
 		while (   ((cp = strrchr (buf, '\n')) == NULL)