fix: Wireless enterprise network did not obtain password correctly

Wireless enterprise network did not obtain password correctly Log: pms: BUG-294961
linuxdeepin · Dec 16, 2024 · ad36c6f · ad36c6f
1 parent f153957
commit ad36c6f
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/net-view/operation/private/netmanagerthreadprivate.cpp b/net-view/operation/private/netmanagerthreadprivate.cpp
@@ -1079,7 +1079,18 @@ void NetManagerThreadPrivate::doGetConnectInfo(const QString &id, NetType::NetIt
             settings = con->settings();
 
             WirelessSecuritySetting::Ptr const sSetting = settings->setting(Setting::SettingType::WirelessSecurity).staticCast<WirelessSecuritySetting>();
-            sSetting->secretsFromMap(con->secrets(sSetting->name()).value().value(sSetting->name()));
+            switch (sSetting->keyMgmt()) {
+            case WirelessSecuritySetting::Unknown:
+            case WirelessSecuritySetting::WpaNone:
+                break;
+            case WirelessSecuritySetting::WpaEap: {
+                Security8021xSetting::Ptr const xSetting = settings->setting(Setting::SettingType::Security8021x).staticCast<Security8021xSetting>();
+                xSetting->secretsFromMap(con->secrets(xSetting->name()).value().value(xSetting->name()));
+            } break;
+            default:
+                sSetting->secretsFromMap(con->secrets(sSetting->name()).value().value(sSetting->name()));
+                break;
+            }
             ///////////
             QVariantMap retParam;
             const NMVariantMapMap &settingsMap = settings->toMap();