From eb5eca7a16f18fee563e0f97f5d0feeb8200dd07 Mon Sep 17 00:00:00 2001 From: Robert Love Date: Mon, 12 Dec 2005 15:29:32 +0000 Subject: [PATCH] 2005-12-12 Robert Love * src/dhcp-manager/nm-dhcp-manager.c: Do not fail if DHCP does not return any name servers. That is perfectly valid. (Novell #134369). git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1166 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ src/dhcp-manager/nm-dhcp-manager.c | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f5bfa9c66..07a73a2d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-12 Robert Love + + * src/dhcp-manager/nm-dhcp-manager.c: Do not fail if DHCP does not + return any name servers. That is perfectly valid. (Novell #134369). + 2005-12-11 Dan Williams * gnome/applet/wso-* diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index 033a16a02..b4637a70b 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -507,9 +507,7 @@ NMIP4Config * nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, NMActReque goto out; } - if (!get_ip4_uint32s (manager, dev, "domain_name_servers", &ip4_nameservers, &num_ip4_nameservers) || !num_ip4_nameservers) - goto out; - + get_ip4_uint32s (manager, dev, "domain_name_servers", &ip4_nameservers, &num_ip4_nameservers); get_ip4_string (manager, dev, "domain_name", &domain_names); nm_info ("Retrieved the following IP4 configuration from the DHCP daemon:");