diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-11 13:56:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-11 13:56:06 -0600 |
| commit | 51ff055d6ce9e93584818d5e80e42fa9cb1da0a3 (patch) | |
| tree | 977e38b6d43f5c0cacb3d4b33258263471bd765c | |
| parent | 3ed19b2a1e9047cef4a505d82c55cdba8201f0e2 (diff) | |
| download | tdebase-51ff055d6ce9e93584818d5e80e42fa9cb1da0a3.tar.gz tdebase-51ff055d6ce9e93584818d5e80e42fa9cb1da0a3.zip | |
Fix KDM logins when PAM is not in use
This closes Bug 624
| -rw-r--r-- | config.h.cmake | 1 | ||||
| -rw-r--r-- | kdm/ConfigureChecks.cmake | 10 | ||||
| -rw-r--r-- | kdm/backend/CMakeLists.txt | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/config.h.cmake b/config.h.cmake index a8de2fa3c..b4ca189a9 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -120,6 +120,7 @@ #cmakedefine HAVE_SYSINFO 1 #cmakedefine HAVE_STRNLEN 1 #cmakedefine HAVE_GETIFADDRS 1 +#cmakedefine HAVE_CRYPT 1 #cmakedefine HAVE_SETUSERCONTEXT 1 #cmakedefine HAVE_GETUSERSHELL 1 diff --git a/kdm/ConfigureChecks.cmake b/kdm/ConfigureChecks.cmake index 162a8a6ba..ae7ea8b6c 100644 --- a/kdm/ConfigureChecks.cmake +++ b/kdm/ConfigureChecks.cmake @@ -27,6 +27,16 @@ check_function_exists( login_getclass HAVE_LOGIN_GETCLASS ) check_function_exists( auth_timeok HAVE_AUTH_TIMEOK ) tde_restore( CMAKE_REQUIRED_LIBRARIES ) +check_function_exists( crypt LIBC_HAVE_CRYPT ) +if( LIBC_HAVE_CRYPT ) + set( HAVE_CRYPT 1 CACHE INTERNAL "" FORCE ) +else( ) + check_library_exists( crypt crypt "" HAVE_CRYPT ) + if( HAVE_CRYPT ) + set( CRYPT_LIBRARY crypt ) + endif( ) +endif( ) + check_include_file( lastlog.h HAVE_LASTLOG_H ) check_include_file( termio.h HAVE_TERMIO_H ) diff --git a/kdm/backend/CMakeLists.txt b/kdm/backend/CMakeLists.txt index 47256a7a7..b93174e4c 100644 --- a/kdm/backend/CMakeLists.txt +++ b/kdm/backend/CMakeLists.txt @@ -43,6 +43,6 @@ tde_add_executable( kdm process.c protodpy.c reset.c resource.c rpcauth.c server.c session.c sessreg.c socket.c streams.c util.c xdmauth.c xdmcp.c - LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${PAM_LIBRARY} ${XDMCP_LIBRARIES} + LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) |