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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-12-26 22:17:13 +0000 (Wed, 26 Dec 2007)
New Revision: 1499

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/src/passwd.c
Log:
Merge Debian's patch 408_passwd_check_arguments
	* NEWS, src/passwd.c: Make sure that no more than one username
	argument was provided.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-12-26 21:56:47 UTC (rev 1498)
+++ upstream/trunk/ChangeLog	2007-12-26 22:17:13 UTC (rev 1499)
@@ -1,5 +1,11 @@
 2007-12-26  Nicolas François  <nicolas.francois at centraliens.net>
 
+	Merge Debian's patch 408_passwd_check_arguments
+	* NEWS, src/passwd.c: Make sure that no more than one username
+	argument was provided.
+
+2007-12-26  Nicolas François  <nicolas.francois at centraliens.net>
+
 	Merge Debian's patch 412_lastlog_-u_numerical_range
 	* NEWS, src/lastlog.c, man/lastlog.8.xml: Accept numerical user, or
 	ranges with the -u option.

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2007-12-26 21:56:47 UTC (rev 1498)
+++ upstream/trunk/NEWS	2007-12-26 22:17:13 UTC (rev 1499)
@@ -16,6 +16,8 @@
 - lastlog
   * Accept users specified as a numerical UID, or ranges of users (-user,
     user-, user1-user2).
+- passwd
+  * Make sure that no more than one username argument was provided.
 
 shadow-4.0.18.2 -> shadow-4.1.0						09-12-2008
 

Modified: upstream/trunk/src/passwd.c
===================================================================
--- upstream/trunk/src/passwd.c	2007-12-26 21:56:47 UTC (rev 1498)
+++ upstream/trunk/src/passwd.c	2007-12-26 22:17:13 UTC (rev 1499)
@@ -789,6 +789,12 @@
 		name = myname;
 
 	/*
+	 * Make sure that at most one username was specified.
+	 */
+	if (argc > optind+1)
+		usage (E_USAGE);
+
+	/*
 	 * The -a flag requires -S, no other flags, no username, and
 	 * you must be root.  --marekm
 	 */