diff options
| author | Timothy Pearson <[email protected]> | 2016-09-06 22:51:08 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2016-09-06 22:51:08 -0500 |
| commit | 2649b1ebf4eec141dc8e1642f9decac615ca5f29 (patch) | |
| tree | da10b6f28795c3f87ceff237c811456b5deea494 | |
| parent | a7afe91e652b20b764c78ca9508cdd8f0a27dd8f (diff) | |
| download | tdebase-2649b1ebf4eec141dc8e1642f9decac615ca5f29.tar.gz tdebase-2649b1ebf4eec141dc8e1642f9decac615ca5f29.zip | |
Disable card-based login if Kerberos support was disabled at compile time
| -rw-r--r-- | kdesktop/lock/lockdlg.cc | 5 | ||||
| -rw-r--r-- | tdm/kfrontend/kgreeter.cpp | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc index 1be892e2a..d51536dca 100644 --- a/kdesktop/lock/lockdlg.cc +++ b/kdesktop/lock/lockdlg.cc @@ -975,10 +975,13 @@ void PasswordDlg::capsLocked() void PasswordDlg::attemptCardLogin() { #ifdef HAVE_KRB5 - /* Make sure card logins are enabled before attempting one */ + // Make sure card logins are enabled before attempting one if (!LDAPManager::pkcsLoginEnabled()) { return; } +#else + // Don't enable card-based logins if Kerberos integration was disabled + return; #endif if (mCardLoginInProgress) { diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index 1143a8609..6ce76ebf3 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/tdm/kfrontend/kgreeter.cpp @@ -861,10 +861,13 @@ KGreeter::verifySetUser( const TQString &user ) void KGreeter::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) { #ifdef HAVE_KRB5 - /* Make sure card logins are enabled before attempting one */ + // Make sure card logins are enabled before attempting one if (!LDAPManager::pkcsLoginEnabled()) { return; } +#else + // Don't enable card-based logins if Kerberos integration was disabled + return; #endif TQString login_name = TQString::null; |