diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-07-09 23:13:10 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-07-09 23:14:51 +0200 |
| commit | d6831efc6bf37594b1674e442ca75e0e957bfecf (patch) | |
| tree | fd7c2be465ede74f99f0cc824856a3a4b114087b | |
| parent | db445399125318fa86118f9d77cb76d55e64a91b (diff) | |
| download | NetworkManager-d6831efc6bf37594b1674e442ca75e0e957bfecf.tar.gz | |
device: fix regression for ignored search domains in ip._config_merge_and_apply()
Reported-by: Fabrice Bellet <fabrice@bellet.info>
Fixes: 79630c11e502c3b0b958abc0b1b5d777a3db2a98
https://bugzilla.gnome.org/show_bug.cgi?id=752193
| -rw-r--r-- | src/devices/nm-device.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 39576e11db..48d2004fe6 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -3281,10 +3281,11 @@ ip4_config_merge_and_apply (NMDevice *self, if (s_ip4) { if (nm_setting_ip_config_get_ignore_auto_routes (s_ip4)) nm_ip4_config_reset_routes (composite); - if (nm_setting_ip_config_get_ignore_auto_dns (s_ip4)) + if (nm_setting_ip_config_get_ignore_auto_dns (s_ip4)) { nm_ip4_config_reset_nameservers (composite); nm_ip4_config_reset_domains (composite); nm_ip4_config_reset_searches (composite); + } } } @@ -3895,10 +3896,11 @@ ip6_config_merge_and_apply (NMDevice *self, if (s_ip6) { if (nm_setting_ip_config_get_ignore_auto_routes (s_ip6)) nm_ip6_config_reset_routes (composite); - if (nm_setting_ip_config_get_ignore_auto_dns (s_ip6)) + if (nm_setting_ip_config_get_ignore_auto_dns (s_ip6)) { nm_ip6_config_reset_nameservers (composite); nm_ip6_config_reset_domains (composite); nm_ip6_config_reset_searches (composite); + } } } |