diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2021-04-21 23:35:09 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2021-04-22 09:33:18 +0900 |
| commit | ba97e2dc25f533f7942493e7f7d1203fdb64fc33 (patch) | |
| tree | e7ee78ac96299de08dbace07f41183ffa48d398d /tdm | |
| parent | 7b6a9db8589b55d46f1de318a93db4bc1aff63a0 (diff) | |
| download | tdebase-ba97e2dc25f533f7942493e7f7d1203fdb64fc33.tar.gz tdebase-ba97e2dc25f533f7942493e7f7d1203fdb64fc33.zip | |
Avoid direct usage of tdeldap library. This allows to remove hard dependency between packages.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'tdm')
| -rw-r--r-- | tdm/kfrontend/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tdm/kfrontend/kgreeter.cpp | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tdm/kfrontend/CMakeLists.txt b/tdm/kfrontend/CMakeLists.txt index bd8cc29b2..fa95542df 100644 --- a/tdm/kfrontend/CMakeLists.txt +++ b/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} ) diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index 7f45ca197..cd61aa857 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/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 |