[gnome-keyring] ssh-agent: Use the same parameters for accessing login keyring
- From: Daiki Ueno <dueno src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring] ssh-agent: Use the same parameters for accessing login keyring
- Date: Mon, 19 Mar 2018 11:01:36 +0000 (UTC)
commit 869b5c6da3b8d5bccd31c1cbb83477ead783a833
Author: Daiki Ueno <dueno src gnome org>
Date: Fri Mar 16 16:43:29 2018 +0100
ssh-agent: Use the same parameters for accessing login keyring
When looking up a secret in the login keyring, do not supply any
schema in the criteria, while using "org.freedesktop.Secret.Generic"
as schema when storing it. This is for backward compatibility with
gnome-keyring 2.29, which used "org.gnome.keyring.EncryptionKey" as
schema.
In addtion, use the same label for the newly stored passwords as
before.
https://bugzilla.gnome.org/show_bug.cgi?id=794368
daemon/ssh-agent/gkd-ssh-agent-service.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/daemon/ssh-agent/gkd-ssh-agent-service.c b/daemon/ssh-agent/gkd-ssh-agent-service.c
index 1fad267..451c6d0 100644
--- a/daemon/ssh-agent/gkd-ssh-agent-service.c
+++ b/daemon/ssh-agent/gkd-ssh-agent-service.c
@@ -246,13 +246,14 @@ ensure_key (GkdSshAgentService *self,
argv[1] = info->filename;
fields = g_hash_table_new (g_str_hash, g_str_equal);
- g_hash_table_insert (fields, "xdg:schema", "org.freedesktop.Secret.Generic");
unique = g_strdup_printf ("ssh-store:%s", info->filename);
g_hash_table_insert (fields, "unique", unique);
- label = info->comment[0] != '\0' ? info->comment : _("Unnamed");
+ label = g_strdup_printf (_("Unlock password for: %s"),
+ info->comment[0] != '\0' ? info->comment : _("Unnamed"));
interaction = gkd_login_interaction_new (self->interaction, NULL, label, fields);
+ g_free (label);
askpass = gcr_ssh_askpass_new (interaction);
g_object_unref (interaction);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]