← Back to branch summary

~ubuntu-desktop/gnome-keyring/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/0005-ssh-agent-Use-the-same-parameters-for-accessing-logi.patch

  • Committer: Jeremy Bicha
  • Date: 2018-04-13 18:42:52 UTC
  • Revision ID: jbicha@ubuntu.com-20180413184252-obzrxy5ntfrc3d94
Merge with Debian 3.28.0.2-1

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0005-ssh-agent-Use-the-same-parameters-for-accessing-logi.patch
1
 
From: Daiki Ueno <dueno@src.gnome.org>
2
 
Date: Fri, 16 Mar 2018 16:43:29 +0100
3
 
Subject: ssh-agent: Use the same parameters for accessing login keyring
4
 
 
5
 
When looking up a secret in the login keyring, do not supply any
6
 
schema in the criteria, while using "org.freedesktop.Secret.Generic"
7
 
as schema when storing it.  This is for backward compatibility with
8
 
gnome-keyring 2.29, which used "org.gnome.keyring.EncryptionKey" as
9
 
schema.
10
 
 
11
 
In addtion, use the same label for the newly stored passwords as
12
 
before.
13
 
 
14
 
https://bugzilla.gnome.org/show_bug.cgi?id=794368
15
 
---
16
 
 daemon/ssh-agent/gkd-ssh-agent-service.c | 5 +++--
17
 
 1 file changed, 3 insertions(+), 2 deletions(-)
18
 
 
19
 
diff --git a/daemon/ssh-agent/gkd-ssh-agent-service.c b/daemon/ssh-agent/gkd-ssh-agent-service.c
20
 
index 1fad267..451c6d0 100644
21
 
--- a/daemon/ssh-agent/gkd-ssh-agent-service.c
22
 
+++ b/daemon/ssh-agent/gkd-ssh-agent-service.c
23
 
@@ -246,13 +246,14 @@ ensure_key (GkdSshAgentService *self,
24
 
        argv[1] = info->filename;
25
 
 
26
 
        fields = g_hash_table_new (g_str_hash, g_str_equal);
27
 
-       g_hash_table_insert (fields, "xdg:schema", "org.freedesktop.Secret.Generic");
28
 
        unique = g_strdup_printf ("ssh-store:%s", info->filename);
29
 
        g_hash_table_insert (fields, "unique", unique);
30
 
 
31
 
-       label = info->comment[0] != '\0' ? info->comment : _("Unnamed");
32
 
+       label = g_strdup_printf (_("Unlock password for: %s"),
33
 
+                                info->comment[0] != '\0' ? info->comment : _("Unnamed"));
34
 
 
35
 
        interaction = gkd_login_interaction_new (self->interaction, NULL, label, fields);
36
 
+       g_free (label);
37
 
        askpass = gcr_ssh_askpass_new (interaction);
38
 
        g_object_unref (interaction);
39