Disable card-based login if Kerberos support was disabled at compile time

8 years ago · 2649b1ebf4
parent a7afe91e65
commit 2649b1ebf4
2 changed files with 8 additions and 2 deletions
--- 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) {
--- 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;