From ca3ff27101d8ea800f8016c478e8bd39db6c6046 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 12 Feb 2020 14:04:45 +0100 Subject: [PATCH] nm: Only check PSK length if one is actually stored --- .../gnome/properties/nm-strongswan.c | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/frontends/gnome/properties/nm-strongswan.c b/src/frontends/gnome/properties/nm-strongswan.c index 9aeb274bd9..81c89c1d8b 100644 --- a/src/frontends/gnome/properties/nm-strongswan.c +++ b/src/frontends/gnome/properties/nm-strongswan.c @@ -133,13 +133,21 @@ check_validity (StrongswanPluginUiWidget *self, GError **error) case 3: { widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "passwd-entry")); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); - if (str && strlen (str) < 20) { - g_set_error (error, - STRONGSWAN_PLUGIN_UI_ERROR, - STRONGSWAN_PLUGIN_UI_ERROR_INVALID_PROPERTY, - "password is too short"); - return FALSE; + switch (nma_utils_menu_to_secret_flags(widget)) + { + case NM_SETTING_SECRET_FLAG_NONE: + case NM_SETTING_SECRET_FLAG_AGENT_OWNED: + str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); + if (str && strlen (str) < 20) { + g_set_error (error, + STRONGSWAN_PLUGIN_UI_ERROR, + STRONGSWAN_PLUGIN_UI_ERROR_INVALID_PROPERTY, + "password is too short"); + return FALSE; + } + break; + default: + break; } } } -- 2.47.2