Skip to content

Commit ad36c6f

Browse files
committed
fix: Wireless enterprise network did not obtain password correctly
Wireless enterprise network did not obtain password correctly Log: pms: BUG-294961
1 parent f153957 commit ad36c6f

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

Diff for: net-view/operation/private/netmanagerthreadprivate.cpp

+12-1
Original file line numberDiff line numberDiff line change
@@ -1079,7 +1079,18 @@ void NetManagerThreadPrivate::doGetConnectInfo(const QString &id, NetType::NetIt
10791079
settings = con->settings();
10801080

10811081
WirelessSecuritySetting::Ptr const sSetting = settings->setting(Setting::SettingType::WirelessSecurity).staticCast<WirelessSecuritySetting>();
1082-
sSetting->secretsFromMap(con->secrets(sSetting->name()).value().value(sSetting->name()));
1082+
switch (sSetting->keyMgmt()) {
1083+
case WirelessSecuritySetting::Unknown:
1084+
case WirelessSecuritySetting::WpaNone:
1085+
break;
1086+
case WirelessSecuritySetting::WpaEap: {
1087+
Security8021xSetting::Ptr const xSetting = settings->setting(Setting::SettingType::Security8021x).staticCast<Security8021xSetting>();
1088+
xSetting->secretsFromMap(con->secrets(xSetting->name()).value().value(xSetting->name()));
1089+
} break;
1090+
default:
1091+
sSetting->secretsFromMap(con->secrets(sSetting->name()).value().value(sSetting->name()));
1092+
break;
1093+
}
10831094
///////////
10841095
QVariantMap retParam;
10851096
const NMVariantMapMap &settingsMap = settings->toMap();

0 commit comments

Comments
 (0)