rpms/gnome-keyring
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fix problem in patch for bug 430525

Browse Source
This commit is contained in:
Ray Strode 2008-02-06 21:28:19 +00:00
parent cd9fb5d485
commit 50aef86461
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnome-keyring-2.21.5-dont-ask-for-password.patch
View File

@ -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 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.dont-ask-for-password 2007-12-01 16:28:35.000000000 -0500
+++ gnome-keyring-2.21.5/pam/gkr-pam-module.c 2008-01-28 11:53:55.000000000 -0500 +++ gnome-keyring-2.21.5/pam/gkr-pam-module.c 2008-02-06 14:02:16.000000000 -0500
@@ -775,6 +775,7 @@ pam_sm_authenticate (pam_handle_t *ph, i @@ -776,6 +776,7 @@ pam_sm_authenticate (pam_handle_t *ph, i
/* Look up the password */ /* Look up the password */
ret = pam_get_item (ph, PAM_AUTHTOK, (const void**)&password); ret = pam_get_item (ph, PAM_AUTHTOK, (const void**)&password);
+#if 0
if (ret != PAM_SUCCESS || password == NULL) { if (ret != PAM_SUCCESS || password == NULL) {
+#ifdef GKR_SHOULD_WRONGLY_ASK_FOR_PASSWORD
ret = prompt_password (ph); ret = prompt_password (ph);
if (ret != PAM_SUCCESS) { 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; return PAM_AUTHTOK_RECOVER_ERR;
} }
} +#else
+ return PAM_SUCCESS;
+#endif +#endif
}
-
started_daemon = 0; started_daemon = 0;
/* Should we start the daemon? */

5
gnome-keyring.spec
View File

@ -8,7 +8,7 @@
Summary: A framework for managing user passwords and other secrets Summary: A framework for managing user passwords and other secrets
Name: gnome-keyring Name: gnome-keyring
Version: 2.21.90 Version: 2.21.90
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://download.gnome.org/sources/gnome-keyring/2.21/gnome-keyring-%{version}.tar.bz2 Source: http://download.gnome.org/sources/gnome-keyring/2.21/gnome-keyring-%{version}.tar.bz2
@ -139,6 +139,9 @@ fi
%changelog %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 * Tue Jan 29 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.90-1
- Update to 2.21.90 - Update to 2.21.90