git.iko.soy/unity8
on xenial help sign in
Cancel open PAM interactions on shutdown - fixes hang on logout on desktop
93a0254Gerry Boland
tests/mocks/LightDM/demo/GreeterPrivate.cpp+18−8
compare with xenial
unifiedsplit
@@ -53,16 +53,15 @@ public:
53 this, SLOT(handlePrompt(QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)));
53 this, SLOT(handlePrompt(QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)));
54 }
54 }
55
55
56+ ~GreeterImpl()
57+ {
58+ cancelPam();
59+ }
60+
56 void start(QString username)
61 void start(QString username)
57 {
62 {
58− // Clear out any existing PAM interactions first (we can't simply
63+ // Clear out any existing PAM interactions first
59− // cancel our QFuture because QtConcurrent::run doesn't support cancel)
64+ cancelPam();
60− if (pamHandle != NULL) {
61− pam_handle *handle = pamHandle;
62− pamHandle = NULL; // to disable normal finishPam() handling
63− while (respond(QString())); // clear our local queue of QFutures
64− pam_end(handle, PAM_CONV_ERR);
65− }
66
65
67 // Now actually start a new conversation with PAM
66 // Now actually start a new conversation with PAM
68 pam_conv conversation;
67 pam_conv conversation;
@@ -212,6 +211,17 @@ private Q_SLOTS:
212 }
211 }
213
212
214private:
213private:
214+ void cancelPam()
215+ {
216+ // Unfortunately we can't simply cancel our QFuture because QtConcurrent::run doesn't support cancel
217+ if (pamHandle != NULL) {
218+ pam_handle *handle = pamHandle;
219+ pamHandle = NULL; // to disable normal finishPam() handling
220+ while (respond(QString())); // clear our local queue of QFutures
221+ pam_end(handle, PAM_CONV_ERR);
222+ }
223+ }
224+
215 Greeter *greeter;
225 Greeter *greeter;
216 GreeterPrivate *greeterPrivate;
226 GreeterPrivate *greeterPrivate;
217 pam_handle* pamHandle;
227 pam_handle* pamHandle;