gnome-keyring r1379 - in trunk: . pam

[nnielsen svn gnome org]

Author: nnielsen
Date: Thu Dec 11 20:54:00 2008
New Revision: 1379
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1379&view=rev

Log:
	* pam/gkr-pam-module.c: Don't unlock keyring if 
	daemon wasn't started. Patch by Vincent Untz. Fixes bug #559958

Modified:
   trunk/ChangeLog
   trunk/pam/gkr-pam-module.c

Modified: trunk/pam/gkr-pam-module.c
==============================================================================
--- trunk/pam/gkr-pam-module.c	(original)
+++ trunk/pam/gkr-pam-module.c	Thu Dec 11 20:54:00 2008
@@ -860,9 +860,12 @@
 			return ret;
 	}
 
-	if (!started_daemon && password != NULL) {
-		if (unlock_keyring (ph, pwd, password) != PAM_SUCCESS)
-			return PAM_SERVICE_ERR;
+	/* If gnome keyring is running, but we didn't start it here, then unlock now */
+	if (get_any_env (ph, ENV_SOCKET) != NULL) {
+		if (!started_daemon && password != NULL) {
+			if (unlock_keyring (ph, pwd, password) != PAM_SUCCESS)
+				return PAM_SERVICE_ERR;
+		}
 	}
 	
 	return PAM_SUCCESS;