]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
WPS: Use ifdef blocks consistently for CONFIG_WPS_REG_DISABLE_OPEN
authorAndrii Bordunov <andrew.bordunov@gmail.com>
Sat, 22 Oct 2011 19:21:53 +0000 (22:21 +0300)
committerJouni Malinen <j@w1.fi>
Sat, 22 Oct 2011 19:21:53 +0000 (22:21 +0300)
The registrar variable is used only if this macro is defined, so no
need to set it otherwise.

wpa_supplicant/wps_supplicant.c

index 3400365b5a6b0db3a152343d79e9ee35b53cac0b..ad521fd336d186ffbec0d8017b526bf604bc6c2b 100644 (file)
@@ -194,7 +194,9 @@ static int wpa_supplicant_wps_cred(void *ctx,
        struct wpa_ssid *ssid = wpa_s->current_ssid;
        u8 key_idx = 0;
        u16 auth_type;
+#ifdef CONFIG_WPS_REG_DISABLE_OPEN
        int registrar = 0;
+#endif /* CONFIG_WPS_REG_DISABLE_OPEN */
 
        if ((wpa_s->conf->wps_cred_processing == 1 ||
             wpa_s->conf->wps_cred_processing == 2) && cred->cred_attr) {
@@ -248,11 +250,13 @@ static int wpa_supplicant_wps_cred(void *ctx,
        if (ssid && (ssid->key_mgmt & WPA_KEY_MGMT_WPS)) {
                wpa_printf(MSG_DEBUG, "WPS: Replace WPS network block based "
                           "on the received credential");
+#ifdef CONFIG_WPS_REG_DISABLE_OPEN
                if (ssid->eap.identity &&
                    ssid->eap.identity_len == WSC_ID_REGISTRAR_LEN &&
                    os_memcmp(ssid->eap.identity, WSC_ID_REGISTRAR,
                              WSC_ID_REGISTRAR_LEN) == 0)
                        registrar = 1;
+#endif /* CONFIG_WPS_REG_DISABLE_OPEN */
                os_free(ssid->eap.identity);
                ssid->eap.identity = NULL;
                ssid->eap.identity_len = 0;