diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-09-09 12:59:01 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-09-09 12:59:01 +0200 |
| commit | e0fe47b74e92e9614717a3d918eed3fc0bc6b2ea (patch) | |
| tree | 7dda4870e626464387bdca027a7b7d04b59e70f4 | |
| parent | 52cd5ee6120b643aa143cbd439f81a0c02c8313e (diff) | |
| download | NetworkManager-e0fe47b74e92e9614717a3d918eed3fc0bc6b2ea.tar.gz | |
core: fix handling ignore-auto-dns for IPv6 nameservers
https://bugzilla.redhat.com/show_bug.cgi?id=1261428
Fixes: f7a8962dd47099425438ee484e02f40e18b6ee79
| -rw-r--r-- | src/nm-ip6-config.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 20bc3fed80..4236e24cbe 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -659,8 +659,10 @@ nm_ip6_config_merge (NMIP6Config *dst, const NMIP6Config *src, NMIPConfigMergeFl nm_ip6_config_add_address (dst, nm_ip6_config_get_address (src, i)); /* nameservers */ - for (i = 0; i < nm_ip6_config_get_num_nameservers (src); i++) - nm_ip6_config_add_nameserver (dst, nm_ip6_config_get_nameserver (src, i)); + if (!NM_FLAGS_HAS (merge_flags, NM_IP_CONFIG_MERGE_NO_DNS)) { + for (i = 0; i < nm_ip6_config_get_num_nameservers (src); i++) + nm_ip6_config_add_nameserver (dst, nm_ip6_config_get_nameserver (src, i)); + } /* default gateway */ if (nm_ip6_config_get_gateway (src)) |