@@ -48,6 +48,7 @@ public:
4848 this, SLOT(finishPam()));
4949 connect(this, SIGNAL(showMessage(QString, QLightDM::Greeter::MessageType)),
5050 greeter, SIGNAL(showMessage(QString, QLightDM::Greeter::MessageType)));
51+ // This next connect is how we pass ResponseFutures between threads
5152 connect(this, SIGNAL(showPrompt(QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),
5253 this, SLOT(handlePrompt(QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)));
5354 }
@@ -68,11 +69,11 @@ public:
6869 conversation.conv = converseWithPam;
6970 conversation.appdata_ptr = static_cast<void*>(this);
7071
71− if (pam_start("lightdm", username.toUtf8(),
72− &conversation, &pamHandle) == PAM_SUCCESS) {
72+ if (pam_start("lightdm", username.toUtf8(), &conversation, &pamHandle) == PAM_SUCCESS) {
7373 futureWatcher.setFuture(QtConcurrent::run(authenticateWithPam, pamHandle));
7474 } else {
7575 greeterPrivate->authenticated = false;
76+ Q_EMIT greeter->showMessage("Internal error: could not start PAM authentication", QLightDM::Greeter::MessageTypeError);
7677 Q_EMIT greeter->authenticationComplete();
7778 }
7879 }
@@ -80,12 +81,15 @@ public:
8081 static int authenticateWithPam(pam_handle* pamHandle)
8182 {
8283 int pamStatus = pam_authenticate(pamHandle, 0);
83− if (pamStatus == PAM_SUCCESS)
84− pamStatus = pam_acct_mgmt(pamHandle, 0);
85− if (pamStatus == PAM_NEW_AUTHTOK_REQD)
86− pamStatus = pam_chauthtok(pamHandle, PAM_CHANGE_EXPIRED_AUTHTOK);
87− if (pamStatus == PAM_SUCCESS)
88− pam_setcred(pamHandle, PAM_REINITIALIZE_CRED);
84+ if (pamStatus == PAM_SUCCESS) {
85+ pamStatus = pam_acct_mgmt(pamHandle, 0);
86+ }
87+ if (pamStatus == PAM_NEW_AUTHTOK_REQD) {
88+ pamStatus = pam_chauthtok(pamHandle, PAM_CHANGE_EXPIRED_AUTHTOK);
89+ }
90+ if (pamStatus == PAM_SUCCESS) {
91+ pam_setcred(pamHandle, PAM_REINITIALIZE_CRED);
92+ }
8993 return pamStatus;
9094 }
9195
@@ -101,11 +105,10 @@ public:
101105
102106 GreeterImpl* impl = static_cast<GreeterImpl*>(appdata_ptr);
103107
104− bool raise_error = false;
105108 int count;
106109 QVector<ResponseFuture> responses;
107110
108− for (count = 0; count < num_msg && !raise_error; ++count)
111+ for (count = 0; count < num_msg; ++count)
109112 {
110113 switch (msg[count]->msg_style)
111114 {
@@ -123,21 +126,25 @@ public:
123126 responses.append(ResponseFuture());
124127 responses.last().reportStarted();
125128 Q_EMIT impl->showPrompt(message, Greeter::PromptTypeSecret, responses.last());
129+ break;
126130 }
127131 case PAM_TEXT_INFO:
128132 {
129133 QString message(msg[count]->msg);
130134 Q_EMIT impl->showMessage(message, Greeter::MessageTypeInfo);
135+ break;
131136 }
132137 default:
133138 {
134139 QString message(msg[count]->msg);
135140 Q_EMIT impl->showMessage(message, Greeter::MessageTypeError);
141+ break;
136142 }
137143 }
138144 }
139145
140146 int i = 0;
147+ bool raise_error = false;
141148
142149 for (auto &response : responses)
143150 {