]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
Clear wpa_psk/passphrase when the other option is configured
authorShan Palanisamy <shanp@qca.qualcomm.com>
Thu, 16 Feb 2012 17:32:48 +0000 (19:32 +0200)
committerJouni Malinen <j@w1.fi>
Thu, 16 Feb 2012 17:32:48 +0000 (19:32 +0200)
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

hostapd/config_file.c

index 78f1e3d0b8b7e8f0e280c5fd20ce4ba0cb708cb9..818c10b8ea7e9f2c9b4434524eb6bb1080410981 100644 (file)
@@ -1605,6 +1605,8 @@ struct hostapd_config * hostapd_config_read(const char *fname)
                        } else {
                                os_free(bss->ssid.wpa_passphrase);
                                bss->ssid.wpa_passphrase = os_strdup(pos);
+                               os_free(bss->ssid.wpa_psk);
+                               bss->ssid.wpa_psk = NULL;
                        }
                } else if (os_strcmp(buf, "wpa_psk") == 0) {
                        os_free(bss->ssid.wpa_psk);
@@ -1620,6 +1622,8 @@ struct hostapd_config * hostapd_config_read(const char *fname)
                                errors++;
                        } else {
                                bss->ssid.wpa_psk->group = 1;
+                               os_free(bss->ssid.wpa_passphrase);
+                               bss->ssid.wpa_passphrase = NULL;
                        }
                } else if (os_strcmp(buf, "wpa_psk_file") == 0) {
                        os_free(bss->ssid.wpa_psk_file);