From 60da63251262cb021c2f00b40ee7e10f343e8a64 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 11 Mar 2008 16:42:00 +0000 Subject: [PATCH] 2008-03-11 Dan Williams * src/NetworkManagerPolicy.c - (update_routing_and_dns): don't change anything if the default device hasn't changed; print something out when switching the default route and DNS git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3419 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 8 ++++++++ src/NetworkManagerPolicy.c | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6351651891..933cad7d27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-03-11 Dan Williams + + * src/NetworkManagerPolicy.c + - (update_routing_and_dns): don't change anything if the default device + hasn't changed; print something out when switching the default route + and DNS + 2008-03-10 Tambet Ingo Implement PPPoE. @@ -28,6 +35,7 @@ * introspection/nm-ppp-manager.xml: Make NeedSecrets method async, return only username and password. +>>>>>>> .r3418 2008-03-10 Dan Williams * src/nm-device.c diff --git a/src/NetworkManagerPolicy.c b/src/NetworkManagerPolicy.c index 6611716247..e5d6f13b4f 100644 --- a/src/NetworkManagerPolicy.c +++ b/src/NetworkManagerPolicy.c @@ -133,9 +133,12 @@ update_routing_and_dns (NMPolicy *policy) } } - if (!best) + if (!best || (best == policy->default_device)) goto out; + nm_info ("Policy (%s) now the default device for routing and DNS.", + nm_device_get_iface (best)); + update_default_route (policy, best); named_mgr = nm_named_manager_get ();