25 lines
989 B
Diff
25 lines
989 B
Diff
diff -up gnome-keyring-2.21.5/pam/gkr-pam-module.c.dont-ask-for-password gnome-keyring-2.21.5/pam/gkr-pam-module.c
|
|
--- gnome-keyring-2.21.5/pam/gkr-pam-module.c.dont-ask-for-password 2007-12-01 16:28:35.000000000 -0500
|
|
+++ gnome-keyring-2.21.5/pam/gkr-pam-module.c 2008-02-06 14:02:16.000000000 -0500
|
|
@@ -776,6 +776,7 @@ pam_sm_authenticate (pam_handle_t *ph, i
|
|
/* Look up the password */
|
|
ret = pam_get_item (ph, PAM_AUTHTOK, (const void**)&password);
|
|
if (ret != PAM_SUCCESS || password == NULL) {
|
|
+#ifdef GKR_SHOULD_WRONGLY_ASK_FOR_PASSWORD
|
|
ret = prompt_password (ph);
|
|
if (ret != PAM_SUCCESS) {
|
|
syslog (GKR_LOG_ERR, "gkr-pam: couldn't get the password from user: %s",
|
|
@@ -788,9 +789,11 @@ pam_sm_authenticate (pam_handle_t *ph, i
|
|
ret == PAM_SUCCESS ? "password was null" : pam_strerror (ph, ret));
|
|
return PAM_AUTHTOK_RECOVER_ERR;
|
|
}
|
|
+#else
|
|
+ return PAM_SUCCESS;
|
|
+#endif
|
|
}
|
|
|
|
-
|
|
started_daemon = 0;
|
|
|
|
/* Should we start the daemon? */
|