|
 |
ab7d06 |
From 0a95f003a9b0cad71d8fcb88562f4050881e0ace Mon Sep 17 00:00:00 2001
|
|
|
ab7d06 |
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
|
ab7d06 |
Date: Tue, 20 Oct 2015 19:41:19 +0200
|
|
|
ab7d06 |
Subject: [PATCH 1/2] agent-manager: cancel secrets requests on an error
|
|
|
ab7d06 |
|
|
|
ab7d06 |
It might be that the user didn't supply the secrets in time and the dbus call
|
|
|
ab7d06 |
timed out. The agent should now hide the secrets dialog and we must let it know.
|
|
|
ab7d06 |
|
|
|
ab7d06 |
https://bugzilla.redhat.com/show_bug.cgi?id=1272023
|
|
|
ab7d06 |
(cherry picked from commit 5d1cac81a0bcc66b891bc38f1a2cc4b84d47f08b)
|
|
|
ab7d06 |
---
|
|
|
ab7d06 |
src/settings/nm-agent-manager.c | 3 +++
|
|
|
ab7d06 |
1 file changed, 3 insertions(+)
|
|
|
ab7d06 |
|
|
|
ab7d06 |
diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
|
|
|
ab7d06 |
index 8dcda06..d59173a 100644
|
|
|
ab7d06 |
--- a/src/settings/nm-agent-manager.c
|
|
|
ab7d06 |
+++ b/src/settings/nm-agent-manager.c
|
|
|
ab7d06 |
@@ -816,6 +816,9 @@ get_done_cb (NMSecretAgent *agent,
|
|
|
ab7d06 |
req_complete_error (parent, error);
|
|
|
ab7d06 |
g_error_free (error);
|
|
|
ab7d06 |
} else {
|
|
|
ab7d06 |
+ /* Tell the failed agent we're no longer interested. */
|
|
|
ab7d06 |
+ nm_secret_agent_cancel_secrets (parent->current, parent->current_call_id);
|
|
|
ab7d06 |
+
|
|
|
ab7d06 |
/* Try the next agent */
|
|
|
ab7d06 |
request_next_agent (parent);
|
|
|
ab7d06 |
}
|
|
|
ab7d06 |
--
|
|
|
ab7d06 |
2.4.3
|
|
|
ab7d06 |
|
|
|
ab7d06 |
From 24195884cd953966776074cb6d8df6bf01641845 Mon Sep 17 00:00:00 2001
|
|
|
ab7d06 |
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
|
ab7d06 |
Date: Thu, 22 Oct 2015 14:27:45 +0200
|
|
|
ab7d06 |
Subject: [PATCH 2/2] libnm-glib,vpn-plugin: remove old connect timer when
|
|
|
ab7d06 |
adding new one
|
|
|
ab7d06 |
|
|
|
ab7d06 |
If the plugin didn't succeed connecting once, don't let the old timer fire
|
|
|
ab7d06 |
during a subsequent connection.
|
|
|
ab7d06 |
|
|
|
ab7d06 |
https://bugzilla.redhat.com/show_bug.cgi?id=1271973
|
|
|
ab7d06 |
(cherry picked from commit 842889bc5b588d191aa2c2cbcb73452ac8971cf5)
|
|
|
ab7d06 |
---
|
|
|
ab7d06 |
libnm-glib/nm-vpn-plugin.c | 1 +
|
|
|
ab7d06 |
1 file changed, 1 insertion(+)
|
|
|
ab7d06 |
|
|
|
ab7d06 |
diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c
|
|
|
ab7d06 |
index a9c4a1f..4350e60 100644
|
|
|
ab7d06 |
--- a/libnm-glib/nm-vpn-plugin.c
|
|
|
ab7d06 |
+++ b/libnm-glib/nm-vpn-plugin.c
|
|
|
ab7d06 |
@@ -426,6 +426,7 @@ connect_timer_start (NMVPNPlugin *plugin)
|
|
|
ab7d06 |
{
|
|
|
ab7d06 |
NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin);
|
|
|
ab7d06 |
|
|
|
ab7d06 |
+ nm_clear_g_source (&priv->connect_timer);
|
|
|
ab7d06 |
priv->connect_timer = g_timeout_add_seconds (60, connect_timer_expired, plugin);
|
|
|
ab7d06 |
}
|
|
|
ab7d06 |
|
|
|
ab7d06 |
--
|
|
|
ab7d06 |
2.4.3
|
|
|
ab7d06 |
|