rpms/xlockmore/FC-3 xlockmore.older-passwd.patch, NONE, 1.1 xlockmore.spec, 1.2, 1.3

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/rpms/xlockmore/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4011

Modified Files:
	xlockmore.spec 
Added Files:
	xlockmore.older-passwd.patch 
Log Message:
included patch to make it work again with PAM (BZ #161740)


xlockmore.older-passwd.patch:

--- NEW FILE xlockmore.older-passwd.patch ---
--- xlockmore-5.18/xlock/passwd.c	2005-05-31 15:54:36.000000000 +0200
+++ xlockmore-5.16/xlock/passwd.c	2005-02-17 02:24:50.000000000 +0100
@@ -1218,15 +1208,10 @@
 #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;
-
+	/* Do not do account management or credentials; credentials
+	 * are not needed and account management would just lock up
+	 * a computer and require root to come and unlock it.  Blech.
+	 */
 	pam_end(pamh, PAM_SUCCESS);
 	/* If this point is reached, the user has been authenticated. */
 	done = True;


Index: xlockmore.spec
===================================================================
RCS file: /cvs/extras/rpms/xlockmore/FC-3/xlockmore.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xlockmore.spec	18 Jun 2005 20:59:31 -0000	1.2
+++ xlockmore.spec	28 Jun 2005 11:43:12 -0000	1.3
@@ -1,11 +1,12 @@
 Summary: Screen lock and screen saver
 Name: xlockmore
 Version: 5.18
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Amusements/Graphics
 URL: http://www.tux.org/~bagleyd/xlockmore.html
-Source: http://www.tux.org/~bagleyd/latest/xlockmore-5.18.tar.bz2
+Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.18.tar.bz2
+Patch0: xlockmore.older-passwd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel esound-devel
 BuildRequires: xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
@@ -33,6 +34,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %{__sed} -i -e "s,/lib,/%{_lib},g" configure
 
@@ -104,6 +106,9 @@
 %{_bindir}/xglock
 
 %changelog
+* Mon Jun 27 2005 Adrian Reber <adrian at lisas.de> - 5.18-3
+- included patch to make it work again with PAM (BZ #161740)
+
 * Fri Jun 17 2005 Adrian Reber <adrian at lisas.de> - 5.18-2
 - update to 5.18