[Pkg-shadow-commits] r1982 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-05-18 14:54:35 +0000 (Sun, 18 May 2008)
New Revision: 1982

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/src/login.c
Log:
	Import Debian patch 434_login_stop_checking_args_after--
	* NEWS, src/login.c (check_flags): Stop checking the arguments
	after --. The later options will be sent to the shell, and do not
	need to be checked.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-05-18 13:41:56 UTC (rev 1981)
+++ upstream/trunk/ChangeLog	2008-05-18 14:54:35 UTC (rev 1982)
@@ -1,5 +1,12 @@
 2008-05-18  Nicolas François  <nicolas.francois at centraliens.net>
 
+	Import Debian patch 434_login_stop_checking_args_after--
+	* NEWS, src/login.c (check_flags): Stop checking the arguments
+	after --. The later options will be sent to the shell, and do not
+	need to be checked.
+
+2008-05-18  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/vipw.c, src/su.c, src/newgrp.c: Harmonize the children's
 	SIGSTOP handling. Raise the signal which stopped the child instead
 	of always SIGSTOP.

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2008-05-18 13:41:56 UTC (rev 1981)
+++ upstream/trunk/NEWS	2008-05-18 14:54:35 UTC (rev 1982)
@@ -12,6 +12,9 @@
 - chfn
   * Allow non-US-ASCII characters in the GECOS fields ("name", "room
     number", and "other info" fields).
+- login
+  * Do not fail if a shell option, specified after --, has more than 2
+    letters.
 - su
   * If the SULOG_FILE does not exist when an su session is logged, make
     sure the file is created with group root, instead of using the group

Modified: upstream/trunk/src/login.c
===================================================================
--- upstream/trunk/src/login.c	2008-05-18 13:41:56 UTC (rev 1981)
+++ upstream/trunk/src/login.c	2008-05-18 14:54:35 UTC (rev 1982)
@@ -251,6 +251,9 @@
 	for (arg = 1; arg < argc; arg++) {
 		if (argv[arg][0] == '-' && strlen (argv[arg]) > 2)
 			usage ();
+		if (strcmp(argv[arg], "--") == 0) {
+			break; /* stop checking on a "--" */
+		}
 	}
 }