From: Jouni Malinen <j@w1.fi>
Date: Sun, 5 Aug 2012 18:54:56 +0000 (+0300)
Subject: wpa_cli: Fix an issue in the cleanup of udp-remote commits
X-Git-Tag: hostap_2_0~482
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db3a03222e6ba6d6774f6c4e83bd461130ad43b5;p=thirdparty%2Fhostap.git

wpa_cli: Fix an issue in the cleanup of udp-remote commits

wpa_ctrl_get_remote_ifname() is defined only for UDP ctrl_iface socket,
so this call needs to be made conditional on build parameters.

Signed-hostap: Jouni Malinen <j@w1.fi>
---

diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
index b4ec65f7b..85fd79ca9 100644
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -3806,6 +3806,11 @@ static int edit_started = 0;
 static void start_edit(void)
 {
 	char *home;
+	char *ps = NULL;
+
+#ifdef CONFIG_CTRL_IFACE_UDP_REMOTE
+	ps = wpa_ctrl_get_remote_ifname(ctrl_conn);
+#endif /* CONFIG_CTRL_IFACE_UDP_REMOTE */
 
 	home = getenv("HOME");
 	if (home) {
@@ -3817,8 +3822,7 @@ static void start_edit(void)
 	}
 
 	if (edit_init(wpa_cli_edit_cmd_cb, wpa_cli_edit_eof_cb,
-		      wpa_cli_edit_completion_cb, NULL, hfile,
-		      wpa_ctrl_get_remote_ifname(ctrl_conn)) < 0) {
+		      wpa_cli_edit_completion_cb, NULL, hfile, ps) < 0) {
 		eloop_terminate();
 		return;
 	}