408_passwd_check_arguments was applied upstream.

2008-03-19 19:25:51 +00:00
parent 89e6ca0d7e
commit 993f5134fd
3 changed files with 1 additions and 25 deletions
@@ -14,6 +14,7 @@ shadow (1:4.1.1~rc1-1) UNRELEASED; urgency=low
      + debian/patches/466_fflush-prompt
      + debian/patches/480_getopt_args_reorder
      + debian/patches/496_login_init_session
+      + debian/patches/408_passwd_check_arguments
  * debian/watch: Add a watch file for shadow.

 -- Nicolas FRANCOIS (Nekral) <nicolas.francois@centraliens.net>  Sun, 24 Feb 2008 18:33:31 +0100
@@ -1,24 +0,0 @@
-Goal: Check the passwd arguments and fail with the usage message if there
-      are more than one non option arguments (i.e. usernames).
-
-Fixes: #410268
-
-Status wrt upstream: not reported yet.
-
-Index: shadow-4.1.0/src/passwd.c
-===================================================================
--- shadow-4.1.0.orig/src/passwd.c
-+++ shadow-4.1.0/src/passwd.c
-@@ -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
- 	 */
@@ -27,7 +27,6 @@
 505_useradd_recommend_adduser
 406_vipw_resume_properly
 407_adduser_disable_PUG_with-n
-408_passwd_check_arguments
 412_lastlog_-u_numerical_range
 414_remove-unwise-advices
 415_login_put-echoctl-back