New upstream version 1.10.6 upstream/1.10.6

4 files changed, 65 insertions, 25 deletions

diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 83b1f28a..e0f55c53 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -616,26 +616,54 @@ get_ac_for_connection (const GPtrArray *active_cons, NMConnection *connection)
 	return ac;
 }
 
+typedef struct {
+	GMainLoop *loop;
+	NMConnection *local;
+	const char *setting_name;
+} GetSecretsData;
+
+static void
+got_secrets (GObject *source_object, GAsyncResult *res, gpointer user_data)
+{
+	NMRemoteConnection *remote = NM_REMOTE_CONNECTION (source_object);
+	GetSecretsData *data = user_data;
+	GVariant *secrets;
+	GError *error = NULL;
+
+	secrets = nm_remote_connection_get_secrets_finish (remote, res, NULL);
+	if (secrets) {
+		if (!nm_connection_update_secrets (data->local, NULL, secrets, &error) && error) {
+			g_printerr (_("Error updating secrets for %s: %s\n"),
+			            data->setting_name, error->message);
+			g_clear_error (&error);
+		}
+		g_variant_unref (secrets);
+	}
+
+	g_main_loop_quit (data->loop);
+}
+
 /* Put secrets into local connection. */
 static void
 update_secrets_in_connection (NMRemoteConnection *remote, NMConnection *local)
 {
-	GVariant *secrets;
+	GetSecretsData data = { 0, };
 	int i;
-	GError *error = NULL;
+
+	data.local = local;
+	data.loop = g_main_loop_new (NULL, FALSE);
 
 	for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++) {
-		secrets = nm_remote_connection_get_secrets (remote, nm_meta_setting_infos[i].setting_name, NULL, NULL);
-		if (secrets) {
-			if (!nm_connection_update_secrets (local, NULL, secrets, &error) && error) {
-				g_printerr (_("Error updating secrets for %s: %s\n"),
-				            nm_meta_setting_infos[i].setting_name,
-				            error->message);
-				g_clear_error (&error);
-			}
-			g_variant_unref (secrets);
-		}
+		data.setting_name = nm_meta_setting_infos[i].setting_name;
+		nm_remote_connection_get_secrets_async (remote,
+		                                        nm_meta_setting_infos[i].setting_name,
+		                                        NULL,
+		                                        got_secrets,
+		                                        &data);
+		g_main_loop_run (data.loop);
 	}
+
+	g_main_loop_unref (data.loop);
 }
 
 static gboolean
diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c
index 10a84f9c..ecd58ba5 100644
--- a/clients/cli/polkit-agent.c
+++ b/clients/cli/polkit-agent.c
@@ -57,7 +57,6 @@ polkit_request (const char *request,
 		g_free (tmp);
 	} else
 		response = nmc_readline_echo (echo_on, "%s", request);
-	g_print ("\n");
 
 	return response;
 }
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 46b06fd4..94404e90 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -3950,12 +3950,19 @@ _validate_fcn_team_config (const char *value, char **out_to_free, GError **error
 }
 
 static gboolean
-_is_valid_team_runner_tx_hash_element (const char *tx_hash_element)
+_is_valid_team_runner_tx_hash_element (const char *tx_hash_element,
+                                       GError **error)
 {
-	const char *valid_tx_hashes[] = { "eth", "vlan", "ipv4", "ipv6", "ip",
-	                                  "l3", "tcp", "udp", "sctp", "l4", NULL };
-	if (nmc_string_is_valid (tx_hash_element, valid_tx_hashes, NULL))
+	nm_assert (!error || !*error);
+
+	if (NM_IN_STRSET (tx_hash_element,
+	                  "eth", "vlan", "ipv4", "ipv6", "ip",
+	                  "l3", "tcp", "udp", "sctp", "l4")) {
 		return TRUE;
+	}
+
+	g_set_error (error, 1, 0, "'%s' is not valid. %s", tx_hash_element,
+	             "Valid tx-hashes: [eth, vlan, ipv4, ipv6, ip, l3, tcp, udp, sctp, l4]");
 	return FALSE;
 }
 
@@ -3963,21 +3970,24 @@ static gboolean
 _set_fcn_team_runner_tx_hash (ARGS_SET_FCN)
 {
 	char **strv = NULL;
-	guint i = 0;
+	char *const*iter;
 
 	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
 	strv = _nm_utils_strv_cleanup (g_strsplit_set (value, " \t,", 0),
 	                               TRUE, TRUE, TRUE);
-	if (!verify_string_list (strv, property_info->property_name,
-	                         _is_valid_team_runner_tx_hash_element,
-	                         error)) {
-		g_strfreev (strv);
-		return FALSE;
+	for (iter = strv; strv && *iter; iter++) {
+		if (!_is_valid_team_runner_tx_hash_element (*iter, error)) {
+			g_strfreev (strv);
+			return FALSE;
+		}
 	}
 
-	while (strv && strv[i])
-		nm_setting_team_add_runner_tx_hash (NM_SETTING_TEAM (setting), strv[i++]);
+	while (nm_setting_team_get_num_runner_tx_hash (NM_SETTING_TEAM (setting)))
+		nm_setting_team_remove_runner_tx_hash (NM_SETTING_TEAM (setting), 0);
+
+	for (iter = strv; strv && *iter; iter++)
+		nm_setting_team_add_runner_tx_hash (NM_SETTING_TEAM (setting), *iter);
 	g_strfreev (strv);
 
 	return TRUE;
@@ -6594,6 +6604,7 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = {
 		.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
 			.values_static =            VALUES_STATIC (NM_SETTING_TEAM_RUNNER_BROADCAST,
 			                                           NM_SETTING_TEAM_RUNNER_ROUNDROBIN,
+			                                           NM_SETTING_TEAM_RUNNER_RANDOM,
 			                                           NM_SETTING_TEAM_RUNNER_ACTIVEBACKUP,
 			                                           NM_SETTING_TEAM_RUNNER_LOADBALANCE,
 			                                           NM_SETTING_TEAM_RUNNER_LACP),
diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c
index 9c67760b..69f49062 100644
--- a/clients/common/nm-polkit-listener.c
+++ b/clients/common/nm-polkit-listener.c
@@ -205,6 +205,8 @@ initiate_authentication (PolkitAgentListener  *listener,
 	                                    callback,
 	                                    user_data,
 	                                    initiate_authentication);
+	if (cancellable)
+		g_simple_async_result_set_check_cancellable (simple, cancellable);
 	if (priv->active_session != NULL) {
 		g_simple_async_result_set_error (simple,
 		                                 POLKIT_ERROR,