rpms/gnome-keyring/devel gnome-keyring-2.21.5-dont-ask-for-password.patch, NONE, 1.1 gnome-keyring.spec, 1.76, 1.77

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-keyring/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20256

Modified Files:
	gnome-keyring.spec 
Added Files:
	gnome-keyring-2.21.5-dont-ask-for-password.patch 
Log Message:
- Don't ask for a password...ever (bug 430525)


gnome-keyring-2.21.5-dont-ask-for-password.patch:

--- NEW FILE gnome-keyring-2.21.5-dont-ask-for-password.patch ---
diff -up gnome-keyring-2.21.5/pam/gkr-pam-module.c.dont-ask-for-password gnome-keyring-2.21.5/pam/gkr-pam-module.c
--- gnome-keyring-2.21.5/pam/gkr-pam-module.c.dont-ask-for-password	2008-01-28 11:53:45.000000000 -0500
+++ gnome-keyring-2.21.5/pam/gkr-pam-module.c	2008-01-28 11:53:55.000000000 -0500
@@ -775,6 +775,7 @@ pam_sm_authenticate (pam_handle_t *ph, i
 		
 	/* Look up the password */
 	ret = pam_get_item (ph, PAM_AUTHTOK, (const void**)&password);
+#if 0
 	if (ret != PAM_SUCCESS || password == NULL) {
 		ret = prompt_password (ph);
 		if (ret != PAM_SUCCESS) {
@@ -789,6 +790,7 @@ pam_sm_authenticate (pam_handle_t *ph, i
 			return PAM_AUTHTOK_RECOVER_ERR;
 		}
 	}
+#endif
 
 
 	started_daemon = 0;


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- gnome-keyring.spec	21 Jan 2008 20:21:23 -0000	1.76
+++ gnome-keyring.spec	28 Jan 2008 17:02:11 -0000	1.77
@@ -8,7 +8,7 @@
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
 Version: 2.21.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.21/gnome-keyring-%{version}.tar.bz2
@@ -33,6 +33,9 @@
 # RH #429097 / GNOME #502603
 Patch0: gnome-keyring-2.21.5-race-condition.patch
 
+#
+Patch1: gnome-keyring-2.21.5-dont-ask-for-password.patch
+
 %description
 gnome-keyring manages passwords and other types of secrets
 for the user, storing them encrypted with a main password.
@@ -71,6 +74,7 @@
 %prep
 %setup -q -n gnome-keyring-%{version}
 %patch0 -p1 -b .race-condition
+%patch1 -p1 -b .dont-ask-for-password
 
 %build
 aclocal
@@ -139,6 +143,9 @@
 
 
 %changelog
+* Mon Jan 28 2008 Ray Strode <rstrode at redhat.com> - 2.21.5-3
+- Don't ask for a password...ever (bug 430525)
+
 * Mon Jan 21 2008 Matthew Barnes  <mbarnes at redhat.com> - 2.21.5-2
 - Fix a race condition that was causing Evolution to hang (#429097)