|
 |
ab7d06 |
From 6aa521cd2a8d77aee3caafe3413090c683f13cb1 Mon Sep 17 00:00:00 2001
|
|
|
ab7d06 |
From: Thomas Haller <thaller@redhat.com>
|
|
|
ab7d06 |
Date: Wed, 9 Sep 2015 12:59:01 +0200
|
|
|
ab7d06 |
Subject: [PATCH 1/1] core: fix handling ignore-auto-dns for IPv6 nameservers
|
|
|
ab7d06 |
|
|
|
ab7d06 |
https://bugzilla.redhat.com/show_bug.cgi?id=1261428
|
|
|
ab7d06 |
|
|
|
ab7d06 |
Fixes: f7a8962dd47099425438ee484e02f40e18b6ee79
|
|
|
ab7d06 |
(cherry picked from commit e0fe47b74e92e9614717a3d918eed3fc0bc6b2ea)
|
|
|
ab7d06 |
(cherry picked from commit 8de6ee4ebad93cd1f552c666183a4fac76274aa5)
|
|
|
ab7d06 |
---
|
|
|
ab7d06 |
src/nm-ip6-config.c | 6 ++++--
|
|
|
ab7d06 |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
ab7d06 |
|
|
|
ab7d06 |
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
|
|
|
ab7d06 |
index 9647268..ef25623 100644
|
|
|
ab7d06 |
--- a/src/nm-ip6-config.c
|
|
|
ab7d06 |
+++ b/src/nm-ip6-config.c
|
|
|
ab7d06 |
@@ -635,8 +635,10 @@ nm_ip6_config_merge (NMIP6Config *dst, const NMIP6Config *src, NMIPConfigMergeFl
|
|
|
ab7d06 |
nm_ip6_config_add_address (dst, nm_ip6_config_get_address (src, i));
|
|
|
ab7d06 |
|
|
|
ab7d06 |
/* nameservers */
|
|
|
ab7d06 |
- for (i = 0; i < nm_ip6_config_get_num_nameservers (src); i++)
|
|
|
ab7d06 |
- nm_ip6_config_add_nameserver (dst, nm_ip6_config_get_nameserver (src, i));
|
|
|
ab7d06 |
+ if (!NM_FLAGS_HAS (merge_flags, NM_IP_CONFIG_MERGE_NO_DNS)) {
|
|
|
ab7d06 |
+ for (i = 0; i < nm_ip6_config_get_num_nameservers (src); i++)
|
|
|
ab7d06 |
+ nm_ip6_config_add_nameserver (dst, nm_ip6_config_get_nameserver (src, i));
|
|
|
ab7d06 |
+ }
|
|
|
ab7d06 |
|
|
|
ab7d06 |
/* default gateway */
|
|
|
ab7d06 |
if (nm_ip6_config_get_gateway (src))
|
|
|
ab7d06 |
--
|
|
|
ab7d06 |
2.4.3
|
|
|
ab7d06 |
|