Import Debian patch 487_passwd_chauthtok_failed_message

	* libmisc/pam_pass.c: 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).

diff --git a/ChangeLog b/ChangeLog
index 8d7d79c52ebe830037ab003d0b2040a951129d54..1be5a8e463f780267ffc2e8d077074db57b70f50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-18  Nicolas François  <nicolas.francois@centraliens.net>
+
+       Import Debian patch 487_passwd_chauthtok_failed_message
+       * libmisc/pam_pass.c: 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).
+
 2008-05-18  Nicolas François  <nicolas.francois@centraliens.net>
 
        Import Debian patch 434_login_stop_checking_args_after--

diff --git a/libmisc/pam_pass.c b/libmisc/pam_pass.c
index 1c1cc214f43144d5dfea8e18cb32f0dfc810c726..ea0f3a9e8affcafa1729d19db0a0867484385a9b 100644 (file)
--- a/libmisc/pam_pass.c
+++ b/libmisc/pam_pass.c
@@ -70,6 +70,7 @@ void do_pam_passwd (const char *user, int silent, int change_expired)
        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 */
        }