* debian/patches:

  - 03_fix-pam_chauthtok-call added, pass PAM_CHANGE_EXPIRED_AUTHTOK to the
    pam_chauthtok() call.                                     closes: #735670

git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@8201 0c9b3bff-18ee-0310-b944-d1aa2700132f

diff --git a/debian/changelog b/debian/changelog
index 344d5a07f2896a6fad3c10ffdf1f7001d0fc788a..06157fe9955e92696fbbd355fbbe4718a48d5864 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lightdm (1.8.6-2) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - 03_fix-pam_chauthtok-call added, pass PAM_CHANGE_EXPIRED_AUTHTOK to the
+      pam_chauthtok() call.                                     closes: #735670
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 02 Feb 2014 14:09:25 +0100
+
 lightdm (1.8.6-1) unstable; urgency=medium
 
   * New upstream release.

diff --git a/debian/patches/03_fix-pam_chauthtok-call.patch b/debian/patches/03_fix-pam_chauthtok-call.patch
new file mode 100644 (file)
index 0000000..4317a53
--- /dev/null
+++ b/debian/patches/03_fix-pam_chauthtok-call.patch
@@ -0,0 +1,11 @@
+--- a/src/session-child.c
++++ b/src/session-child.c
+@@ -336,7 +336,7 @@ session_child_run (int argc, char **argv
+         if (authentication_result == PAM_SUCCESS)
+             authentication_result = pam_acct_mgmt (pam_handle, 0);
+         if (authentication_result == PAM_NEW_AUTHTOK_REQD)
+-            authentication_result = pam_chauthtok (pam_handle, 0);
++            authentication_result = pam_chauthtok (pam_handle, PAM_CHANGE_EXPIRED_AUTHTOK);
+     }
+     else
+         authentication_result = PAM_SUCCESS;

diff --git a/debian/patches/series b/debian/patches/series
index 52f14d8be4a1e1df155943fad5c43d3be2782844..f1b924cb7f1b0171c24417a318321d744689a6c2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 01_set-default-path.patch
 02_fix-apparmor-profile.patch
+03_fix-pam_chauthtok-call.patch
 04_dont-add-pkglibexecdir-path.patch
 05_debianize-pam-files.patch
 06_allow_libpamsystemd_and_ck_together.patch