diff options
| author | Stef Walter <stef@memberwebs.com> | 2010-09-05 02:53:41 (GMT) |
|---|---|---|
| committer | Stef Walter <stef@memberwebs.com> | 2010-09-05 03:43:02 (GMT) |
| commit | eec3d69e22dedfcb5e19cdc9ecf377f91279dd22 (patch) | |
| tree | d98bd61426334f88da28614d80612c0be030e8ad | |
| parent | 585968e9c143b73ed524b6b20f4b46aecb8ff682 (diff) | |
| download | gnome-keyring-eec3d69e22dedfcb5e19cdc9ecf377f91279dd22.zip gnome-keyring-eec3d69e22dedfcb5e19cdc9ecf377f91279dd22.tar.xz | |
[wrap-layer] Fix saving of auto-unlock passwords.
Fix saving of auto unlock passwords such as the ones in SSH
prompts.
| -rw-r--r-- | pkcs11/wrap-layer/gkm-wrap-login.c | 2 | ||||
| -rw-r--r-- | pkcs11/wrap-layer/gkm-wrap-prompt.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkcs11/wrap-layer/gkm-wrap-login.c b/pkcs11/wrap-layer/gkm-wrap-login.c index 88c4c48..7bef442 100644 --- a/pkcs11/wrap-layer/gkm-wrap-login.c +++ b/pkcs11/wrap-layer/gkm-wrap-login.c @@ -131,7 +131,7 @@ prepare_module_session_and_collection (CK_FUNCTION_LIST_PTR_PTR module, for (i = 0; !ret && i < n_slots; ++i) { /* Open a session with this module */ - rv = (funcs->C_OpenSession) (slots[i], CKF_SERIAL_SESSION, NULL, NULL, session); + rv = (funcs->C_OpenSession) (slots[i], CKF_RW_SESSION | CKF_SERIAL_SESSION, NULL, NULL, session); if (rv != CKR_OK) continue; diff --git a/pkcs11/wrap-layer/gkm-wrap-prompt.c b/pkcs11/wrap-layer/gkm-wrap-prompt.c index b1c203f..5c858c5 100644 --- a/pkcs11/wrap-layer/gkm-wrap-prompt.c +++ b/pkcs11/wrap-layer/gkm-wrap-prompt.c @@ -725,7 +725,11 @@ prepare_unlock_object (GkmWrapPrompt *self, const gchar *label, CK_OBJECT_CLASS gku_prompt_show_widget (prompt, "password_area"); gku_prompt_show_widget (prompt, "lock_area"); gku_prompt_show_widget (prompt, "options_area"); - gku_prompt_hide_widget (prompt, "auto_unlock_check"); + + if (gkm_wrap_login_is_usable ()) + gku_prompt_show_widget (prompt, "auto_unlock_check"); + else + gku_prompt_hide_widget (prompt, "auto_unlock_check"); } static void |