NetworkManager r3398 - in branches/NETWORKMANAGER_0_6_0_RELEASE: . src/dhcp-manager

[dcbw svn gnome org]

Author: dcbw
Date: Sat Mar  8 19:38:44 2008
New Revision: 3398
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3398&view=rev

Log:
2008-03-08  Dan Williams  <dcbw redhat com>

	Patch from Bas Zoetekouw <bas debian org>

	* src/dhcp-manager/nm-dhcp-manager.c
		- (nm_dhcp_manager_get_ip4_config): handle domain-search option too



Modified:
   branches/NETWORKMANAGER_0_6_0_RELEASE/ChangeLog
   branches/NETWORKMANAGER_0_6_0_RELEASE/src/dhcp-manager/nm-dhcp-manager.c

Modified: branches/NETWORKMANAGER_0_6_0_RELEASE/src/dhcp-manager/nm-dhcp-manager.c
==============================================================================
--- branches/NETWORKMANAGER_0_6_0_RELEASE/src/dhcp-manager/nm-dhcp-manager.c	(original)
+++ branches/NETWORKMANAGER_0_6_0_RELEASE/src/dhcp-manager/nm-dhcp-manager.c	Sat Mar  8 19:38:44 2008
@@ -472,6 +472,7 @@
 	guint32		num_ip4_nis_servers = 0;
 	char *		hostname = NULL;
 	char *		domain_names = NULL;
+	char *		domain_searches = NULL;
 	char *		nis_domain = NULL;
 	guint32 *		ip4_nis_servers = NULL;
 	struct in_addr	temp_addr;
@@ -520,6 +521,7 @@
 	get_ip4_string (manager, dev, "host_name", &hostname, TRUE);
 	get_ip4_uint32s (manager, dev, "domain_name_servers", &ip4_nameservers, &num_ip4_nameservers, FALSE);
 	get_ip4_string (manager, dev, "domain_name", &domain_names, TRUE);
+	get_ip4_string (manager, dev, "domain_search", &domain_searches, TRUE);
 	get_ip4_string (manager, dev, "nis_domain", &nis_domain, TRUE);
 	get_ip4_uint32s (manager, dev, "nis_servers", &ip4_nis_servers, &num_ip4_nis_servers, TRUE);
 
@@ -557,14 +559,27 @@
 
 	if (domain_names)
 	{
-		char **searches = g_strsplit (domain_names, " ", 0);
+		char **domains = g_strsplit (domain_names, " ", 0);
 		char **s;
 
-		for (s = searches; *s; s++)
+		for (s = domains; *s; s++)
 		{
 			nm_info ("  domain name '%s'", *s);
 			nm_ip4_config_add_domain (ip4_config, *s);
 		}
+		g_strfreev (domains);
+	}
+
+	if (domain_searches)
+	{
+		char **searches = g_strsplit (domain_searches, " ", 0);
+		char **s;
+
+		for (s = searches; *s; s++)
+		{
+			nm_info ("  domain search '%s'", *s);
+			nm_ip4_config_add_search (ip4_config, *s);
+		}
 		g_strfreev (searches);
 	}