← Back to branch summary

~ubuntu-branches/ubuntu/raring/shadow/raring-proposed

« back to all changes in this revision

Viewing changes to debian/patches/487_passwd_chauthtok_failed_message

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2009-05-05 09:45:21 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20090505094521-wpk2wn3q7957tlah
Tags: 1:4.1.3.1-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Ubuntu specific:
    + debian/login.defs: use SHA512 by default for password crypt routine.
  - debian/patches/stdout-encrypted-password.patch: chpasswd can report
    password hashes on stdout (debian bug 505640).
  - debian/login.pam: Enable SELinux support (debian bug 527106).
  - debian/securetty.linux: support Freescale MX-series (debian bug 527095).
* Add debian/patches/300_lastlog_failure: fixed upstream (debian bug 524873).
* Drop debian/patches/593_omit_lastchange_field_if_clock_is_misset: fixed
  upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/487_passwd_chauthtok_failed_message
1
 
Goal: Be more verbose and indicate that the password was not changed when
2
 
      pam_chauthtok fails (in addition to the PAM error, which may not be
3
 
      comprehensible for the users)
4
 
 
5
 
Fixes: #352137
6
 
 
7
 
Status wrt upstream: Applied upstream.
8
 
 
9
 
Index: shadow-4.1.0/libmisc/pam_pass.c
10
 
===================================================================
11
 
--- shadow-4.1.0.orig/libmisc/pam_pass.c
12
 
+++ shadow-4.1.0/libmisc/pam_pass.c
13
 
@@ -38,6 +38,7 @@
14
 
        ret = pam_chauthtok (pamh, flags);
15
 
        if (ret != PAM_SUCCESS) {
16
 
                fprintf (stderr, _("passwd: %s\n"), pam_strerror (pamh, ret));
17
 
+               fprintf (stderr, _("passwd: password unchanged\n"));
18
 
                pam_end (pamh, ret);
19
 
                exit (10);      /* XXX */
20
 
        }