summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2016-06-10 14:03:10 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2016-06-20 15:41:09 +0200
commit0aa5c94106d47d73de6e72a2c429a067c61b0b0a (patch)
treeee03d3b38708248743ebbc27eed4b604fb296065
parent59269b6925e9947b4c11f1548ba1593dd4aa5371 (diff)
downloadNetworkManager-0aa5c94106d47d73de6e72a2c429a067c61b0b0a.tar.gz
secret-agent: increase timeout for GetSecrets D-Bus call
The default value of 25 seconds is too short, bump it to 120. https://bugzilla.gnome.org/show_bug.cgi?id=767321
-rw-r--r--src/settings/nm-secret-agent.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c
index bfa7b50626..8bc88fd4d6 100644
--- a/src/settings/nm-secret-agent.c
+++ b/src/settings/nm-secret-agent.c
@@ -362,6 +362,9 @@ nm_secret_agent_get_secrets (NMSecretAgent *self,
r = request_new (self, "GetSecrets", path, setting_name, callback, callback_data);
r->is_get_secrets = TRUE;
g_hash_table_add (priv->requests, r);
+
+ /* Increase the timeout only for this call */
+ g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (priv->proxy), 120000);
nmdbus_secret_agent_call_get_secrets (priv->proxy,
dict,
path,
@@ -370,6 +373,7 @@ nm_secret_agent_get_secrets (NMSecretAgent *self,
flags,
r->cancellable,
get_callback, r);
+ g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (priv->proxy), -1);
return r;
}