Attachment #5796 for bug #28277

View | Details | Raw Unified | Return to bug 28277
Collapse All | Expand All

Lines 119-124 Link Here

(-)enlightenment-0.17.1/config.h.in (+3 lines)
119	/* PAM Authentication Support */	119	/* PAM Authentication Support */
120	#undef HAVE_PAM	120	#undef HAVE_PAM
121		121
		122	/* PAM Authentication helper Support */
		123	#undef USE_PAM_HELPER
		124
122	/* Define to 1 if you have the <security/pam_appl.h> header file. */	125	/* Define to 1 if you have the <security/pam_appl.h> header file. */
123	#undef HAVE_SECURITY_PAM_APPL_H	126	#undef HAVE_SECURITY_PAM_APPL_H
124		127




    fi
fi

use_pam_helper=no
AC_ARG_WITH(pam-helper,
  AC_HELP_STRING([--with-pam-helper], [with PAM helper @<:@default=no@:>@]),
  [use_pam_helper=$withval],
  [use_pam_helper=no]
)
if test "x$use_pam_helper" != "xno" ; then
  AC_DEFINE_UNQUOTED(USE_PAM_HELPER, "$use_pam_helper", [PAM Authentication helper path])
fi

dnl AC_E_CHECK_PKG(VALGRIND, [valgrind >= 2.4.0], [], [:])
AC_SUBST(VALGRIND_CFLAGS)
AC_SUBST(VALGRIND_LIBS)




        char *current_user, *p;
        struct sigaction action;

#ifdef USE_PAM_HELPER
        if (!access(USE_PAM_HELPER, X_OK)) {
          FILE *fp = popen(USE_PAM_HELPER, "w");

          if (fp)
            {
               int status;

               fputs(passwd, fp);
               status = pclose(fp);
               if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
                 exit(0);
            }
          exit(-1);
        }
#endif
        action.sa_handler = SIG_DFL;
        action.sa_flags = SA_ONSTACK | SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
        sigemptyset(&action.sa_mask);

Return to bug 28277

Lines 1005-1010 Link Here

(-)enlightenment-0.17.1/src/bin/e_desklock.c (+16 lines)
1005	char current_user, p;	1005	char current_user, p;
1006	struct sigaction action;	1006	struct sigaction action;
1007		1007
		1008	#ifdef USE_PAM_HELPER
		1009	if (!access(USE_PAM_HELPER, X_OK)) {
		1010	FILE *fp = popen(USE_PAM_HELPER, "w");
		1011
		1012	if (fp)
		1013	{
		1014	int status;
		1015
		1016	fputs(passwd, fp);
		1017	status = pclose(fp);
		1018	if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
		1019	exit(0);
		1020	}
		1021	exit(-1);
		1022	}
		1023	#endif
1008	action.sa_handler = SIG_DFL;	1024	action.sa_handler = SIG_DFL;
1009	action.sa_flags = SA_ONSTACK \| SA_NODEFER \| SA_RESETHAND \| SA_SIGINFO;	1025	action.sa_flags = SA_ONSTACK \| SA_NODEFER \| SA_RESETHAND \| SA_SIGINFO;
1010	sigemptyset(&action.sa_mask);	1026	sigemptyset(&action.sa_mask);

Lines 111-116 Link Here

(-)enlightenment-0.17.1/configure.ac (+10 lines)
111	fi	111	fi
112	fi	112	fi
113		113
		114	use_pam_helper=no
		115	AC_ARG_WITH(pam-helper,
		116	AC_HELP_STRING([--with-pam-helper], [with PAM helper @<:@default=no@:>@]),
		117	[use_pam_helper=$withval],
		118	[use_pam_helper=no]
		119	)
		120	if test "x$use_pam_helper" != "xno" ; then
		121	AC_DEFINE_UNQUOTED(USE_PAM_HELPER, "$use_pam_helper", [PAM Authentication helper path])
		122	fi
		123
114	dnl AC_E_CHECK_PKG(VALGRIND, [valgrind >= 2.4.0], [], [:])	124	dnl AC_E_CHECK_PKG(VALGRIND, [valgrind >= 2.4.0], [], [:])
115	AC_SUBST(VALGRIND_CFLAGS)	125	AC_SUBST(VALGRIND_CFLAGS)
116	AC_SUBST(VALGRIND_LIBS)	126	AC_SUBST(VALGRIND_LIBS)