diff options
| author | Daiki Ueno <dueno@src.gnome.org> | 2018-03-24 15:28:00 +0100 |
|---|---|---|
| committer | Daiki Ueno <dueno@src.gnome.org> | 2018-03-24 15:34:33 +0100 |
| commit | a0526d18152028e967b7baa5bc039c38a487672a (patch) | |
| tree | 2057c5add2834476a735a11620f52c8e4b17f599 | |
| parent | a6a5c89dfe81abb1541bfd824087c910451767f8 (diff) | |
| download | gnome-keyring-a0526d18152028e967b7baa5bc039c38a487672a.tar.gz | |
login: Use password from login keyring once for the same interaction
https://bugzilla.gnome.org/show_bug.cgi?id=794631
| -rw-r--r-- | daemon/login/gkd-login-interaction.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/daemon/login/gkd-login-interaction.c b/daemon/login/gkd-login-interaction.c index 77701bed..cf2e8156 100644 --- a/daemon/login/gkd-login-interaction.c +++ b/daemon/login/gkd-login-interaction.c @@ -53,6 +53,7 @@ struct _GkdLoginInteraction GHashTable *lookup_fields; GHashTable *store_fields; gboolean login_available; + gboolean login_checked; }; G_DEFINE_TYPE (GkdLoginInteraction, gkd_login_interaction, G_TYPE_TLS_INTERACTION); @@ -137,13 +138,18 @@ gkd_login_interaction_ask_password_async (GTlsInteraction *interaction, /* If the login keyring is available, look for the password there */ if (self->login_available) { - gchar *value = gkd_login_lookup_passwordv (self->session, self->lookup_fields); - if (value) { - g_tls_password_set_value_full (G_TLS_PASSWORD (login_password), (guchar *)value, strlen (value), (GDestroyNotify)egg_secure_free); - g_object_unref (login_password); - g_task_return_int (task, G_TLS_INTERACTION_HANDLED); - g_object_unref (task); - return; + if (self->login_checked) + g_message ("already attempted to use password from login keyring"); + else { + gchar *value = gkd_login_lookup_passwordv (self->session, self->lookup_fields); + self->login_checked = TRUE; + if (value) { + g_tls_password_set_value_full (G_TLS_PASSWORD (login_password), (guchar *)value, strlen (value), (GDestroyNotify)egg_secure_free); + g_object_unref (login_password); + g_task_return_int (task, G_TLS_INTERACTION_HANDLED); + g_object_unref (task); + return; + } } } |