colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clients: merge branch 'bg/cli-agent-race-rh1438476'

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=1438476
This commit is contained in:
Beniamino Galvani
2017-11-02 15:26:07 +01:00
parent 28b97f02f6 61b666902b
commit 4a9ec4d39b
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
clients/cli/connections.c
View File

@@ -2397,10 +2397,6 @@ nmc_activate_connection (NmCli *nmc,
NM_SECRET_AGENT_SIMPLE_REQUEST_SECRETS, NM_SECRET_AGENT_SIMPLE_REQUEST_SECRETS,
G_CALLBACK (nmc_secrets_requested), G_CALLBACK (nmc_secrets_requested),
nmc); nmc);
if (connection) {
nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (nmc->secret_agent),
nm_object_get_path (NM_OBJECT (connection)));
}
} }
info = g_malloc0 (sizeof (ActivateConnectionInfo)); info = g_malloc0 (sizeof (ActivateConnectionInfo));
@@ -6182,6 +6178,7 @@ typedef struct {
NMDevice *device; NMDevice *device;
NMActiveConnection *ac; NMActiveConnection *ac;
guint monitor_id; guint monitor_id;
NmCli *nmc;
} MonitorACInfo; } MonitorACInfo;
static gboolean nmc_editor_cb_called; static gboolean nmc_editor_cb_called;
@@ -6259,6 +6256,14 @@ progress_activation_editor_cb (gpointer user_data)
goto finish; /* we are done */ goto finish; /* we are done */
} }
if (info->nmc->secret_agent) {
NMRemoteConnection *connection;
connection = nm_active_connection_get_connection (ac);
nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (info->nmc->secret_agent),
nm_object_get_path (NM_OBJECT (connection)));
}
return TRUE; return TRUE;
finish: finish:
@@ -6294,6 +6299,7 @@ activate_connection_editor_cb (GObject *client,
monitor_ac_info->device = g_object_ref (device); monitor_ac_info->device = g_object_ref (device);
monitor_ac_info->ac = active; monitor_ac_info->ac = active;
monitor_ac_info->monitor_id = g_timeout_add (120, progress_activation_editor_cb, monitor_ac_info); monitor_ac_info->monitor_id = g_timeout_add (120, progress_activation_editor_cb, monitor_ac_info);
monitor_ac_info->nmc = info->nmc;
} else } else
g_object_unref (active); g_object_unref (active);
} }

7
clients/common/nm-secret-agent-simple.c
View File

@@ -748,7 +748,12 @@ nm_secret_agent_simple_cancel_get_secrets (NMSecretAgentOld *agent,
const gchar *connection_path, const gchar *connection_path,
const gchar *setting_name) const gchar *setting_name)
{ {
/* We don't support cancellation. Sorry! */ NMSecretAgentSimple *self = NM_SECRET_AGENT_SIMPLE (agent);
NMSecretAgentSimplePrivate *priv = NM_SECRET_AGENT_SIMPLE_GET_PRIVATE (self);
gs_free char *request_id = NULL;
request_id = g_strdup_printf ("%s/%s", connection_path, setting_name);
g_hash_table_remove (priv->requests, request_id);
} }
static void static void