commit 2c4f80d51923a2b109b7cb165844b2c7849dc3e2
author Andrii Bordunov <andrew.bordunov@gmail.com> Sat Oct 22 22:21:53 2011 +0300
committer Jouni Malinen <j@w1.fi> Sat Oct 22 22:21:53 2011 +0300
tree e77091d5e2f4a04ad0776c11a936999bed2764e8
parent d5695081c20f93f7f5fb99b92f27dd5e762a374b

WPS: Use ifdef blocks consistently for CONFIG_WPS_REG_DISABLE_OPEN

The registrar variable is used only if this macro is defined, so no
need to set it otherwise.

wpa_supplicant/wps_supplicant.c

diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index 3400365..ad521fd 100644
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -194,7 +194,9 @@
 	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 @@
 	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;