Merge lp:~robert-ancell/unity/moar-pam into lp:unity

[Robert Ancell]

Call pam_acct_mgmt and pam_chauthtok when unlocking screen

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3738
http://jenkins.qa.ubuntu.com/job/unity-ci/829/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/365
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/361
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/363

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

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

Thanks for this.

review: Approve

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

=== modified file 'lockscreen/UserAuthenticatorPam.cpp'
--- lockscreen/UserAuthenticatorPam.cpp	2014-03-07 17:16:56 +0000
+++ lockscreen/UserAuthenticatorPam.cpp	2014-03-24 00:30:36 +0000
@@ -53,6 +53,12 @@
   g_task_run_in_thread(task, [] (GTask* task, gpointer, gpointer data, GCancellable*) {
     auto self = static_cast<UserAuthenticatorPam*>(data);
     self->status_ = pam_authenticate(self->pam_handle_, 0);
+    if (self->status_ == PAM_SUCCESS)
+      self->status_ = pam_acct_mgmt(self->pam_handle_, 0);
+    if (self->status_ == PAM_NEW_AUTHTOK_REQD)
+      self->status_ = pam_chauthtok(self->pam_handle_, PAM_CHANGE_EXPIRED_AUTHTOK);
+    if (self->status_ == PAM_SUCCESS)
+      pam_setcred (self->pam_handle_, PAM_REINITIALIZE_CRED);
   });
 
   return true;

=== modified file 'tests/test_user_authenticator_pam.cpp'
--- tests/test_user_authenticator_pam.cpp	2014-02-20 19:43:52 +0000
+++ tests/test_user_authenticator_pam.cpp	2014-03-24 00:30:36 +0000
@@ -45,6 +45,16 @@
   return strcmp(resp[0].resp, "password");
 }
 
+int pam_acct_mgmt(pam_handle_t *pamh, int flags)
+{
+  return PAM_SUCCESS;
+}
+
+int pam_setcred(pam_handle_t *pamh, int flags)
+{
+  return PAM_SUCCESS;
+}
+
 namespace
 {