From 9f7149568eee442c1350e719d618ee59a526653a Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 12 Feb 2008 20:22:20 +0000 Subject: [PATCH] 2008-02-12 Dan Williams * system-settings/plugins/ifcfg-fedora/parser.c - (make_ip4_setting): bring IPv4 setting handling more up to spec git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3311 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ system-settings/plugins/ifcfg-fedora/parser.c | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d261e7ab2..2127bcb3bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-02-12 Dan Williams + + * system-settings/plugins/ifcfg-fedora/parser.c + - (make_ip4_setting): bring IPv4 setting handling more up to spec + 2008-02-12 Dan Williams * libnm-util/nm-utils.c diff --git a/system-settings/plugins/ifcfg-fedora/parser.c b/system-settings/plugins/ifcfg-fedora/parser.c index 7d8f5d201f..dd4d8d4f81 100644 --- a/system-settings/plugins/ifcfg-fedora/parser.c +++ b/system-settings/plugins/ifcfg-fedora/parser.c @@ -274,13 +274,8 @@ make_ip4_setting (shvarFile *ifcfg, GError **error) 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) {