[patch] the files/no-pam.patch

no-pam.patch (text/plain), 3.26 KB, created by Ian Delaney (RETIRED) on 2012-01-12 16:26:18 UTC

diff -ur kdm-4.7.3.orig/ConfigureChecks.cmake kdm-4.7.3/ConfigureChecks.cmake
--- ConfigureChecks.cmake	2011-10-02 20:48:12.000000000 +0800
+++ ConfigureChecks.cmake	2012-01-12 21:16:19.687047527 +0800
@@ -4,40 +4,6 @@
 
 macro_optional_find_package(XKB) # kxkb, kdm
 
-if (PAM_FOUND)
-    set(KDE4_COMMON_PAM_SERVICE "kde" CACHE STRING "The PAM service to use unless overridden for a particular app.")
-
-    macro(define_pam_service APP)
-        string(TOUPPER ${APP}_PAM_SERVICE var)
-        set(cvar KDE4_${var})
-        set(${cvar} "${KDE4_COMMON_PAM_SERVICE}" CACHE STRING "The PAM service for ${APP}.")
-        mark_as_advanced(${cvar})
-        set(${var} "\"${${cvar}}\"")
-    endmacro(define_pam_service)
-
-    macro(install_pam_service APP)
-        string(TOUPPER KDE4_${APP}_PAM_SERVICE cvar)
-        install(CODE "
-            set(DESTDIR_VALUE \"\$ENV{DESTDIR}\")
-            if (NOT DESTDIR_VALUE)
-                exec_program(\"${KDEBASE_WORKSPACE_SOURCE_DIR}/mkpamserv\" ARGS ${${cvar}} RETURN_VALUE ret)
-                if (NOT ret)
-                    exec_program(\"${KDEBASE_WORKSPACE_SOURCE_DIR}/mkpamserv\" ARGS -P ${${cvar}}-np)
-                endif (NOT ret)
-            endif (NOT DESTDIR_VALUE)
-                    ")
-    endmacro(install_pam_service)
-
-    define_pam_service(KDM)
-    define_pam_service(kscreensaver)
-
-else (PAM_FOUND)
-
-    macro(install_pam_service APP)
-    endmacro(install_pam_service)
-
-endif (PAM_FOUND)
-
 find_program(some_x_program NAMES iceauth xrdb xterm)
 if (NOT some_x_program)
     set(some_x_program /usr/bin/xrdb)
diff -ur kdm-4.7.3.orig/kdm/CMakeLists.txt kdm-4.7.3/kdm/CMakeLists.txt
--- kdm/CMakeLists.txt	2011-05-21 04:32:06.000000000 +0800
+++ kdm/CMakeLists.txt	2012-01-12 22:06:02.229048681 +0800
@@ -1,7 +1,7 @@
 include_directories( BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/backend )
 
 
-install_pam_service(KDM)
+#install_pam_service(KDM)
 
 include(ConfigureChecks.cmake)
 
diff -ur kdm-4.7.3.orig/config-unix.h.cmake kdm-4.7.3/config-unix.h.cmake
--- config-unix.h.cmake	2011-05-21 04:32:06.000000000 +0800
+++ config-unix.h.cmake	2012-01-12 23:02:19.657049989 +0800
@@ -1,18 +1,3 @@
-/* Defines if you have PAM (Pluggable Authentication Modules) */
-#cmakedefine HAVE_PAM 1
-
-/* Define if your PAM headers are in pam/ instead of security/ */
-#cmakedefine HAVE_PAM_PAM_APPL_H 1
-
-/* Define if your PAM expects a conversation function with const pam_message (Solaris) */
-#cmakedefine PAM_MESSAGE_CONST 1
-
-/* The PAM service to be used by kdm */
-#cmakedefine KDM_PAM_SERVICE ${KDM_PAM_SERVICE}
-
-/* The PAM service to be used by kscreensaver */
-#cmakedefine KSCREENSAVER_PAM_SERVICE ${KSCREENSAVER_PAM_SERVICE}
-
 /* Defines if your system has the getspnam function */
 #cmakedefine HAVE_GETSPNAM 1
 
diff -ur kdm-4.7.3.orig/kdm/backend/client.c kdm-4.7.3/kdm/backend/client.c
--- kdm/backend/client.c	2011-05-21 04:32:06.000000000 +0800
+++ kdm/backend/client.c	2012-01-12 23:58:44.227051299 +0800
@@ -743,8 +743,6 @@
     if (authenticate_user(p, curpass, 0) < 0)
 # elif defined(HAVE_PW_ENCRYPT)
     if (strcmp(pw_encrypt(curpass, p->pw_passwd), p->pw_passwd))
-# elif defined(HAVE_CRYPT)
-    if (strcmp(crypt(curpass, p->pw_passwd), p->pw_passwd))
 # else
     if (strcmp(curpass, p->pw_passwd))
 # endif