gnome-keyring/gnome-keyring-2.28.1-nopass.patch
Tomas Bzatek 2e46d5b5f7 - Update to 2.29.4
This is not intended for building yet, we need to solve
    https://bugzilla.redhat.com/show_bug.cgi?id=549709#c1 first. Just
    committing my changes.
2009-12-22 15:14:37 +00:00

23 lines
791 B
Diff

diff -up gnome-keyring-2.28.1/pam/gkr-pam-module.c.nopass gnome-keyring-2.28.1/pam/gkr-pam-module.c
--- gnome-keyring-2.28.1/pam/gkr-pam-module.c.nopass 2009-09-25 21:55:50.000000000 -0400
+++ gnome-keyring-2.28.1/pam/gkr-pam-module.c 2009-10-19 11:27:34.000000000 -0400
@@ -878,6 +878,7 @@ pam_sm_authenticate (pam_handle_t *ph, i
started_daemon = 0;
+
/* Should we start the daemon? */
if (args & ARG_AUTO_START) {
ret = start_daemon_if_necessary (ph, pwd, password, &started_daemon);
@@ -944,8 +945,9 @@ pam_sm_open_session (pam_handle_t *ph, i
* different PAM callbacks from different processes.
*
* No use complaining
+ * Do not start gnome-keyring, dbus will start it on login.
*/
- password = NULL;
+ return PAM_SUCCESS;
}
started_daemon = 0;