[gnome-control-center/benzea/fix-password-validation: 1/2] network: Pass NULL password if it is not saved for a secret key

[Benjamin Berg <bberg src gnome org>]

commit 4a7326f37e9498568a3f14c0eb8c5309e677c9a8
Author: Benjamin Berg <bberg redhat com>
Date:   Thu Jan 14 17:14:22 2021 +0100

    network: Pass NULL password if it is not saved for a secret key
    
    This seems to be the right thing to do looking at the documentation for
    nma_utils_menu_to_secret_flags.

 panels/network/wireless-security/eap-method-tls.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/panels/network/wireless-security/eap-method-tls.c 
b/panels/network/wireless-security/eap-method-tls.c
index 8e3db3307..1e0d6f377 100644
--- a/panels/network/wireless-security/eap-method-tls.c
+++ b/panels/network/wireless-security/eap-method-tls.c
@@ -186,6 +186,9 @@ fill_connection (EAPMethod *method, NMConnection *connection, NMSettingSecretFla
 
        /* TLS private key */
        password = gtk_entry_get_text (self->private_key_password_entry);
+       secret_flags = nma_utils_menu_to_secret_flags (GTK_WIDGET (self->private_key_password_entry));
+       if (secret_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)
+               password = NULL;
 
        pk_filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (self->private_key_button));
        g_assert (pk_filename);
@@ -194,7 +197,6 @@ fill_connection (EAPMethod *method, NMConnection *connection, NMSettingSecretFla
                g_warning ("Couldn't read private key '%s': %s", pk_filename, error ? error->message : 
"(unknown)");
 
        /* Save 802.1X password flags to the connection */
-       secret_flags = nma_utils_menu_to_secret_flags (GTK_WIDGET (self->private_key_password_entry));
        nm_setting_set_secret_flags (NM_SETTING (s_8021x), NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD,
                                     secret_flags, NULL);