From 0c133978395cb732f646c8468a250065f604ad0c Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sat, 13 Sep 2008 17:46:57 +0000 Subject: [PATCH] - Remove patches applied upstream: + debian/patches/487_passwd_chauthtok_failed_message --- debian/changelog | 1 + .../487_passwd_chauthtok_failed_message | 20 ------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 debian/patches/487_passwd_chauthtok_failed_message diff --git a/debian/changelog b/debian/changelog index edd2bc37..f22bd200 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ shadow (1:4.1.2-1) experimental; urgency=low - Remove patches applied upstream: + debian/patches/434_login_stop_checking_args_after-- + debian/patches/491_configure.in_friendly_selinux_detection + + debian/patches/487_passwd_chauthtok_failed_message - Updated patches: + debian/patches/431_su_uid_0_not_root + debian/patches/463_login_delay_obeys_to_PAM diff --git a/debian/patches/487_passwd_chauthtok_failed_message b/debian/patches/487_passwd_chauthtok_failed_message deleted file mode 100644 index c164a893..00000000 --- a/debian/patches/487_passwd_chauthtok_failed_message +++ /dev/null @@ -1,20 +0,0 @@ -Goal: Be more verbose and indicate that the password was not changed when - pam_chauthtok fails (in addition to the PAM error, which may not be - comprehensible for the users) - -Fixes: #352137 - -Status wrt upstream: Applied upstream. - -Index: shadow-4.1.0/libmisc/pam_pass.c -=================================================================== ---- shadow-4.1.0.orig/libmisc/pam_pass.c -+++ shadow-4.1.0/libmisc/pam_pass.c -@@ -38,6 +38,7 @@ - ret = pam_chauthtok (pamh, flags); - if (ret != PAM_SUCCESS) { - fprintf (stderr, _("passwd: %s\n"), pam_strerror (pamh, ret)); -+ fprintf (stderr, _("passwd: password unchanged\n")); - pam_end (pamh, ret); - exit (10); /* XXX */ - } diff --git a/debian/patches/series b/debian/patches/series index 3b7e624b..e5a9dad0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -22,7 +22,6 @@ 579_chowntty_debug 483_su_fakelogin_wrong_arg0 592_manpages_typos -487_passwd_chauthtok_failed_message 403_fix_PATH-MAX_hurd 508_nologin_in_usr_sbin 505_useradd_recommend_adduser