[Pkg-shadow-commits] r1919 - in debian/trunk/debian: . patches

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-03-19 19:25:51 +0000 (Wed, 19 Mar 2008)
New Revision: 1919

Removed:
   debian/trunk/debian/patches/408_passwd_check_arguments
Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/patches/series
Log:
408_passwd_check_arguments was applied upstream.


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2008-03-19 19:20:38 UTC (rev 1918)
+++ debian/trunk/debian/changelog	2008-03-19 19:25:51 UTC (rev 1919)
@@ -14,6 +14,7 @@
       + 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 at centraliens.net>  Sun, 24 Feb 2008 18:33:31 +0100

Deleted: debian/trunk/debian/patches/408_passwd_check_arguments
===================================================================
--- debian/trunk/debian/patches/408_passwd_check_arguments	2008-03-19 19:20:38 UTC (rev 1918)
+++ debian/trunk/debian/patches/408_passwd_check_arguments	2008-03-19 19:25:51 UTC (rev 1919)
@@ -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
- 	 */

Modified: debian/trunk/debian/patches/series
===================================================================
--- debian/trunk/debian/patches/series	2008-03-19 19:20:38 UTC (rev 1918)
+++ debian/trunk/debian/patches/series	2008-03-19 19:25:51 UTC (rev 1919)
@@ -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