nm: Only check PSK length if one is actually stored

This commit is contained in:
Tobias Brunner
2020-02-14 14:51:43 +01:00
parent c41419fa2e
commit ca3ff27101
+15 -7
View File
@@ -133,13 +133,21 @@ check_validity (StrongswanPluginUiWidget *self, GError **error)
case 3: case 3:
{ {
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "passwd-entry")); widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "passwd-entry"));
str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); switch (nma_utils_menu_to_secret_flags(widget))
if (str && strlen (str) < 20) { {
g_set_error (error, case NM_SETTING_SECRET_FLAG_NONE:
STRONGSWAN_PLUGIN_UI_ERROR, case NM_SETTING_SECRET_FLAG_AGENT_OWNED:
STRONGSWAN_PLUGIN_UI_ERROR_INVALID_PROPERTY, str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
"password is too short"); if (str && strlen (str) < 20) {
return FALSE; g_set_error (error,
STRONGSWAN_PLUGIN_UI_ERROR,
STRONGSWAN_PLUGIN_UI_ERROR_INVALID_PROPERTY,
"password is too short");
return FALSE;
}
break;
default:
break;
} }
} }
} }