Branch: master

2649b1eb 2016-09-06 22:51:08 Timothy Pearson
Disable card-based login if Kerberos support was disabled at compile time
M kdesktop/lock/lockdlg.cc
M tdm/kfrontend/kgreeter.cpp
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index 1be892e..d51536d 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -975,10 +975,13 @@
 
 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 1143a86..6ce76eb 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -861,10 +861,13 @@
 
 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;