58 lines
1.7 KiB
Diff
58 lines
1.7 KiB
Diff
|
From 0d157c412776877a3cc76b845910036d29ca2f0a Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
|
||
|
|
Date: Tue, 22 Feb 2011 18:28:12 +0100
|
||
|
|
Subject: [PATCH] dns: fix up updating resolv.conf (rh #672282)
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
|
||
|
|
Signed-off-by: Jiří Klimeš <jklimes@redhat.com>
|
||
|
|
---
|
||
|
|
src/dns-manager/nm-dns-manager.c | 8 ++++----
|
||
|
|
1 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
|
||
|
|
index b0cdcc2..32800d0 100644
|
||
|
|
--- a/src/dns-manager/nm-dns-manager.c
|
||
|
|
+++ b/src/dns-manager/nm-dns-manager.c
|
||
|
|
@@ -16,7 +16,7 @@
|
||
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||
|
|
*
|
||
|
|
* Copyright (C) 2004 - 2005 Colin Walters <walters@redhat.com>
|
||
|
|
- * Copyright (C) 2004 - 2010 Red Hat, Inc.
|
||
|
|
+ * Copyright (C) 2004 - 2011 Red Hat, Inc.
|
||
|
|
* Copyright (C) 2005 - 2008 Novell, Inc.
|
||
|
|
* and others
|
||
|
|
*/
|
||
|
|
@@ -861,7 +861,7 @@ nm_dns_manager_remove_ip4_config (NMDnsManager *mgr,
|
||
|
|
|
||
|
|
g_object_unref (config);
|
||
|
|
|
||
|
|
- if (config_changed (mgr))
|
||
|
|
+ if (!config_changed (mgr))
|
||
|
|
return TRUE;
|
||
|
|
|
||
|
|
if (!update_dns (mgr, iface, FALSE, &error)) {
|
||
|
|
@@ -906,7 +906,7 @@ nm_dns_manager_add_ip6_config (NMDnsManager *mgr,
|
||
|
|
if (!g_slist_find (priv->configs, config))
|
||
|
|
priv->configs = g_slist_append (priv->configs, g_object_ref (config));
|
||
|
|
|
||
|
|
- if (config_changed (mgr))
|
||
|
|
+ if (!config_changed (mgr))
|
||
|
|
return TRUE;
|
||
|
|
|
||
|
|
if (!update_dns (mgr, iface, FALSE, &error)) {
|
||
|
|
@@ -946,7 +946,7 @@ nm_dns_manager_remove_ip6_config (NMDnsManager *mgr,
|
||
|
|
|
||
|
|
g_object_unref (config);
|
||
|
|
|
||
|
|
- if (config_changed (mgr))
|
||
|
|
+ if (!config_changed (mgr))
|
||
|
|
return TRUE;
|
||
|
|
|
||
|
|
if (!update_dns (mgr, iface, FALSE, &error)) {
|
||
|
|
--
|
||
|
|
1.7.4
|
||
|
|
|