[patch] xlockmore-5.18-passwd.diff

xlockmore-5.18-passwd.diff (text/plain), 1.27 KB, created by Marcelo Goes (RETIRED) on 2005-06-23 16:39:53 UTC

diff --exclude='*~' -Naur xlockmore-5.18.orig/xlock/passwd.c xlockmore-5.18/xlock/passwd.c
--- xlockmore-5.18.orig/xlock/passwd.c	2005-06-23 20:26:13.000000000 -0300
+++ xlockmore-5.18/xlock/passwd.c	2005-06-23 20:29:41.000000000 -0300
@@ -1186,7 +1186,7 @@
 #endif
 
 #define PAM_BAIL if (pam_error != PAM_SUCCESS) { \
-    pam_end(pamh, pam_error); BAD_PAM_SETUID return False; \
+    pam_end(pamh, 0); BAD_PAM_SETUID return False; \
 }
 #ifdef BAD_PAM
 	ruid = getuid();  /* the real user we are running as */
@@ -1196,12 +1196,6 @@
 	pam_error = pam_start("xlock", user, &PAM_conversation, &pamh);
 	PAM_BAIL;
 
-	display = getenv("DISPLAY");
-	if (display != NULL) {
-		pam_error = pam_set_item(pamh, PAM_TTY, display);
-		PAM_BAIL;
-	}
-
 	pam_error = pam_authenticate(pamh, 0);
 	if (pam_error != PAM_SUCCESS) {
                 if (!allowroot) {
@@ -1218,15 +1212,6 @@
 #ifdef BAD_PAM
 	(void) seteuid(ruid); /* back to user's privileges */
 #endif
-
-	pam_error = pam_acct_mgmt(pamh, 0);
-	if (pam_error == PAM_NEW_AUTHTOK_REQD)
-		pam_error = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK);
-	PAM_BAIL;
-
-	pam_error = pam_setcred(pamh, PAM_REINITIALIZE_CRED);
-	PAM_BAIL;
-
 	pam_end(pamh, PAM_SUCCESS);
 	/* If this point is reached, the user has been authenticated. */
 	done = True;