diff options
| author | Michael Biebl <biebl@debian.org> | 2018-02-07 02:39:23 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-02-07 02:39:23 +0100 |
| commit | 50f6b47074e01dffb8dc536c0a20961dcf28ae9b (patch) | |
| tree | b4bd771d78ebe38661b8c4ec8b9a8e0eb8261eb5 /libnm-core/nm-setting-team.c | |
| parent | afcd268ea7b1149fbfb66bce4eca659b675da0a2 (diff) | |
New upstream version 1.10.4 upstream/1.10.4
Diffstat (limited to 'libnm-core/nm-setting-team.c')
| -rw-r--r-- | libnm-core/nm-setting-team.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c index d3688278..60bdf5f6 100644 --- a/libnm-core/nm-setting-team.c +++ b/libnm-core/nm-setting-team.c @@ -249,7 +249,7 @@ nm_team_link_watcher_new_arp_ping (gint init_wait, return NULL; } - if (strpbrk (target_host, " \\/\t=\"\'")) { + if (strpbrk (source_host, " \\/\t=\"\'")) { g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED, _("source-host '%s' contains invalid characters"), source_host); return NULL; @@ -1485,8 +1485,10 @@ set_property (GObject *object, guint prop_id, break; } - if (align_config) + if (align_config) { _nm_utils_json_append_gvalue (&priv->config, _prop_to_keys[prop_id], align_value); + _align_team_properties (setting); + } } static void @@ -1654,6 +1656,10 @@ nm_setting_team_class_init (NMSettingTeamClass *setting_class) * Corresponds to the teamd runner.name. * Permitted values are: "roundrobin", "broadcast", "activebackup", * "loadbalance", "lacp". + * When setting the runner, all the properties specific to the runner + * will be reset to the default value; all the properties specific to + * other runners will be set to an empty value (or if not possible to + * a default value). * * Since: 1.10.2 **/ |