NetworkManager r4022 - in trunk: . system-settings/plugins/ifcfg-fedora

[dcbw svn gnome org]

Author: dcbw
Date: Wed Aug 27 19:43:15 2008
New Revision: 4022
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4022&view=rev

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

	* system-settings/plugins/ifcfg-fedora/reader.c
		- (make_ip4_setting): use DOMAIN not SEARCH (rh #459370)



Modified:
   trunk/ChangeLog
   trunk/system-settings/plugins/ifcfg-fedora/reader.c

Modified: trunk/system-settings/plugins/ifcfg-fedora/reader.c
==============================================================================
--- trunk/system-settings/plugins/ifcfg-fedora/reader.c	(original)
+++ trunk/system-settings/plugins/ifcfg-fedora/reader.c	Wed Aug 27 19:43:15 2008
@@ -269,7 +269,7 @@
 	}
 
 	/* DNS searches */
-	value = svGetValue (ifcfg, "SEARCH");
+	value = svGetValue (ifcfg, "DOMAIN");
 	if (value) {
 		char **searches = NULL;
 
@@ -283,6 +283,23 @@
 		g_free (value);
 	}
 
+	/* Legacy value NM used for a while but is incorrect (rh #459370) */
+	if (!g_slist_length (s_ip4->dns_search)) {
+		value = svGetValue (ifcfg, "SEARCH");
+		if (value) {
+			char **searches = NULL;
+
+			searches = g_strsplit (value, " ", 0);
+			if (searches) {
+				char **item;
+				for (item = searches; *item; item++)
+					s_ip4->dns_search = g_slist_append (s_ip4->dns_search, *item);
+				g_free (searches);
+			}
+			g_free (value);
+		}
+	}
+
 	return NM_SETTING (s_ip4);
 
 error: