[Pkg-shadow-commits] r3289 - in upstream/trunk: . libmisc

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2010-11-19 21:54:41 +0000 (Fri, 19 Nov 2010)
New Revision: 3289

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/libmisc/console.c
Log:
	* NEWS, libmisc/console.c: Fix CONSOLE parser. This caused login
	to hang when CONSOLE was configured with a colon separated list of
	TTYs.  See http://bugs.gentoo.org/show_bug.cgi?id=324419


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2010-10-02 11:30:52 UTC (rev 3288)
+++ upstream/trunk/ChangeLog	2010-11-19 21:54:41 UTC (rev 3289)
@@ -1,3 +1,9 @@
+2010-11-19  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* NEWS, libmisc/console.c: Fix CONSOLE parser. This caused login
+	to hang when CONSOLE was configured with a colon separated list of
+	TTYs.  See http://bugs.gentoo.org/show_bug.cgi?id=324419
+
 2010-09-05  Nicolas François  <nicolas.francois at centraliens.net>
 
 	Integrate review comments from Julien Cristau

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2010-10-02 11:30:52 UTC (rev 3288)
+++ upstream/trunk/NEWS	2010-11-19 21:54:41 UTC (rev 3289)
@@ -25,12 +25,16 @@
   * Fixed limits support (non PAM enabled versions only)
   * Added support for infinite limits and group based limits (non PAM
     enabled versions only)
+  * Fixed infinite loop when CONSOLE is configured with a colon-separated
+    list of TTYs.
 - su
   * Document the su exit values.
   * When su receives a signal, wait for the child to terminate (after
     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
+  * Fixed infinite loop when CONSOLE is configured with a colon-separated
+    list of TTYs.
 - newgrp, sg, groupmems
   * Fix parsing of gshadow entries.
 - useradd

Modified: upstream/trunk/libmisc/console.c
===================================================================
--- upstream/trunk/libmisc/console.c	2010-10-02 11:30:52 UTC (rev 3288)
+++ upstream/trunk/libmisc/console.c	2010-11-19 21:54:41 UTC (rev 3289)
@@ -69,13 +69,15 @@
 	 */
 
 	if (*cons != '/') {
+		char *pbuf;
 		strcpy (buf, cons);
-		while ((s = strtok (buf, ":")) != NULL) {
+		pbuf = &buf[0];
+		while ((s = strtok (pbuf, ":")) != NULL) {
 			if (strcmp (s, tty) == 0) {
 				return true;
 			}
 
-			cons = NULL;
+			pbuf = NULL;
 		}
 		return false;
 	}