From 6ada36957c3188099bcde984fea41549dee26842 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 3 Oct 2017 13:56:30 +0200 Subject: [PATCH] Do not ask for raw password in case of 802-1x security setting --- libs/editor/connectioneditorbase.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/editor/connectioneditorbase.cpp b/libs/editor/connectioneditorbase.cpp index e7e74b55..6e423a53 100644 --- a/libs/editor/connectioneditorbase.cpp +++ b/libs/editor/connectioneditorbase.cpp @@ -368,6 +368,10 @@ void ConnectionEditorBase::initialize() requiredSecrets = securitySetting->needSecrets(); setting = securitySetting->toMap(); settingName = QLatin1String("802-1x"); + + if (requiredSecrets.contains(NM_SETTING_802_1X_PASSWORD_RAW)) { + requiredSecrets.removeAll(NM_SETTING_802_1X_PASSWORD_RAW); + } } } else { if (!wifiSecuritySetting->needSecrets().isEmpty()) { @@ -388,8 +392,7 @@ void ConnectionEditorBase::initialize() Q_FOREACH (const QString &secret, requiredSecrets) { if (setting.contains(secret + QLatin1String("-flags"))) { NetworkManager::Setting::SecretFlagType secretFlag = (NetworkManager::Setting::SecretFlagType)setting.value(secret + QLatin1String("-flags")).toInt(); - if (secretFlag == NetworkManager::Setting::None || - secretFlag == NetworkManager::Setting::AgentOwned) { + if (secretFlag == NetworkManager::Setting::None || secretFlag == NetworkManager::Setting::AgentOwned) { requestSecrets = true; } } else { -- GitLab