Always add SSID value to network configuration
authorMarcel Holtmann <marcel@holtmann.org>
Thu, 26 Mar 2009 23:53:30 +0000 (16:53 -0700)
committerMarcel Holtmann <marcel@holtmann.org>
Thu, 26 Mar 2009 23:53:30 +0000 (16:53 -0700)
plugins/supplicant.c

index b2763fe..4b587b8 100644 (file)
@@ -680,21 +680,17 @@ static int set_network(struct supplicant_task *task,
                        DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
                        DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
 
-       if (len > 0) {
-               if (address == NULL) {
-                       dbus_uint32_t scan_ssid = 1;
-                       connman_dbus_dict_append_variant(&dict, "scan_ssid",
+       if (address == NULL) {
+               dbus_uint32_t scan_ssid = 1;
+               connman_dbus_dict_append_variant(&dict, "scan_ssid",
                                                DBUS_TYPE_UINT32, &scan_ssid);
-               }
-
-               connman_dbus_dict_append_array(&dict, "ssid",
-                                       DBUS_TYPE_BYTE, &network, len);
-       }
-
-       if (address != NULL)
+       } else
                connman_dbus_dict_append_variant(&dict, "bssid",
                                                DBUS_TYPE_STRING, &address);
 
+       connman_dbus_dict_append_array(&dict, "ssid",
+                                       DBUS_TYPE_BYTE, &network, len);
+
        if (g_ascii_strcasecmp(security, "wpa") == 0 ||
                                g_ascii_strcasecmp(security, "wpa2") == 0) {
                const char *key_mgmt = "WPA-PSK";