Merge lp:~robert-ancell/lightdm/chauthtok into lp:lightdm

[Robert Ancell]

Correctly invoke PAM to change authentication token

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1882
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~robert-ancell/lightdm/chauthtok/+merge/205185/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/lightdm-ci/232/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-armhf-ci/26

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/lightdm-ci/232/rebuild

review: Needs Fixing (continuous-integration)

[Robert Ancell (robert-ancell)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/session-child.c'
--- src/session-child.c	2013-12-09 21:44:47 +0000
+++ src/session-child.c	2014-02-06 15:10:47 +0000
@@ -334,7 +334,7 @@
         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;

=== modified file 'tests/scripts/login-new-authtok.conf'
--- tests/scripts/login-new-authtok.conf	2014-02-05 14:27:20 +0000
+++ tests/scripts/login-new-authtok.conf	2014-02-06 15:10:47 +0000
@@ -24,7 +24,7 @@
 
 # Log into account that requires as password change
 #?*GREETER-X-0 AUTHENTICATE USERNAME=new-authtok
-#?GREETER-X-0 SHOW-PROMPT TEXT="Enter new password:"
+#?GREETER-X-0 SHOW-PROMPT TEXT="Enter new password \(expired\):"
 #?*GREETER-X-0 RESPOND TEXT="New password"
 #?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=new-authtok AUTHENTICATED=TRUE
 #?*GREETER-X-0 START-SESSION

=== modified file 'tests/src/libsystem.c'
--- tests/src/libsystem.c	2013-09-10 05:13:57 +0000
+++ tests/src/libsystem.c	2014-02-06 15:10:47 +0000
@@ -1194,7 +1194,10 @@
     msg = malloc (sizeof (struct pam_message *) * 1);
     msg[0] = malloc (sizeof (struct pam_message));
     msg[0]->msg_style = PAM_PROMPT_ECHO_OFF;
-    msg[0]->msg = "Enter new password:";
+    if ((flags & PAM_CHANGE_EXPIRED_AUTHTOK) != 0)
+        msg[0]->msg = "Enter new password (expired):";
+    else
+        msg[0]->msg = "Enter new password:";
     result = pamh->conversation.conv (1, (const struct pam_message **) msg, &resp, pamh->conversation.appdata_ptr);
     free (msg[0]);
     free (msg);