From 993f5134fd012382f974ebb876d850aafc9c97d0 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Wed, 19 Mar 2008 19:25:51 +0000 Subject: [PATCH] 408_passwd_check_arguments was applied upstream. --- debian/changelog | 1 + debian/patches/408_passwd_check_arguments | 24 ----------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 debian/patches/408_passwd_check_arguments diff --git a/debian/changelog b/debian/changelog index 57f76056..b43d05b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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) Sun, 24 Feb 2008 18:33:31 +0100 diff --git a/debian/patches/408_passwd_check_arguments b/debian/patches/408_passwd_check_arguments deleted file mode 100644 index 76e9a866..00000000 --- a/debian/patches/408_passwd_check_arguments +++ /dev/null @@ -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 - */ diff --git a/debian/patches/series b/debian/patches/series index c69c2e6a..af3049dc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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