gnome-keyring r1047 - in trunk: . pam

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Feb 10 17:35:26 2008
New Revision: 1047
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1047&view=rev

Log:
	* pam/gkr-pam-module.c: Don't ask PAM to prompt for password
	if no password is available. Fixes bug #514862. Patch by Ray Strode


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	Sun Feb 10 17:35:26 2008
@@ -776,21 +776,14 @@
 	/* Look up the password */
 	ret = pam_get_item (ph, PAM_AUTHTOK, (const void**)&password);
 	if (ret != PAM_SUCCESS || password == NULL) {
-		ret = prompt_password (ph);
-		if (ret != PAM_SUCCESS) {
-			syslog (GKR_LOG_ERR, "gkr-pam: couldn't get the password from user: %s", 
+		if (ret == PAM_SUCCESS)
+			syslog (GKR_LOG_WARN, "gkr-pam: no password is available for user");
+		else
+			syslog (GKR_LOG_WARN, "gkr-pam: no password is available for user: %s", 
 			        pam_strerror (ph, ret));
-			return PAM_AUTH_ERR;
-		}
-		ret = pam_get_item (ph, PAM_AUTHTOK, (const void**)&password);
-		if (ret != PAM_SUCCESS || password == NULL) {
-			syslog (GKR_LOG_ERR, "gkr-pam: couldn't get the password from user: %s", 
-			        ret == PAM_SUCCESS ? "password was null" : pam_strerror (ph, ret));
-			return PAM_AUTHTOK_RECOVER_ERR;
-		}
+		return PAM_SUCCESS;
 	}
 
-
 	started_daemon = 0;
 
 	/* Should we start the daemon? */