~noskcaj/gnome-keyring/merge

From d2391dea89fb2a8a6a349253ae3f54312a0b2bbc Mon Sep 17 00:00:00 2001

From: Iain Lane <iain@orangesquash.org.uk>

Date: Thu, 5 Mar 2015 18:03:15 +0000

Subject: [PATCH] Revert "ssh-agent: Fix leak in search_keys_like_attributes()"

 

This reverts commit d177a8b5353f3156ab504f39c20753d6786e5e4d.

 

This commit causes unlocked keys to be locked again, due to incorrect

refcounting elsewhere.

 

https://bugzilla.gnome.org/744280

---

 daemon/ssh-agent/gkd-ssh-agent-ops.c | 5 +----

 1 file changed, 1 insertion(+), 4 deletions(-)

 

diff --git a/daemon/ssh-agent/gkd-ssh-agent-ops.c b/daemon/ssh-agent/gkd-ssh-agent-ops.c

index 2b30747..d70875c 100644

--- a/daemon/ssh-agent/gkd-ssh-agent-ops.c

+++ b/daemon/ssh-agent/gkd-ssh-agent-ops.c

@@ -139,7 +139,6 @@ search_keys_like_attributes (GList *modules, GckSession *session, GckAttributes

                en = gck_modules_enumerate_objects (modules, search, GCK_SESSION_AUTHENTICATE | GCK_SESSION_READ_WRITE);

 

                for (;;) {

-                       gboolean done;

                        object = gck_enumerator_next (en, NULL, &error);

                        if (!object) {

                                if (error) {

@@ -149,9 +148,7 @@ search_keys_like_attributes (GList *modules, GckSession *session, GckAttributes

                                break;

                        }

 

-                       done = !(func) (object, user_data);

-                       g_object_unref (object);

-                       if (done)

+                       if (!(func) (object, user_data))

                                break;

                }

 

2.1.4