From fa50d01a92745a4d0ae7458d0be5e8aea3bcb277 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Thu, 23 Dec 2010 16:05:37 +0100 Subject: wifi: Zero length passphrase set to NULL Some UI give a non NULL but zero length passphrase string and wpa supplicant doesn't handle that. --- plugins/wifi.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/wifi.c b/plugins/wifi.c index 64322fdd..aed0fdce 100644 --- a/plugins/wifi.c +++ b/plugins/wifi.c @@ -554,15 +554,20 @@ static GSupplicantSecurity network_security(const char *security) static void ssid_init(GSupplicantSSID *ssid, struct connman_network *network) { - const char *security; + const char *security, *passphrase; memset(ssid, 0, sizeof(*ssid)); ssid->ssid = connman_network_get_blob(network, "WiFi.SSID", &ssid->ssid_len); security = connman_network_get_string(network, "WiFi.Security"); ssid->security = network_security(security); - ssid->passphrase = connman_network_get_string(network, - "WiFi.Passphrase"); + passphrase = connman_network_get_string(network, + "WiFi.Passphrase"); + if (strlen(passphrase) == 0) + ssid->passphrase = NULL; + else + ssid->passphrase = passphrase; + ssid->eap = connman_network_get_string(network, "WiFi.EAP"); /* -- cgit v1.2.3