[Pkg-shadow-commits] r1983 - in upstream/trunk: . libmisc

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-05-18 15:06:51 +0000 (Sun, 18 May 2008)
New Revision: 1983

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/libmisc/pam_pass.c
Log:
	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).


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-05-18 14:54:35 UTC (rev 1982)
+++ upstream/trunk/ChangeLog	2008-05-18 15:06:51 UTC (rev 1983)
@@ -1,5 +1,12 @@
 2008-05-18  Nicolas François  <nicolas.francois at 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 at centraliens.net>
+
 	Import Debian patch 434_login_stop_checking_args_after--
 	* NEWS, src/login.c (check_flags): Stop checking the arguments
 	after --. The later options will be sent to the shell, and do not

Modified: upstream/trunk/libmisc/pam_pass.c
===================================================================
--- upstream/trunk/libmisc/pam_pass.c	2008-05-18 14:54:35 UTC (rev 1982)
+++ upstream/trunk/libmisc/pam_pass.c	2008-05-18 15:06:51 UTC (rev 1983)
@@ -70,6 +70,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 */
 	}