From 7f1d08cf21e97f5e60d4636bb1e6c287c34ee2df Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 7 Aug 2012 14:23:24 +0200 Subject: Imported Upstream version 0.9.5.96 --- src/settings/plugins/ifcfg-rh/writer.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/settings/plugins/ifcfg-rh/writer.c') diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c index a431a30d..26a1585b 100644 --- a/src/settings/plugins/ifcfg-rh/writer.c +++ b/src/settings/plugins/ifcfg-rh/writer.c @@ -2009,16 +2009,16 @@ write_connection (NMConnection *connection, goto out; } - s_ip4 = nm_connection_get_setting_ip4_config (connection); - if (s_ip4 || !utils_disabling_ip4_config_allowed (connection)) { + if (!utils_ignore_ip_config (connection)) { + s_ip4 = nm_connection_get_setting_ip4_config (connection); if (!write_ip4_setting (connection, ifcfg, error)) goto out; - } - s_ip6 = nm_connection_get_setting_ip6_config (connection); - if (s_ip6) { - if (!write_ip6_setting (connection, ifcfg, error)) - goto out; + s_ip6 = nm_connection_get_setting_ip6_config (connection); + if (s_ip6) { + if (!write_ip6_setting (connection, ifcfg, error)) + goto out; + } } write_connection_setting (s_con, ifcfg); -- cgit 1.3.0-6-gf8a5