From 2e2f56697fd4c0d285eea277ebab3a8f883eaccd Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 24 Feb 2016 13:13:09 +0100 Subject: [PATCH] ifcfg-rh: short circuit the IP configuration parsing on IPv4LL We need the other keys, such as may_fail, too. --- src/settings/plugins/ifcfg-rh/reader.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c index 5d4375cc09..c8871a55a8 100644 --- a/src/settings/plugins/ifcfg-rh/reader.c +++ b/src/settings/plugins/ifcfg-rh/reader.c @@ -973,12 +973,7 @@ make_ip4_setting (shvarFile *ifcfg, else method = NM_SETTING_IP4_CONFIG_METHOD_DISABLED; } else if (!g_ascii_strcasecmp (value, "autoip")) { - g_free (value); - g_object_set (s_ip4, - NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL, - NM_SETTING_IP_CONFIG_NEVER_DEFAULT, never_default, - NULL); - return NM_SETTING (s_ip4); + method = NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL; } else if (!g_ascii_strcasecmp (value, "shared")) { int idx;