From 68066b40f2704ee069201cfa7f9c0f3b976e690f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
Date: Tue, 25 Feb 2014 15:52:45 +0100
Subject: [PATCH] libnm-util: fix verify_identity() in '802-1x' setting

We need to return FALSE on error, otherwise we pile GErrors and assert in
nm_setting_verify().
---
 libnm-util/nm-setting-8021x.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index 48160b9f2d..8e0511ba36 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -2362,12 +2362,14 @@ verify_identity (NMSetting8021x *self, gboolean phase2, GError **error)
 		                     NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
 		                     _("property is missing"));
 		g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_IDENTITY);
+		return FALSE;
 	} else if (!strlen (priv->identity)) {
 		g_set_error_literal (error,
 		                     NM_SETTING_802_1X_ERROR,
 		                     NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
 		                     _("property is empty"));
 		g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, NM_SETTING_802_1X_IDENTITY);
+		return FALSE;
 	}
 
 	return TRUE;