1
=== modified file 'tests/mocks/LightDM/demo/GreeterPrivate.cpp'
2
--- tests/mocks/LightDM/demo/GreeterPrivate.cpp	2014-07-15 16:38:02 +0000
3
+++ tests/mocks/LightDM/demo/GreeterPrivate.cpp	2014-08-15 09:47:23 +0000
4
@@ -53,16 +53,15 @@
5
53
                this, SLOT(handlePrompt(QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)));
53
                this, SLOT(handlePrompt(QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)));
6
54
    }
54
    }
7
55
55
8
56
    ~GreeterImpl()
9
57
    {
10
58
        cancelPam();
11
59
    }
12
60
13
56
    void start(QString username)
61
    void start(QString username)
14
57
    {
62
    {
23
58
        // Clear out any existing PAM interactions first (we can't simply
63
        // Clear out any existing PAM interactions first
24
59
        // cancel our QFuture because QtConcurrent::run doesn't support cancel)
64
        cancelPam();
17
60
        if (pamHandle != NULL) {
18
61
            pam_handle *handle = pamHandle;
19
62
            pamHandle = NULL; // to disable normal finishPam() handling
20
63
            while (respond(QString())); // clear our local queue of QFutures
21
64
            pam_end(handle, PAM_CONV_ERR);
22
65
        }
25
66
65
26
67
        // Now actually start a new conversation with PAM
66
        // Now actually start a new conversation with PAM
27
68
        pam_conv conversation;
67
        pam_conv conversation;
28
@@ -212,6 +211,17 @@
29
212
    }
211
    }
30
213
212
31
214
private:
213
private:
32
214
    void cancelPam()
33
215
    {
34
216
        // Unfortunately we can't simply cancel our QFuture because QtConcurrent::run doesn't support cancel
35
217
        if (pamHandle != NULL) {
36
218
            pam_handle *handle = pamHandle;
37
219
            pamHandle = NULL; // to disable normal finishPam() handling
38
220
            while (respond(QString())); // clear our local queue of QFutures
39
221
            pam_end(handle, PAM_CONV_ERR);
40
222
        }
41
223
    }
42
224
43
215
    Greeter *greeter;
225
    Greeter *greeter;
44
216
    GreeterPrivate *greeterPrivate;
226
    GreeterPrivate *greeterPrivate;
45
217
    pam_handle* pamHandle;
227
    pam_handle* pamHandle;
Reviewer	Review Type	Date Requested	Status
Christopher Townsend			Approve on 2014-08-21
PS Jenkins bot (community)	continuous-integration		Approve on 2014-08-17
Michael Terry		2014-08-15	Approve on 2014-08-15
Michał Sawicz		2014-08-15	Approve on 2014-08-15
Review via email: mp+230945@code.launchpad.net