fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 04:28:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Remove dns VPN/DEVICE DNS config before adding different one"

Browse source 
This reverts commit 68122212e0.
This commit is contained in:
Thomas Haller 2016-06-10 00:59:35 +02:00
parent ce18cc1b53
commit 62b3d27e1d
1 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/dns-manager/nm-dns-manager.c
View file

@ -1142,17 +1142,9 @@ nm_dns_manager_add_ip4_config (NMDnsManager *self,
switch (cfg_type) {
case NM_DNS_IP_CONFIG_TYPE_VPN:
if (priv->ip4_vpn_config && priv->ip4_vpn_config != config) {
priv->configs = g_slist_remove (priv->configs, priv->ip4_vpn_config);
g_object_unref (priv->ip4_vpn_config);
}
priv->ip4_vpn_config = config;
break;
case NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE:
if (priv->ip4_device_config && priv->ip4_device_config != config) {
priv->configs = g_slist_remove (priv->configs, priv->ip4_device_config);
g_object_unref (priv->ip4_device_config);
}
priv->ip4_device_config = config;
break;
default:
@ -1223,17 +1215,9 @@ nm_dns_manager_add_ip6_config (NMDnsManager *self,
switch (cfg_type) {
case NM_DNS_IP_CONFIG_TYPE_VPN:
if (priv->ip6_vpn_config && priv->ip6_vpn_config != config) {
priv->configs = g_slist_remove (priv->configs, priv->ip6_vpn_config);
g_object_unref (priv->ip6_vpn_config);
}
priv->ip6_vpn_config = config;
break;
case NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE:
if (priv->ip6_device_config && priv->ip6_device_config != config) {
priv->configs = g_slist_remove (priv->configs, priv->ip6_device_config);
g_object_unref (priv->ip6_device_config);
}
priv->ip6_device_config = config;
break;
default: