From 50aef86461523f5c6e0724b882529573901fe1a4 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Feb 06 2008 21:28:19 +0000
Subject: - Fix problem in patch for bug 430525


---

diff --git a/gnome-keyring-2.21.5-dont-ask-for-password.patch b/gnome-keyring-2.21.5-dont-ask-for-password.patch
index e442cf1..91af291 100644
--- a/gnome-keyring-2.21.5-dont-ask-for-password.patch
+++ b/gnome-keyring-2.21.5-dont-ask-for-password.patch
@@ -1,19 +1,24 @@
 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
- 		
+--- gnome-keyring-2.21.5/pam/gkr-pam-module.c.dont-ask-for-password	2007-12-01 16:28:35.000000000 -0500
++++ gnome-keyring-2.21.5/pam/gkr-pam-module.c	2008-02-06 14:02:16.000000000 -0500
+@@ -776,6 +776,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) {
++#ifdef GKR_SHOULD_WRONGLY_ASK_FOR_PASSWORD
  		ret = prompt_password (ph);
  		if (ret != PAM_SUCCESS) {
-@@ -789,6 +790,7 @@ pam_sm_authenticate (pam_handle_t *ph, i
+ 			syslog (GKR_LOG_ERR, "gkr-pam: couldn't get the password from user: %s", 
+@@ -788,9 +789,11 @@ pam_sm_authenticate (pam_handle_t *ph, i
+ 			        ret == PAM_SUCCESS ? "password was null" : pam_strerror (ph, ret));
  			return PAM_AUTHTOK_RECOVER_ERR;
  		}
- 	}
++#else
++                return PAM_SUCCESS;
 +#endif
+ 	}
  
- 
+-
  	started_daemon = 0;
+ 
+ 	/* Should we start the daemon? */
diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index a5e0b9e..092531f 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -8,7 +8,7 @@
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
 Version: 2.21.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.21/gnome-keyring-%{version}.tar.bz2
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Wed Feb  6 2008 Ray Strode <rstrode@redhat.com> - 2.21.90-2
+- Fix problem in patch for bug 430525
+
 * Tue Jan 29 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.90-1
 - Update to 2.21.90