Avoid direct usage of tdeldap library. This allows to remove hard dependency between packages.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

ConfigureChecks.cmake

@@ -467,7 +467,6 @@ if( WITH_KRB5 )
     endif( NOT HAVE_KRB_KADM_H )
   endif( NOT KRB5_FOUND )
   set( HAVE_KRB5 1 )
-  set( LIBTDELDAP_LIBRARIES "tdeldap" )
 endif( )
 
 # check for libr

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}
 )

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

tdm/kfrontend/CMakeLists.txt

@@ -71,7 +71,7 @@ tde_add_executable( tdm_greet AUTOMOC
     kfdialog.cpp kgdialog.cpp kchooser.cpp kgverify.cpp
     tdmshutdown.cpp tdmadmindialog.cpp kgreeter.cpp
     kgapp.cpp sakdlg.cpp
-  LINK tdmthemer-static tdeui-shared tdeio-shared dmctl-static Xtst ${LIBTDELDAP_LIBRARIES} ${TDMGREET_OPTIONAL_LINK}
+  LINK tdmthemer-static tdeui-shared tdeio-shared dmctl-static Xtst ${TDMGREET_OPTIONAL_LINK}
   DESTINATION ${BIN_INSTALL_DIR}
 )
 

tdm/kfrontend/kgreeter.cpp

@@ -99,9 +99,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <X11/Xlib.h>
 
-#ifdef HAVE_KRB5
-#include <libtdeldap.h>
-#endif
 
 #define FIFO_DIR "/tmp/tdesocket-global/tdm"
 #define FIFO_FILE "/tmp/tdesocket-global/tdm/tdmctl-%1"
@@ -863,7 +860,12 @@ KGreeter::verifySetUser( const TQString &user )
 void KGreeter::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
 #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