From 1422ce0a6ac4f90158575c68d68b7658769f0b6f Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Wed, 30 Mar 2016 17:44:46 +0200 Subject: [PATCH] ifcfg-rh: don't chain up after failure of replace_and_commit() If replace_and_commit() found existing route files (and the callback has potentially already been invoked), it is wrong to chain up to parent class and continue the update. Fixes: f79d62692ec4fe5ba21bbeab26286b2a3b250fdd --- src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c index 2ee5a0b9d..b9bbf6d5b 100644 --- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c +++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c @@ -369,6 +369,7 @@ replace_and_commit (NMSettingsConnection *connection, callback (connection, error, user_data); g_clear_error (&error); } + return; } NM_SETTINGS_CONNECTION_CLASS (nm_ifcfg_connection_parent_class)->replace_and_commit (connection, new_connection, callback, user_data); -- 2.17.1