gnome-keyring r1605 - in trunk: . pam

[nnielsen svn gnome org]

Author: nnielsen
Date: Thu Feb 19 01:35:15 2009
New Revision: 1605
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1605&view=rev

Log:
If login keyring doesn't exist when changing the PAM password, don't
create it.

Fixes bug #572282. Patch by Vincent Untz

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 Feb 19 01:35:15 2009
@@ -680,9 +680,10 @@
 	
 	res = gkr_pam_client_run_operation (pwd, socket, GNOME_KEYRING_OP_CHANGE_KEYRING_PASSWORD, 3, argv);
 
-	/* 'login' keyring doesn't exist, create it */
+	/* No keyring, not an error. Will be created at initial authenticate. */
 	if (res == GNOME_KEYRING_RESULT_NO_SUCH_KEYRING) {
-		return create_keyring (ph, pwd, password);
+		syslog (GKR_LOG_INFO, "gkr-pam: '%s' keyring does not exist, not changing password", LOGIN_KEYRING);
+		return PAM_SUCCESS;
 		
 	/* An error occured unlocking */
 	} else if (res != GNOME_KEYRING_RESULT_OK) {