Attachment #298765 for bug #398331





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)

Lines 1-7 Link Here

(-)kdm/CMakeLists.txt (-1 / +1 lines)
1	include_directories( BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/backend )	1	include_directories( BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/backend )
2		2
3		3
4	install_pam_service(KDM)	4	#install_pam_service(KDM)
5		5
6	include(ConfigureChecks.cmake)	6	include(ConfigureChecks.cmake)
7		7




/* 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


Lines 743-750 Link Here

(-)kdm/backend/client.c (-2 lines)
743	if (authenticate_user(p, curpass, 0) < 0)	743	if (authenticate_user(p, curpass, 0) < 0)
744	# elif defined(HAVE_PW_ENCRYPT)	744	# elif defined(HAVE_PW_ENCRYPT)
745	if (strcmp(pw_encrypt(curpass, p->pw_passwd), p->pw_passwd))	745	if (strcmp(pw_encrypt(curpass, p->pw_passwd), p->pw_passwd))
746	# elif defined(HAVE_CRYPT)
747	if (strcmp(crypt(curpass, p->pw_passwd), p->pw_passwd))
748	# else	746	# else
749	if (strcmp(curpass, p->pw_passwd))	747	if (strcmp(curpass, p->pw_passwd))
750	# endif	748	# endif

Return to bug 398331

Lines 4-43 Link Here

(-)ConfigureChecks.cmake (-34 lines)
4		4
5	macro_optional_find_package(XKB) # kxkb, kdm	5	macro_optional_find_package(XKB) # kxkb, kdm
6		6
7	if (PAM_FOUND)
8	set(KDE4_COMMON_PAM_SERVICE "kde" CACHE STRING "The PAM service to use unless overridden for a particular app.")
9
10	macro(define_pam_service APP)
11	string(TOUPPER ${APP}_PAM_SERVICE var)
12	set(cvar KDE4_${var})
13	set(${cvar} "${KDE4_COMMON_PAM_SERVICE}" CACHE STRING "The PAM service for ${APP}.")
14	mark_as_advanced(${cvar})
15	set(${var} "\"${${cvar}}\"")
16	endmacro(define_pam_service)
17
18	macro(install_pam_service APP)
19	string(TOUPPER KDE4_${APP}_PAM_SERVICE cvar)
20	install(CODE "
21	set(DESTDIR_VALUE \"\$ENV{DESTDIR}\")
22	if (NOT DESTDIR_VALUE)
23	exec_program(\"${KDEBASE_WORKSPACE_SOURCE_DIR}/mkpamserv\" ARGS ${${cvar}} RETURN_VALUE ret)
24	if (NOT ret)
25	exec_program(\"${KDEBASE_WORKSPACE_SOURCE_DIR}/mkpamserv\" ARGS -P ${${cvar}}-np)
26	endif (NOT ret)
27	endif (NOT DESTDIR_VALUE)
28	")
29	endmacro(install_pam_service)
30
31	define_pam_service(KDM)
32	define_pam_service(kscreensaver)
33
34	else (PAM_FOUND)
35
36	macro(install_pam_service APP)
37	endmacro(install_pam_service)
38
39	endif (PAM_FOUND)
40
41	find_program(some_x_program NAMES iceauth xrdb xterm)	7	find_program(some_x_program NAMES iceauth xrdb xterm)
42	if (NOT some_x_program)	8	if (NOT some_x_program)
43	set(some_x_program /usr/bin/xrdb)	9	set(some_x_program /usr/bin/xrdb)

Lines 1-18 Link Here

(-)config-unix.h.cmake (-15 lines)
1	/* Defines if you have PAM (Pluggable Authentication Modules) */
2	#cmakedefine HAVE_PAM 1
3
4	/* Define if your PAM headers are in pam/ instead of security/ */
5	#cmakedefine HAVE_PAM_PAM_APPL_H 1
6
7	/* Define if your PAM expects a conversation function with const pam_message (Solaris) */
8	#cmakedefine PAM_MESSAGE_CONST 1
9
10	/* The PAM service to be used by kdm */
11	#cmakedefine KDM_PAM_SERVICE ${KDM_PAM_SERVICE}
12
13	/* The PAM service to be used by kscreensaver */
14	#cmakedefine KSCREENSAVER_PAM_SERVICE ${KSCREENSAVER_PAM_SERVICE}
15
16	/* Defines if your system has the getspnam function */	1	/* Defines if your system has the getspnam function */
17	#cmakedefine HAVE_GETSPNAM 1	2	#cmakedefine HAVE_GETSPNAM 1
18		3