fixup! wireless: set security from key_mgmt or guess

jcronenberg · Sep 27, 2024 · 27f714a · 27f714a
1 parent b222551
commit 27f714a
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/rust/migrate-wicked/src/wireless.rs b/rust/migrate-wicked/src/wireless.rs
@@ -446,34 +446,31 @@ fn guess_wireless_security_protocol(
 ) -> Result<model::SecurityProtocol, anyhow::Error> {
     let mgmt = &network.key_management;
 
-    let v = if any(mgmt, &["wpa-eap", "wpa-eap-sha256"]) {
-        Ok(model::SecurityProtocol::WPA2Enterprise)
+    let result = if any(mgmt, &["wpa-eap", "wpa-eap-sha256"]) {
+        model::SecurityProtocol::WPA2Enterprise
     } else if any(mgmt, &["wpa-eap-suite-b-192", "wpa-eap-suite-b"]) {
-        Ok(model::SecurityProtocol::WPA3Only)
+        model::SecurityProtocol::WPA3Only
     } else if any(mgmt, &["wpa-psk", "wpa-psk-sha256"]) {
-        Ok(model::SecurityProtocol::WPA2)
+        model::SecurityProtocol::WPA2
     } else if any(mgmt, &["sae", "ft-sae"]) {
-        Ok(model::SecurityProtocol::WPA3Personal)
+        model::SecurityProtocol::WPA3Personal
     } else if any(mgmt, &["owe"]) {
-        Ok(model::SecurityProtocol::OWE)
+        model::SecurityProtocol::OWE
     } else if any(mgmt, &["none"]) {
-        Ok(model::SecurityProtocol::WEP)
+        model::SecurityProtocol::WEP
     } else if network.wpa_eap.is_some() {
-        Ok(model::SecurityProtocol::WPA2Enterprise)
+        model::SecurityProtocol::WPA2Enterprise
     } else if network.wpa_psk.is_some() {
-        Ok(model::SecurityProtocol::WPA2)
+        model::SecurityProtocol::WPA2
     } else {
-        Ok(model::SecurityProtocol::WEP)
+        model::SecurityProtocol::WEP
     };
     log::warn!(
         "Unsupported key-management protocol(s) '{}' guessing '{}'",
         mgmt.join(","),
-        match v {
-            Ok(s) => s.to_string(),
-            _ => "-".to_string(),
-        }
+        result
     );
-    v
+    Ok(result)
 }
 
 fn wireless_security_protocol(network: &Network) -> Result<model::SecurityProtocol, anyhow::Error> {