From ba97e2dc25f533f7942493e7f7d1203fdb64fc33 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Wed, 21 Apr 2021 23:35:09 +0900
Subject: Avoid direct usage of tdeldap library. This allows to remove hard
 dependency between packages.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 kdesktop/lock/CMakeLists.txt |  2 +-
 kdesktop/lock/lockdlg.cpp    | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'kdesktop/lock')

diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt
index 0a8f5603c..cc95489f9 100644
--- a/kdesktop/lock/CMakeLists.txt
+++ b/kdesktop/lock/CMakeLists.txt
@@ -41,7 +41,7 @@ set( ${target}_SRCS
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK kdesktopsettings-static dmctl-static tdeio-shared Xext
-    pthread ${GL_LIBRARIES} ${LIBTDELDAP_LIBRARIES}
+    pthread ${GL_LIBRARIES}
     "${LINKER_IMMEDIATE_BINDING_FLAGS}"
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdesktop/lock/lockdlg.cpp b/kdesktop/lock/lockdlg.cpp
index d4b456a9e..e8d3c19b7 100644
--- a/kdesktop/lock/lockdlg.cpp
+++ b/kdesktop/lock/lockdlg.cpp
@@ -21,6 +21,7 @@
 #include <kpushbutton.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
+#include <ksimpleconfig.h>
 #include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
@@ -58,9 +59,6 @@
 #include <X11/Xatom.h>
 #include <fixx11h.h>
 
-#ifdef HAVE_KRB5
-#include <libtdeldap.h>
-#endif
 
 #ifndef AF_LOCAL
 # define AF_LOCAL	AF_UNIX
@@ -976,7 +974,12 @@ void PasswordDlg::capsLocked()
 void PasswordDlg::attemptCardLogin() {
 #ifdef HAVE_KRB5
 	// Make sure card logins are enabled before attempting one
-	if (!LDAPManager::pkcsLoginEnabled()) {
+	KSimpleConfig *systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
+	systemconfig->setGroup(NULL);
+	bool enabled = systemconfig->readBoolEntry("EnablePKCS11Login", false);
+	delete systemconfig;
+	if (!enabled)
+	{
 		return;
 	}
 #else
-- 
cgit v1.2.1