fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-27 12:50:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

clients: remove the same dns-option before adding it

Browse source 
nmcli connection modify t ipv4.dns-options ndots:2
 nmcli connection modify t +ipv4.dns-options ndots:4

should set dns-options to 'ndots:4', so we must remove other
occurences of the same option before adding it, otherwise the setting
refuses to set the same option again.
This commit is contained in:
Beniamino Galvani 2019-01-12 10:23:30 +01:00
parent bcb91f4f65
commit b11a20ded0
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clients/common/nm-meta-setting-desc.c
View file

@ -3392,14 +3392,18 @@ static gboolean
_set_fcn_ip_config_dns_options (ARGS_SET_FCN)
{
gs_free const char **strv = NULL;
NMSettingIPConfig *s_ip;
gsize i;
nm_assert (!error || !*error);
s_ip = NM_SETTING_IP_CONFIG (setting);
strv = nm_utils_strsplit_set (value, " \t,", FALSE);
if (strv) {
for (i = 0; strv[i]; i++)
nm_setting_ip_config_add_dns_option (NM_SETTING_IP_CONFIG (setting), strv[i]);
for (i = 0; strv[i]; i++) {
nm_setting_ip_config_remove_dns_option_by_value (s_ip, strv[i]);
nm_setting_ip_config_add_dns_option (s_ip, strv[i]);
}
}
return TRUE;
}