Commit 6ada3695 authored by Jan Grulich's avatar Jan Grulich

Do not ask for raw password in case of 802-1x security setting

parent 5f74abd4
...@@ -368,6 +368,10 @@ void ConnectionEditorBase::initialize() ...@@ -368,6 +368,10 @@ void ConnectionEditorBase::initialize()
requiredSecrets = securitySetting->needSecrets(); requiredSecrets = securitySetting->needSecrets();
setting = securitySetting->toMap(); setting = securitySetting->toMap();
settingName = QLatin1String("802-1x"); settingName = QLatin1String("802-1x");
if (requiredSecrets.contains(NM_SETTING_802_1X_PASSWORD_RAW)) {
requiredSecrets.removeAll(NM_SETTING_802_1X_PASSWORD_RAW);
}
} }
} else { } else {
if (!wifiSecuritySetting->needSecrets().isEmpty()) { if (!wifiSecuritySetting->needSecrets().isEmpty()) {
...@@ -388,8 +392,7 @@ void ConnectionEditorBase::initialize() ...@@ -388,8 +392,7 @@ void ConnectionEditorBase::initialize()
Q_FOREACH (const QString &secret, requiredSecrets) { Q_FOREACH (const QString &secret, requiredSecrets) {
if (setting.contains(secret + QLatin1String("-flags"))) { if (setting.contains(secret + QLatin1String("-flags"))) {
NetworkManager::Setting::SecretFlagType secretFlag = (NetworkManager::Setting::SecretFlagType)setting.value(secret + QLatin1String("-flags")).toInt(); NetworkManager::Setting::SecretFlagType secretFlag = (NetworkManager::Setting::SecretFlagType)setting.value(secret + QLatin1String("-flags")).toInt();
if (secretFlag == NetworkManager::Setting::None || if (secretFlag == NetworkManager::Setting::None || secretFlag == NetworkManager::Setting::AgentOwned) {
secretFlag == NetworkManager::Setting::AgentOwned) {
requestSecrets = true; requestSecrets = true;
} }
} else { } else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment