From 07b966026382543b81a9c5d6e8c9787d4952f185 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 23 Feb 2011 19:36:17 -0600
Subject: [PATCH] libnm-util: simplify nm_setting_update_secrets()

Don't touch tmp_error after we've freed it; it's not actually
a problem since we're not dereferencing tmp_error, but it's
cleaner this way.
---
 libnm-util/nm-setting.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c
index b623767aaf..0f8b7d4f24 100644
--- a/libnm-util/nm-setting.c
+++ b/libnm-util/nm-setting.c
@@ -692,11 +692,11 @@ nm_setting_update_secrets (NMSetting *setting, GHashTable *secrets, GError **err
 		NM_SETTING_GET_CLASS (setting)->update_one_secret (setting, secret_key, secret_value, &tmp_error);
 		if (tmp_error) {
 			g_propagate_error (error, tmp_error);
-			break;
+			return FALSE;
 		}
 	}
 
-	return tmp_error ? FALSE : TRUE;
+	return TRUE;
 }
 
 static gboolean