summaryrefslogtreecommitdiffstats
path: root/tdm/kfrontend
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2016-09-22 20:26:55 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2016-09-22 20:27:19 -0500
commit1757afecf639d23eb03a22104a71716c85bec23e (patch)
tree3a45994a9b91ec36265c9b66fecaccd95b1e885b /tdm/kfrontend
parentd5feffdec9e2380f9dd590607a71669dd772e319 (diff)
downloadtdebase-1757afecf639d23eb03a22104a71716c85bec23e.tar.gz
tdebase-1757afecf639d23eb03a22104a71716c85bec23e.zip
Force card logins to authenticate against the username specified in the card certificate
Diffstat (limited to 'tdm/kfrontend')
-rw-r--r--tdm/kfrontend/kgreeter.cpp5
-rw-r--r--tdm/kfrontend/kgverify.cpp4
2 files changed, 7 insertions, 2 deletions
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp
index 6ce76ebf..a42ffd0a 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -639,12 +639,13 @@ KGreeter::slotUserEntered()
{
if (userView) {
TQListViewItem *item;
- for (item = userView->firstChild(); item; item = item->nextSibling())
+ for (item = userView->firstChild(); item; item = item->nextSibling()) {
if (((UserListViewItem *)item)->login == curUser) {
userView->setSelected( item, true );
userView->ensureItemVisible( item );
goto oke;
}
+ }
userView->clearSelection();
}
oke:
@@ -915,6 +916,7 @@ void KGreeter::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
if (!user_active && vt_active) {
// Select the correct user
verify->setUser(login_name);
+ userView->setEnabled(false);
verifySetUser(login_name);
verify->lockUserEntry(true);
@@ -936,6 +938,7 @@ void KGreeter::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
void KGreeter::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) {
cardLoginUser = TQString::null;
+ userView->setEnabled(false);
verify->lockUserEntry(false);
verify->requestAbort();
verify->setPasswordPrompt(TQString::null);
diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp
index a3464a5b..93bcce27 100644
--- a/tdm/kfrontend/kgverify.cpp
+++ b/tdm/kfrontend/kgverify.cpp
@@ -323,8 +323,10 @@ KGVerify::start()
if (!_autoLoginAgain)
_autoLoginDelay = 0, timeable = false;
return;
- } else
+ }
+ else if (!cardLoginInProgress) {
applyPreset();
+ }
}
running = true;
Debug( "%s->start()\n", pName.data() );