NetworkManager r3403 - in trunk: . src/dhcp-manager

[dcbw svn gnome org]

Author: dcbw
Date: Sun Mar  9 05:15:12 2008
New Revision: 3403
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3403&view=rev

Log:
2008-03-09  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:
   trunk/ChangeLog
   trunk/src/dhcp-manager/nm-dhcp-manager.c

Modified: trunk/src/dhcp-manager/nm-dhcp-manager.c
==============================================================================
--- trunk/src/dhcp-manager/nm-dhcp-manager.c	(original)
+++ trunk/src/dhcp-manager/nm-dhcp-manager.c	Sun Mar  9 05:15:12 2008
@@ -842,7 +842,8 @@
 	guint32			ip4_broadcast = 0;
 	guint32			ip4_gateway = 0;
 	char *			hostname = NULL;
-	char *			domain_names = NULL;
+	char *			domain = NULL;
+	char *			search = NULL;
 	char *			nameservers = NULL;
 	char *			nis_domain = NULL;
 	char *			nis_servers = NULL;
@@ -915,7 +916,8 @@
 
 	hostname = g_hash_table_lookup (device->options, "new_host_name");
 	nameservers = g_hash_table_lookup (device->options, "new_domain_name_servers");
-	domain_names = g_hash_table_lookup (device->options, "new_domain_name");
+	domain = g_hash_table_lookup (device->options, "new_domain_name");
+	search = g_hash_table_lookup (device->options, "new_domain_search");
 	nis_domain = g_hash_table_lookup (device->options, "new_nis_domain");
 	nis_servers = g_hash_table_lookup (device->options, "new_nis_servers");
 	static_routes = g_hash_table_lookup (device->options, "new_static_routes");
@@ -939,14 +941,25 @@
 		nm_info ("  hostname '%s'", hostname);
 	}
 
-	if (domain_names) {
-		char **searches = g_strsplit (domain_names, " ", 0);
+	if (domain) {
+		char **domains = g_strsplit (domain, " ", 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 (search) {
+		char **searches = g_strsplit (search, " ", 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);
 	}