From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 12 Feb 2020 13:04:45 +0000 (+0100)
Subject: nm: Only check PSK length if one is actually stored
X-Git-Tag: 5.8.3dr1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca3ff27101d8ea800f8016c478e8bd39db6c6046;p=thirdparty%2Fstrongswan.git

nm: Only check PSK length if one is actually stored
---

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;
 			}
 		}
 	}