Merge lp:~bregma/unity8/lp-1350878 into lp:unity8

[Stephen M. Webb]

Avoid multiple concurrent authentications.

Hacks around the critical blocker preventing Unity 8 from running on the desktop.

The existing code starts authentication on the user twice. the second authentication session destroys the context of the first, leaves its future dangling, and makes non-threadsafe calls into non-reentrant code.

This fix is quick and dirty but gets the desktop back up and running while someone who understands the overall flow better can dream up a proper solution on a more leisurely schedule while not blocking other development.

[lp:~bregma/unity8/lp-1350878]

1180. By Stephen M. Webb on 2014-08-18

reverse ifdef sense to enable fix

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1180
http://jenkins.qa.ubuntu.com/job/unity8-ci/4013/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3733
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1014
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1107
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1107/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3607
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4980
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4980/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11696

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

review: Approve (continuous-integration)

[Michael Terry (mterry)]

I would rather land https://code.launchpad.net/~mterry/unity8/dismiss-old-pam-prompts/+merge/231363

review: Disapprove

[kevin gunn (kgunn72)]

bregma if you or someone on your team reviews mterry's then i'll see if we can add it to the current silo

Unmerged revisions

1180. By Stephen M. Webb on 2014-08-18

reverse ifdef sense to enable fix

1179. By Stephen M. Webb on 2014-08-18

PAM authentication: don't slay non-reentrant code

=== modified file 'tests/mocks/LightDM/demo/GreeterPrivate.cpp'
--- tests/mocks/LightDM/demo/GreeterPrivate.cpp	2014-07-15 16:38:02 +0000
+++ tests/mocks/LightDM/demo/GreeterPrivate.cpp	2014-08-18 19:21:10 +0000
@@ -58,6 +58,9 @@
         // Clear out any existing PAM interactions first (we can't simply
         // cancel our QFuture because QtConcurrent::run doesn't support cancel)
         if (pamHandle != NULL) {
+#ifndef DONT_HANG_DESKTOP
+            return;
+#endif
             pam_handle *handle = pamHandle;
             pamHandle = NULL; // to disable normal finishPam() handling
             while (respond(QString())); // clear our local queue of QFutures