From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 9 Oct 2012 16:41:28 +0000 (+0000)
Subject: hostapd: ensure that wpa_supplicant_setup_vif() returns success in cases where wpa_su... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ff1b1635401fab42d6b1df1992f95bcb779c8bfb;p=openwrt%2Fstaging%2Fyousong.git

hostapd: ensure that wpa_supplicant_setup_vif() returns success in cases where wpa_supplicant is not invoked (#11996)

SVN-Revision: 33674
---

diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh
index 5c4bd93d02..928243e425 100644
--- a/package/hostapd/files/wpa_supplicant.sh
+++ b/package/hostapd/files/wpa_supplicant.sh
@@ -191,6 +191,9 @@ network={
 	$wep_tx_keyidx
 }
 EOF
-	[ -z "$proto" -a "$key_mgmt" != "NONE" ] || \
+	if [ -n "$proto" -o "$key_mgmt" == "NONE" ]; then
 		wpa_supplicant ${bridge:+ -b $bridge} -B -P "/var/run/wifi-${ifname}.pid" -D ${driver:-wext} -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf $options
+	else
+		return 0
+	fi
 }