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

[dcbw svn gnome org]

Author: dcbw
Date: Tue Feb 12 20:22:20 2008
New Revision: 3311
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3311&view=rev

Log:
2008-02-12  Dan Williams  <dcbw redhat com>

	* system-settings/plugins/ifcfg-fedora/parser.c
		- (make_ip4_setting): bring IPv4 setting handling more up to spec



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

Modified: trunk/system-settings/plugins/ifcfg-fedora/parser.c
==============================================================================
--- trunk/system-settings/plugins/ifcfg-fedora/parser.c	(original)
+++ trunk/system-settings/plugins/ifcfg-fedora/parser.c	Tue Feb 12 20:22:20 2008
@@ -274,13 +274,8 @@
 	char *dir;
 
 	value = svGetValue (ifcfg, "BOOTPROTO");
-	if (!value)
-		return NULL;
-
-	if (!strcmp (value, "bootp") || !strcmp (value, "dhcp")) {
+	if (value && (!strcmp (value, "bootp") || !strcmp (value, "dhcp")))
 		manual = FALSE;
-		return NULL;
-	}
 
 	value = svGetValue (ifcfg, "IPADDR");
 	if (value) {