File gnome-keyring-check-session.patch of Package gnome-keyring

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-keyring-check-session.patch of Package gnome-keyring (Revision 7016a3c810a9e6a8e5d0eb1955cb0ced)

Currently displaying revision 7016a3c810a9e6a8e5d0eb1955cb0ced , Show latest

diff -upr gnome-keyring-2.21.4/pam/gkr-pam-module.c gnome-keyring-2.21.4-post/pam/gkr-pam-module.c
--- gnome-keyring-2.21.4/pam/gkr-pam-module.c	2007-12-17 10:18:30.000000000 -0600
+++ gnome-keyring-2.21.4-post/pam/gkr-pam-module.c	2008-01-22 00:17:45.000000000 -0600
@@ -795,6 +795,13 @@ pam_sm_authenticate (pam_handle_t *ph, i
 
 	/* Should we start the daemon? */
 	if (args & ARG_AUTO_START) {
+		const char *wm;
+
+		wm = getenv ("WINDOWMANAGER");
+
+		/* we don't start the keyring if we're not starting a gnome-session */
+		if (!wm || strncmp (wm, "/usr/bin/gnome", 14))
+			return PAM_SUCCESS;
 		ret = start_daemon_if_necessary (ph, pwd, password, &started_daemon);
 		if (ret != PAM_SUCCESS)
 			return ret;
@@ -862,6 +869,13 @@ pam_sm_open_session (pam_handle_t *ph, i
 	
 	/* Should we start the daemon? */
 	if (args & ARG_AUTO_START) {
+		const char *wm;
+
+		wm = getenv ("WINDOWMANAGER");
+
+		/* we don't start the keyring if we're not starting a gnome-session */
+		if (!wm || strncmp (wm, "/usr/bin/gnome", 14))
+			return PAM_SUCCESS;
 		ret = start_daemon_if_necessary (ph, pwd, password, &started_daemon);
 		if (ret != PAM_SUCCESS)
 			return ret;
Only in gnome-keyring-2.21.4-post/pam: gkr-pam-module.c~

Places

File gnome-keyring-check-session.patch of Package gnome-keyring (Revision 7016a3c810a9e6a8e5d0eb1955cb0ced)

Places