diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2016-09-06 15:08:26 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2016-09-06 15:08:26 -0500 |
| commit | a7afe91e652b20b764c78ca9508cdd8f0a27dd8f (patch) | |
| tree | dfc424a94af940f4495eae44acef610c5cb7042c /kdesktop | |
| parent | 3252800255e59562f401ad0df2cf37cd50d0b1a4 (diff) | |
| download | tdebase-a7afe91e652b20b764c78ca9508cdd8f0a27dd8f.tar.gz tdebase-a7afe91e652b20b764c78ca9508cdd8f0a27dd8f.zip | |
Do not start card authentication unless PKCS logins were enabled
Rename UserList class in kgreeter.cpp to avoid conflict with TDE LDAP library class name
Diffstat (limited to 'kdesktop')
| -rw-r--r-- | kdesktop/lock/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | kdesktop/lock/lockdlg.cc | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt index 2bbe4b289..a0ec2f08a 100644 --- a/kdesktop/lock/CMakeLists.txt +++ b/kdesktop/lock/CMakeLists.txt @@ -19,10 +19,12 @@ include_directories( ${CMAKE_SOURCE_DIR}/kcheckpass ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} + ${KRB5_INCLUDE_DIRS} ) link_directories( ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} ) @@ -38,6 +40,7 @@ set( ${target}_SRCS tde_add_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK kdesktopsettings-static dmctl-static tdeio-shared Xext - pthread ${GL_LIBRARIES} "${LINKER_IMMEDIATE_BINDING_FLAGS}" + pthread ${GL_LIBRARIES} ${LIBTDELDAP_LIBRARIES} + "${LINKER_IMMEDIATE_BINDING_FLAGS}" DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc index 8202a7f68..1be892e2a 100644 --- a/kdesktop/lock/lockdlg.cc +++ b/kdesktop/lock/lockdlg.cc @@ -58,6 +58,10 @@ #include <X11/Xatom.h> #include <fixx11h.h> +#ifdef HAVE_KRB5 +#include <tde/libtdeldap.h> +#endif + #ifndef AF_LOCAL # define AF_LOCAL AF_UNIX #endif @@ -970,6 +974,13 @@ void PasswordDlg::capsLocked() } void PasswordDlg::attemptCardLogin() { +#ifdef HAVE_KRB5 + /* Make sure card logins are enabled before attempting one */ + if (!LDAPManager::pkcsLoginEnabled()) { + return; + } +#endif + if (mCardLoginInProgress) { return; } |