Merge lp:~ubuntu-branches/ubuntu/oneiric/gnome-keyring/oneiric-proposed-201112050718 into lp:ubuntu/oneiric-proposed/gnome-keyring

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric-proposed/gnome-keyring reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/gnome-keyring/oneiric-proposed-201112050718. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

132. By Ken VanDine on 2011-11-28

releasing version 3.2.2-0ubuntu0.1

131. By Ken VanDine on 2011-11-15

releasing version 3.2.2-0ubuntu0.1

130. By Ken VanDine on 2011-11-14

releasing version 3.2.2-0ubuntu1.1

=== modified file '.pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-gpg.desktop.in.in'
--- .pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-gpg.desktop.in.in	2011-11-28 14:20:08 +0000
+++ .pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-gpg.desktop.in.in	2011-12-05 07:24:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 [Desktop Entry]
 Type=Application
 _Name=GPG Password Agent
@@ -11,3 +12,18 @@
 X-GNOME-Bugzilla-Product=gnome-keyring
 X-GNOME-Bugzilla-Component=general
 X-GNOME-Bugzilla-Version=@VERSION@
+=======
+[Desktop Entry]
+Type=Application
+_Name=GPG Password Agent
+_Comment=GNOME Keyring: GPG Agent
+Exec=@VALGRIND_RUN@ gnome-keyring-daemon --start --components=gpg
+OnlyShowIn=GNOME;LXDE;XFCE;Unity;
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-AutoRestart=false
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-keyring
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=@VERSION@
+>>>>>>> MERGE-SOURCE

=== modified file '.pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-pkcs11.desktop.in.in'
--- .pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-pkcs11.desktop.in.in	2011-11-28 14:20:08 +0000
+++ .pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-pkcs11.desktop.in.in	2011-12-05 07:24:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 [Desktop Entry]
 Type=Application
 _Name=Certificate and Key Storage
@@ -11,3 +12,18 @@
 X-GNOME-Bugzilla-Product=gnome-keyring
 X-GNOME-Bugzilla-Component=general
 X-GNOME-Bugzilla-Version=@VERSION@
+=======
+[Desktop Entry]
+Type=Application
+_Name=Certificate and Key Storage
+_Comment=GNOME Keyring: PKCS#11 Component
+Exec=@VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=pkcs11
+OnlyShowIn=GNOME;LXDE;XFCE;Unity;
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-AutoRestart=false
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-keyring
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=@VERSION@
+>>>>>>> MERGE-SOURCE

=== modified file '.pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-secrets.desktop.in.in'
--- .pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-secrets.desktop.in.in	2011-11-28 14:20:08 +0000
+++ .pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-secrets.desktop.in.in	2011-12-05 07:24:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 [Desktop Entry]
 Type=Application
 _Name=Secret Storage Service
@@ -11,3 +12,18 @@
 X-GNOME-Bugzilla-Product=gnome-keyring
 X-GNOME-Bugzilla-Component=general
 X-GNOME-Bugzilla-Version=@VERSION@
+=======
+[Desktop Entry]
+Type=Application
+_Name=Secret Storage Service
+_Comment=GNOME Keyring: Secret Service
+Exec=@VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=secrets
+OnlyShowIn=GNOME;LXDE;XFCE;Unity;
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-AutoRestart=false
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-keyring
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=@VERSION@
+>>>>>>> MERGE-SOURCE

=== modified file '.pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-ssh.desktop.in.in'
--- .pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-ssh.desktop.in.in	2011-11-28 14:20:08 +0000
+++ .pc/04_nodisplay_autostart.patch/daemon/gnome-keyring-ssh.desktop.in.in	2011-12-05 07:24:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 [Desktop Entry]
 Type=Application
 _Name=SSH Key Agent
@@ -11,3 +12,18 @@
 X-GNOME-Bugzilla-Product=gnome-keyring
 X-GNOME-Bugzilla-Component=general
 X-GNOME-Bugzilla-Version=@VERSION@
+=======
+[Desktop Entry]
+Type=Application
+_Name=SSH Key Agent
+_Comment=GNOME Keyring: SSH Agent
+Exec=@VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=ssh
+OnlyShowIn=GNOME;LXDE;XFCE;Unity;
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-AutoRestart=false
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-keyring
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=@VERSION@
+>>>>>>> MERGE-SOURCE

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-11-28 14:20:08 +0000
+++ .pc/applied-patches	2011-12-05 07:24:26 +0000
@@ -1,3 +1,8 @@
+<<<<<<< TREE
 05_revert_order_fix.patch
 04_nodisplay_autostart.patch
 99_ltmain_as-needed.patch
+=======
+04_nodisplay_autostart.patch
+99_ltmain_as-needed.patch
+>>>>>>> MERGE-SOURCE

=== added file 'debian/patches/05_revert_order_fix.patch'
--- debian/patches/05_revert_order_fix.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/05_revert_order_fix.patch	2011-12-05 07:24:26 +0000
@@ -0,0 +1,304 @@
+diff --git a/pkcs11/rpc-layer/gkm-rpc-util.c b/pkcs11/rpc-layer/gkm-rpc-util.c
+index 5609ec5..725cc13 100644
+--- a/pkcs11/rpc-layer/gkm-rpc-util.c
++++ b/pkcs11/rpc-layer/gkm-rpc-util.c
+@@ -50,7 +50,7 @@ gkm_rpc_warn (const char* msg, ...)
+ {
+ 	va_list va;
+ 	va_start (va, msg);
+-	do_log ("WARNING: gnome-keyring:", msg, va);
++	do_log ("WARNING", msg, va);
+ 	va_end (va);
+ }
+ 
+@@ -59,7 +59,7 @@ gkm_rpc_debug (const char* msg, ...)
+ {
+ 	va_list va;
+ 	va_start (va, msg);
+-	do_log ("DEBUG: gnome-keyring:", msg, va);
++	do_log ("DEBUG", msg, va);
+ 	va_end (va);
+ }
+ 
+diff --git a/pkcs11/secret-store/gkm-secret-search.c b/pkcs11/secret-store/gkm-secret-search.c
+index 02eb9e9..fd86056 100644
+--- a/pkcs11/secret-store/gkm-secret-search.c
++++ b/pkcs11/secret-store/gkm-secret-search.c
+@@ -48,11 +48,15 @@ struct _GkmSecretSearch {
+ 	gchar *collection_id;
+ 	GHashTable *fields;
+ 	GList *managers;
+-	GHashTable *objects;
++	GHashTable *handles;
+ };
+ 
+ G_DEFINE_TYPE (GkmSecretSearch, gkm_secret_search, GKM_TYPE_OBJECT);
+ 
++/* -----------------------------------------------------------------------------
++ * INTERNAL
++ */
++
+ static gboolean
+ match_object_against_criteria (GkmSecretSearch *self, GkmObject *object)
+ {
+@@ -85,13 +89,17 @@ static void
+ on_manager_added_object (GkmManager *manager, GkmObject *object, gpointer user_data)
+ {
+ 	GkmSecretSearch *self = user_data;
++	CK_OBJECT_HANDLE handle;
+ 
+ 	g_return_if_fail (GKM_IS_SECRET_SEARCH (self));
+ 
+-	g_return_if_fail (g_hash_table_lookup (self->objects, object) == NULL);
++	handle = gkm_object_get_handle (object);
++	g_return_if_fail (handle);
++
++	g_return_if_fail (g_hash_table_lookup (self->handles, &handle) == NULL);
+ 
+ 	if (match_object_against_criteria (self, object)) {
+-		g_hash_table_replace (self->objects, g_object_ref (object), "unused");
++		g_hash_table_replace (self->handles, gkm_util_ulong_alloc (handle), "unused");
+ 		gkm_object_notify_attribute (GKM_OBJECT (self), CKA_G_MATCHED);
+ 	}
+ }
+@@ -100,11 +108,17 @@ static void
+ on_manager_removed_object (GkmManager *manager, GkmObject *object, gpointer user_data)
+ {
+ 	GkmSecretSearch *self = user_data;
++	CK_OBJECT_HANDLE handle;
+ 
+ 	g_return_if_fail (GKM_IS_SECRET_SEARCH (self));
+ 
+-	if (g_hash_table_remove (self->objects, object))
++	handle = gkm_object_get_handle (object);
++	g_return_if_fail (handle);
++
++	if (g_hash_table_lookup (self->handles, &handle) != NULL) {
++		g_hash_table_remove (self->handles, &handle);
+ 		gkm_object_notify_attribute (GKM_OBJECT (self), CKA_G_MATCHED);
++	}
+ }
+ 
+ static void
+@@ -124,15 +138,17 @@ on_manager_changed_object (GkmManager *manager, GkmObject *object,
+ 
+ 	/* Should we have this object? */
+ 	if (match_object_against_criteria (self, object)) {
+-		if (g_hash_table_lookup (self->objects, object) == NULL) {
+-			g_hash_table_replace (self->objects, g_object_ref (object), "unused");
++		if (g_hash_table_lookup (self->handles, &handle) == NULL) {
++			g_hash_table_replace (self->handles, gkm_util_ulong_alloc (handle), "unused");
+ 			gkm_object_notify_attribute (GKM_OBJECT (self), CKA_G_MATCHED);
+ 		}
+ 
+ 	/* Should we not have this object? */
+ 	} else {
+-		if (g_hash_table_remove (self->objects, object))
++		if (g_hash_table_lookup (self->handles, &handle) != NULL) {
++			g_hash_table_remove (self->handles, &handle);
+ 			gkm_object_notify_attribute (GKM_OBJECT (self), CKA_G_MATCHED);
++		}
+ 	}
+ }
+ 
+@@ -234,57 +250,34 @@ factory_create_search (GkmSession *session, GkmTransaction *transaction,
+ 	return GKM_OBJECT (search);
+ }
+ 
+-static gint
+-on_matched_sort_modified (gconstpointer a,
+-                          gconstpointer b)
++static void
++add_each_handle_to_array (gpointer key, gpointer value, gpointer user_data)
+ {
+-	glong modified_a;
+-	glong modified_b;
+-
+-	/* Sorting in reverse order */
+-
+-	modified_a = gkm_secret_object_get_modified (GKM_SECRET_OBJECT (a));
+-	modified_b = gkm_secret_object_get_modified (GKM_SECRET_OBJECT (b));
+-
+-	if (modified_a < modified_b)
+-		return 1;
+-	if (modified_a > modified_b)
+-		return -1;
+-
+-	return 0;
++	GArray *array = user_data;
++	CK_OBJECT_HANDLE *handle = key;
++	g_array_append_val (array, *handle);
+ }
+ 
+ static CK_RV
+-attribute_set_handles (GHashTable *objects,
+-                       CK_ATTRIBUTE_PTR attr)
++attribute_set_handles (GHashTable *handles, CK_ATTRIBUTE_PTR attr)
+ {
+-	GList *list, *l;
+ 	GArray *array;
+-	gulong handle;
+ 	CK_RV rv;
+ 
+-	g_assert (objects);
++	g_assert (handles);
+ 	g_assert (attr);
+ 
+ 	/* Want the length */
+ 	if (!attr->pValue) {
+-		attr->ulValueLen = sizeof (CK_OBJECT_HANDLE) * g_hash_table_size (objects);
++		attr->ulValueLen = sizeof (CK_OBJECT_HANDLE) * g_hash_table_size (handles);
+ 		return CKR_OK;
+ 	}
+ 
+ 	/* Get the actual values */
+-	list = g_list_sort (g_hash_table_get_keys (objects), on_matched_sort_modified);
+ 	array = g_array_new (FALSE, TRUE, sizeof (CK_OBJECT_HANDLE));
+-
+-	for (l = list; l != NULL; l = g_list_next (l)) {
+-		handle = gkm_object_get_handle (l->data);
+-		g_array_append_val (array, handle);
+-	}
+-
++	g_hash_table_foreach (handles, add_each_handle_to_array, array);
+ 	rv = gkm_attribute_set_data (attr, array->data, array->len * sizeof (CK_OBJECT_HANDLE));
+ 	g_array_free (array, TRUE);
+-	g_list_free (list);
+-
+ 	return rv;
+ }
+ 
+@@ -309,7 +302,7 @@ gkm_secret_search_get_attribute (GkmObject *base, GkmSession *session, CK_ATTRIB
+ 	case CKA_G_FIELDS:
+ 		return gkm_secret_fields_serialize (attr, self->fields);
+ 	case CKA_G_MATCHED:
+-		return attribute_set_handles (self->objects, attr);
++		return attribute_set_handles (self->handles, attr);
+ 	}
+ 
+ 	return GKM_OBJECT_CLASS (gkm_secret_search_parent_class)->get_attribute (base, session, attr);
+@@ -319,7 +312,7 @@ gkm_secret_search_get_attribute (GkmObject *base, GkmSession *session, CK_ATTRIB
+ static void
+ gkm_secret_search_init (GkmSecretSearch *self)
+ {
+-	self->objects = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, NULL);
++	self->handles = g_hash_table_new_full (gkm_util_ulong_hash, gkm_util_ulong_equal, gkm_util_ulong_free, NULL);
+ }
+ 
+ static GObject*
+@@ -391,8 +384,6 @@ gkm_secret_search_dispose (GObject *obj)
+ 	g_free (self->collection_id);
+ 	self->collection_id = NULL;
+ 
+-	g_hash_table_remove_all (self->objects);
+-
+ 	G_OBJECT_CLASS (gkm_secret_search_parent_class)->dispose (obj);
+ }
+ 
+@@ -407,8 +398,6 @@ gkm_secret_search_finalize (GObject *obj)
+ 		g_hash_table_destroy (self->fields);
+ 	self->fields = NULL;
+ 
+-	g_hash_table_destroy (self->objects);
+-
+ 	G_OBJECT_CLASS (gkm_secret_search_parent_class)->finalize (obj);
+ }
+ 
+diff --git a/pkcs11/secret-store/tests/test-secret-search.c b/pkcs11/secret-store/tests/test-secret-search.c
+index fc75996..303a314 100644
+--- a/pkcs11/secret-store/tests/test-secret-search.c
++++ b/pkcs11/secret-store/tests/test-secret-search.c
+@@ -31,7 +31,6 @@
+ 
+ #include "gkm/gkm-session.h"
+ #include "gkm/gkm-transaction.h"
+-#include "gkm/gkm-test.h"
+ 
+ #include "pkcs11/pkcs11i.h"
+ 
+@@ -361,77 +360,6 @@ test_for_collection_no_match (Test *test, gconstpointer unused)
+ 	g_object_unref (ocoll);
+ }
+ 
+-static void
+-test_order (Test *test,
+-            gconstpointer unused)
+-{
+-	CK_ATTRIBUTE attrs[] = {
+-	        { CKA_G_FIELDS, "test\0value", 11 },
+-	        { CKA_G_COLLECTION, "other-collection", 16 },
+-	};
+-
+-	GkmObject *object = NULL;
+-	GkmSecretCollection *collection;
+-	GkmSecretItem *item;
+-	GHashTable *fields;
+-	gulong *matched;
+-	gsize vsize;
+-	gchar *identifier;
+-	glong modified;
+-	glong last;
+-	gint i;
+-	CK_RV rv;
+-
+-	collection = g_object_new (GKM_TYPE_SECRET_COLLECTION,
+-	                           "module", test->module,
+-	                           "manager", gkm_session_get_manager (test->session),
+-	                           "identifier", "other-collection",
+-	                           NULL);
+-
+-	gkm_object_expose (GKM_OBJECT (collection), TRUE);
+-
+-	/* Add a bunch of items */
+-	for (i = 0; i < 2000; i++) {
+-		identifier = g_strdup_printf ("item-%d", i);
+-		item = gkm_secret_collection_new_item (collection, identifier);
+-		g_free (identifier);
+-
+-		/* Make it match, but remember, wrong collection*/
+-		fields = gkm_secret_fields_new ();
+-		gkm_secret_fields_add (fields, "test", "value");
+-		gkm_secret_item_set_fields (item, fields);
+-		g_hash_table_unref (fields);
+-
+-		gkm_secret_object_set_modified (GKM_SECRET_OBJECT (item),
+-		                                (glong)g_random_int ());
+-		gkm_object_expose (GKM_OBJECT (item), TRUE);
+-	}
+-
+-	object = gkm_session_create_object_for_factory (test->session, test->factory, NULL, attrs, 2);
+-	g_assert (object != NULL);
+-	g_assert (GKM_IS_SECRET_SEARCH (object));
+-
+-	/* No objects matched */
+-	matched = gkm_object_get_attribute_data (object, test->session, CKA_G_MATCHED, &vsize);
+-	g_assert (matched != NULL);
+-	gkm_assert_cmpulong (vsize, ==, sizeof (gulong) * 2000);
+-
+-	last = G_MAXLONG;
+-	for (i = 0; i < vsize / sizeof (gulong); i++) {
+-		rv = gkm_session_lookup_readable_object (test->session, matched[i], (GkmObject **)&item);
+-		gkm_assert_cmprv (rv, ==, CKR_OK);
+-
+-		modified = gkm_secret_object_get_modified (GKM_SECRET_OBJECT (item));
+-		g_assert (last > modified);
+-		last = modified;
+-	}
+-
+-	g_free (matched);
+-
+-	g_object_unref (object);
+-	g_object_unref (collection);
+-}
+-
+ int
+ main (int argc, char **argv)
+ {
+@@ -447,7 +375,6 @@ main (int argc, char **argv)
+ 	g_test_add ("/secret-store/search/for_bad_collection", Test, NULL, setup, test_for_bad_collection, teardown);
+ 	g_test_add ("/secret-store/search/for_collection", Test, NULL, setup, test_for_collection, teardown);
+ 	g_test_add ("/secret-store/search/for_collection_no_match", Test, NULL, setup, test_for_collection_no_match, teardown);
+-	g_test_add ("/secret-store/search/order", Test, NULL, setup, test_order, teardown);
+ 
+ 	return g_test_run ();
+ }

=== renamed file 'debian/patches/05_revert_order_fix.patch' => 'debian/patches/05_revert_order_fix.patch.moved'
=== modified file 'pkcs11/rpc-layer/gkm-rpc-util.c'
--- pkcs11/rpc-layer/gkm-rpc-util.c	2011-11-28 14:20:08 +0000
+++ pkcs11/rpc-layer/gkm-rpc-util.c	2011-12-05 07:24:26 +0000
@@ -50,7 +50,7 @@
 {
 	va_list va;
 	va_start (va, msg);
-	do_log ("WARNING", msg, va);
+	do_log ("WARNING: gnome-keyring:", msg, va);
 	va_end (va);
 }
 
@@ -59,7 +59,7 @@
 {
 	va_list va;
 	va_start (va, msg);
-	do_log ("DEBUG", msg, va);
+	do_log ("DEBUG: gnome-keyring:", msg, va);
 	va_end (va);
 }
 

=== modified file 'pkcs11/secret-store/gkm-secret-search.c'
--- pkcs11/secret-store/gkm-secret-search.c	2011-11-28 14:20:08 +0000
+++ pkcs11/secret-store/gkm-secret-search.c	2011-12-05 07:24:26 +0000
@@ -48,15 +48,11 @@
 	gchar *collection_id;
 	GHashTable *fields;
 	GList *managers;
-	GHashTable *handles;
+	GHashTable *objects;
 };
 
 G_DEFINE_TYPE (GkmSecretSearch, gkm_secret_search, GKM_TYPE_OBJECT);
 
-/* -----------------------------------------------------------------------------
- * INTERNAL
- */
-
 static gboolean
 match_object_against_criteria (GkmSecretSearch *self, GkmObject *object)
 {
@@ -89,17 +85,13 @@
 on_manager_added_object (GkmManager *manager, GkmObject *object, gpointer user_data)
 {
 	GkmSecretSearch *self = user_data;
-	CK_OBJECT_HANDLE handle;
 
 	g_return_if_fail (GKM_IS_SECRET_SEARCH (self));
 
-	handle = gkm_object_get_handle (object);
-	g_return_if_fail (handle);
-
-	g_return_if_fail (g_hash_table_lookup (self->handles, &handle) == NULL);
+	g_return_if_fail (g_hash_table_lookup (self->objects, object) == NULL);
 
 	if (match_object_against_criteria (self, object)) {
-		g_hash_table_replace (self->handles, gkm_util_ulong_alloc (handle), "unused");
+		g_hash_table_replace (self->objects, g_object_ref (object), "unused");
 		gkm_object_notify_attribute (GKM_OBJECT (self), CKA_G_MATCHED);
 	}
 }
@@ -108,17 +100,11 @@
 on_manager_removed_object (GkmManager *manager, GkmObject *object, gpointer user_data)
 {
 	GkmSecretSearch *self = user_data;
-	CK_OBJECT_HANDLE handle;
 
 	g_return_if_fail (GKM_IS_SECRET_SEARCH (self));
 
-	handle = gkm_object_get_handle (object);
-	g_return_if_fail (handle);
-
-	if (g_hash_table_lookup (self->handles, &handle) != NULL) {
-		g_hash_table_remove (self->handles, &handle);
+	if (g_hash_table_remove (self->objects, object))
 		gkm_object_notify_attribute (GKM_OBJECT (self), CKA_G_MATCHED);
-	}
 }
 
 static void
@@ -138,17 +124,15 @@
 
 	/* Should we have this object? */
 	if (match_object_against_criteria (self, object)) {
-		if (g_hash_table_lookup (self->handles, &handle) == NULL) {
-			g_hash_table_replace (self->handles, gkm_util_ulong_alloc (handle), "unused");
+		if (g_hash_table_lookup (self->objects, object) == NULL) {
+			g_hash_table_replace (self->objects, g_object_ref (object), "unused");
 			gkm_object_notify_attribute (GKM_OBJECT (self), CKA_G_MATCHED);
 		}
 
 	/* Should we not have this object? */
 	} else {
-		if (g_hash_table_lookup (self->handles, &handle) != NULL) {
-			g_hash_table_remove (self->handles, &handle);
+		if (g_hash_table_remove (self->objects, object))
 			gkm_object_notify_attribute (GKM_OBJECT (self), CKA_G_MATCHED);
-		}
 	}
 }
 
@@ -250,34 +234,57 @@
 	return GKM_OBJECT (search);
 }
 
-static void
-add_each_handle_to_array (gpointer key, gpointer value, gpointer user_data)
+static gint
+on_matched_sort_modified (gconstpointer a,
+                          gconstpointer b)
 {
-	GArray *array = user_data;
-	CK_OBJECT_HANDLE *handle = key;
-	g_array_append_val (array, *handle);
+	glong modified_a;
+	glong modified_b;
+
+	/* Sorting in reverse order */
+
+	modified_a = gkm_secret_object_get_modified (GKM_SECRET_OBJECT (a));
+	modified_b = gkm_secret_object_get_modified (GKM_SECRET_OBJECT (b));
+
+	if (modified_a < modified_b)
+		return 1;
+	if (modified_a > modified_b)
+		return -1;
+
+	return 0;
 }
 
 static CK_RV
-attribute_set_handles (GHashTable *handles, CK_ATTRIBUTE_PTR attr)
+attribute_set_handles (GHashTable *objects,
+                       CK_ATTRIBUTE_PTR attr)
 {
+	GList *list, *l;
 	GArray *array;
+	gulong handle;
 	CK_RV rv;
 
-	g_assert (handles);
+	g_assert (objects);
 	g_assert (attr);
 
 	/* Want the length */
 	if (!attr->pValue) {
-		attr->ulValueLen = sizeof (CK_OBJECT_HANDLE) * g_hash_table_size (handles);
+		attr->ulValueLen = sizeof (CK_OBJECT_HANDLE) * g_hash_table_size (objects);
 		return CKR_OK;
 	}
 
 	/* Get the actual values */
+	list = g_list_sort (g_hash_table_get_keys (objects), on_matched_sort_modified);
 	array = g_array_new (FALSE, TRUE, sizeof (CK_OBJECT_HANDLE));
-	g_hash_table_foreach (handles, add_each_handle_to_array, array);
+
+	for (l = list; l != NULL; l = g_list_next (l)) {
+		handle = gkm_object_get_handle (l->data);
+		g_array_append_val (array, handle);
+	}
+
 	rv = gkm_attribute_set_data (attr, array->data, array->len * sizeof (CK_OBJECT_HANDLE));
 	g_array_free (array, TRUE);
+	g_list_free (list);
+
 	return rv;
 }
 
@@ -302,7 +309,7 @@
 	case CKA_G_FIELDS:
 		return gkm_secret_fields_serialize (attr, self->fields);
 	case CKA_G_MATCHED:
-		return attribute_set_handles (self->handles, attr);
+		return attribute_set_handles (self->objects, attr);
 	}
 
 	return GKM_OBJECT_CLASS (gkm_secret_search_parent_class)->get_attribute (base, session, attr);
@@ -312,7 +319,7 @@
 static void
 gkm_secret_search_init (GkmSecretSearch *self)
 {
-	self->handles = g_hash_table_new_full (gkm_util_ulong_hash, gkm_util_ulong_equal, gkm_util_ulong_free, NULL);
+	self->objects = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, NULL);
 }
 
 static GObject*
@@ -384,6 +391,8 @@
 	g_free (self->collection_id);
 	self->collection_id = NULL;
 
+	g_hash_table_remove_all (self->objects);
+
 	G_OBJECT_CLASS (gkm_secret_search_parent_class)->dispose (obj);
 }
 
@@ -398,6 +407,8 @@
 		g_hash_table_destroy (self->fields);
 	self->fields = NULL;
 
+	g_hash_table_destroy (self->objects);
+
 	G_OBJECT_CLASS (gkm_secret_search_parent_class)->finalize (obj);
 }
 

=== modified file 'pkcs11/secret-store/tests/test-secret-search.c'
--- pkcs11/secret-store/tests/test-secret-search.c	2011-11-28 14:20:08 +0000
+++ pkcs11/secret-store/tests/test-secret-search.c	2011-12-05 07:24:26 +0000
@@ -31,6 +31,7 @@
 
 #include "gkm/gkm-session.h"
 #include "gkm/gkm-transaction.h"
+#include "gkm/gkm-test.h"
 
 #include "pkcs11/pkcs11i.h"
 
@@ -360,6 +361,77 @@
 	g_object_unref (ocoll);
 }
 
+static void
+test_order (Test *test,
+            gconstpointer unused)
+{
+	CK_ATTRIBUTE attrs[] = {
+	        { CKA_G_FIELDS, "test\0value", 11 },
+	        { CKA_G_COLLECTION, "other-collection", 16 },
+	};
+
+	GkmObject *object = NULL;
+	GkmSecretCollection *collection;
+	GkmSecretItem *item;
+	GHashTable *fields;
+	gulong *matched;
+	gsize vsize;
+	gchar *identifier;
+	glong modified;
+	glong last;
+	gint i;
+	CK_RV rv;
+
+	collection = g_object_new (GKM_TYPE_SECRET_COLLECTION,
+	                           "module", test->module,
+	                           "manager", gkm_session_get_manager (test->session),
+	                           "identifier", "other-collection",
+	                           NULL);
+
+	gkm_object_expose (GKM_OBJECT (collection), TRUE);
+
+	/* Add a bunch of items */
+	for (i = 0; i < 2000; i++) {
+		identifier = g_strdup_printf ("item-%d", i);
+		item = gkm_secret_collection_new_item (collection, identifier);
+		g_free (identifier);
+
+		/* Make it match, but remember, wrong collection*/
+		fields = gkm_secret_fields_new ();
+		gkm_secret_fields_add (fields, "test", "value");
+		gkm_secret_item_set_fields (item, fields);
+		g_hash_table_unref (fields);
+
+		gkm_secret_object_set_modified (GKM_SECRET_OBJECT (item),
+		                                (glong)g_random_int ());
+		gkm_object_expose (GKM_OBJECT (item), TRUE);
+	}
+
+	object = gkm_session_create_object_for_factory (test->session, test->factory, NULL, attrs, 2);
+	g_assert (object != NULL);
+	g_assert (GKM_IS_SECRET_SEARCH (object));
+
+	/* No objects matched */
+	matched = gkm_object_get_attribute_data (object, test->session, CKA_G_MATCHED, &vsize);
+	g_assert (matched != NULL);
+	gkm_assert_cmpulong (vsize, ==, sizeof (gulong) * 2000);
+
+	last = G_MAXLONG;
+	for (i = 0; i < vsize / sizeof (gulong); i++) {
+		rv = gkm_session_lookup_readable_object (test->session, matched[i], (GkmObject **)&item);
+		gkm_assert_cmprv (rv, ==, CKR_OK);
+
+		modified = gkm_secret_object_get_modified (GKM_SECRET_OBJECT (item));
+		g_assert (last > modified);
+		last = modified;
+	}
+
+	g_free (matched);
+
+	g_object_unref (object);
+	g_object_unref (collection);
+}
+
 int
 main (int argc, char **argv)
 {
@@ -375,6 +447,7 @@
 	g_test_add ("/secret-store/search/for_bad_collection", Test, NULL, setup, test_for_bad_collection, teardown);
 	g_test_add ("/secret-store/search/for_collection", Test, NULL, setup, test_for_collection, teardown);
 	g_test_add ("/secret-store/search/for_collection_no_match", Test, NULL, setup, test_for_collection_no_match, teardown);
+	g_test_add ("/secret-store/search/order", Test, NULL, setup, test_order, teardown);
 
 	return g_test_run ();
 }