summaryrefslogtreecommitdiff
path: root/libnm-util/nm-setting-8021x.c
diff options
context:
space:
mode:
authorJiří Klimeš <jklimes@redhat.com>2014-02-25 15:52:45 +0100
committerJiří Klimeš <jklimes@redhat.com>2014-02-25 15:57:54 +0100
commit68066b40f2704ee069201cfa7f9c0f3b976e690f (patch)
tree03c139db6220e4c8fc636253c9b072192257d926 /libnm-util/nm-setting-8021x.c
parent4141e69b3a368f5b450fbc99a37557f77ef2fd08 (diff)
downloadNetworkManager-68066b40f2704ee069201cfa7f9c0f3b976e690f.tar.gz
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().
Diffstat (limited to 'libnm-util/nm-setting-8021x.c')
-rw-r--r--libnm-util/nm-setting-8021x.c2
1 files changed, 2 insertions, 0 deletions
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;