summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2016-06-10 14:03:10 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2016-07-08 11:55:55 +0200
commit10c53528552d1f0df8c28326a8f0bd2a31b9fa46 (patch)
tree954766a3aa0b37840ffeed24982c921b78b1f727
parent0de2483685e75ccf55303d6e0c593371456cdfd0 (diff)
downloadNetworkManager-10c53528552d1f0df8c28326a8f0bd2a31b9fa46.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 https://bugzilla.redhat.com/show_bug.cgi?id=1349740
-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;
}