From ea14cd45f1cfd60089e05a3bb9a85a0948e1b5ef Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 21 Aug 2015 15:11:54 +0200
Subject: [PATCH] agent-manager: remove @asked field from request

This code was unused, because we never enqueued any hashes
to the @asked list. Note that hashing also might give wrong
hash collisions, so this was buggy anyway.

Also, note that impl_agent_manager_register_with_capabilities()
already ensures that duplicate agents are not registered
in the first place (find_agent_by_identifier_and_uid()).
---
 src/settings/nm-agent-manager.c | 10 ----------
 src/settings/nm-secret-agent.c  | 14 --------------
 src/settings/nm-secret-agent.h  |  2 --
 3 files changed, 26 deletions(-)

diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
index c94cbae9d9..baacc30a6d 100644
--- a/src/settings/nm-agent-manager.c
+++ b/src/settings/nm-agent-manager.c
@@ -401,12 +401,6 @@ struct _Request {
 	/* Stores the sorted list of NMSecretAgents which will be asked for secrets */
 	GSList *pending;
 
-	/* Stores the list of NMSecretAgent hashes that we've already
-	 * asked for secrets, so that we don't ask the same agent twice
-	 * if it quits and re-registers during this secrets request.
-	 */
-	GSList *asked;
-
 	guint32 idle_id;
 
 	RequestAddAgentFunc add_agent_callback;
@@ -466,7 +460,6 @@ request_free (Request *req)
 	g_free (req->detail);
 	g_free (req->verb);
 	g_slist_free_full (req->pending, g_object_unref);
-	g_slist_free (req->asked);
 	memset (req, 0, sizeof (Request));
 	g_free (req);
 }
@@ -535,9 +528,6 @@ request_add_agent (Request *req, NMSecretAgent *agent)
 	g_return_if_fail (req != NULL);
 	g_return_if_fail (agent != NULL);
 
-	if (g_slist_find (req->asked, GUINT_TO_POINTER (nm_secret_agent_get_hash (agent))))
-		return;
-
 	if (req->add_agent_callback && !req->add_agent_callback (req, agent))
 		return;
 
diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c
index 2503b6adaf..6d11236005 100644
--- a/src/settings/nm-secret-agent.c
+++ b/src/settings/nm-secret-agent.c
@@ -45,7 +45,6 @@ typedef struct {
 	char *owner_username;
 	char *dbus_owner;
 	NMSecretAgentCapabilities capabilities;
-	guint32 hash;
 
 	GSList *permissions;
 
@@ -190,14 +189,6 @@ nm_secret_agent_get_capabilities (NMSecretAgent *agent)
 	return NM_SECRET_AGENT_GET_PRIVATE (agent)->capabilities;
 }
 
-guint32
-nm_secret_agent_get_hash (NMSecretAgent *agent)
-{
-	g_return_val_if_fail (NM_IS_SECRET_AGENT (agent), 0);
-
-	return NM_SECRET_AGENT_GET_PRIVATE (agent)->hash;
-}
-
 NMAuthSubject *
 nm_secret_agent_get_subject (NMSecretAgent *agent)
 {
@@ -565,7 +556,6 @@ nm_secret_agent_new (GDBusMethodInvocation *context,
 {
 	NMSecretAgent *self;
 	NMSecretAgentPrivate *priv;
-	char *hash_str;
 	struct passwd *pw;
 	GDBusProxy *proxy;
 	char *owner_username = NULL;
@@ -588,10 +578,6 @@ nm_secret_agent_new (GDBusMethodInvocation *context,
 	priv->capabilities = capabilities;
 	priv->subject = g_object_ref (subject);
 
-	hash_str = g_strdup_printf ("%16lu%s", nm_auth_subject_get_unix_process_uid (subject), identifier);
-	priv->hash = g_str_hash (hash_str);
-	g_free (hash_str);
-
 	proxy = nm_bus_manager_new_proxy (nm_bus_manager_get (),
 	                                  context,
 	                                  NMDBUS_TYPE_SECRET_AGENT_PROXY,
diff --git a/src/settings/nm-secret-agent.h b/src/settings/nm-secret-agent.h
index 668b1e559c..b220dfd53f 100644
--- a/src/settings/nm-secret-agent.h
+++ b/src/settings/nm-secret-agent.h
@@ -66,8 +66,6 @@ gulong      nm_secret_agent_get_pid        (NMSecretAgent *agent);
 
 NMSecretAgentCapabilities nm_secret_agent_get_capabilities (NMSecretAgent *agent);
 
-guint32     nm_secret_agent_get_hash       (NMSecretAgent *agent);
-
 NMAuthSubject *nm_secret_agent_get_subject (NMSecretAgent *agent);
 
 void        nm_secret_agent_add_permission (NMSecretAgent *agent,