From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 23 Jan 2017 13:52:27 +0000 (+0100)
Subject: hostapd: fix stray "out of range" shell errors in hostapd.sh
X-Git-Tag: v17.01.0-rc1~36
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b850218584c0a7bc573579b0d21d243e7ae1bf03;p=openwrt%2Fopenwrt.git

hostapd: fix stray "out of range" shell errors in hostapd.sh

The hostapd_append_wpa_key_mgmt() procedure uses the possibly uninitialized
$ieee80211r and $ieee80211w variables in a numerical comparisation, leading
to stray "netifd: radio0 (0000): sh: out of range" errors in logread when
WPA-PSK security is enabled.

Ensure that those variables are substituted with a default value in order to
avoid emitting this (harmless) shell error.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index 96b652f671..50c162efa5 100644
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=http://w1.fi/hostap.git
 PKG_SOURCE_PROTO:=git
diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index fb23e52e67..937825de11 100644
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -40,8 +40,8 @@ hostapd_append_wpa_key_mgmt() {
 	local auth_type="$(echo $auth_type | tr 'a-z' 'A-Z')"
 
 	append wpa_key_mgmt "WPA-$auth_type"
-	[ "$ieee80211r" -gt 0 ] && append wpa_key_mgmt "FT-${auth_type}"
-	[ "$ieee80211w" -gt 0 ] && append wpa_key_mgmt "WPA-${auth_type}-SHA256"
+	[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-${auth_type}"
+	[ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-${auth_type}-SHA256"
 }
 
 hostapd_add_log_config() {