[openwrt/openwrt] hostapd: recognize option "key" as alias for "auth_secret"

LEDE Commits lede-commits at lists.infradead.org
Fri Aug 7 15:26:24 EDT 2020


jow pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/bc1c9fdc2075a5f93046be74782be024c4f3fb3f

commit bc1c9fdc2075a5f93046be74782be024c4f3fb3f
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Fri Aug 7 21:19:29 2020 +0200

    hostapd: recognize option "key" as alias for "auth_secret"
    
    The hostapd configuration logic is supposed to accept "option key" as
    legacy alias for "option auth_secret". This particular fallback option
    failed to work though because "key" was not a registered configuration
    variable.
    
    Fix this issue by registering the "key" option as well, similar to the
    existing "server" nad "port" options.
    
    Ref: https://github.com/openwrt/openwrt/pull/3282
    Suggested-by: Michael Jones <mike at meshplusplus.com>
    Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
 package/network/services/hostapd/Makefile         | 2 +-
 package/network/services/hostapd/files/hostapd.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index b3e93cb770..3aa17b4d3a 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:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_URL:=http://w1.fi/hostap.git
 PKG_SOURCE_PROTO:=git
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 5cab11022f..fe5b407bc1 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -196,7 +196,7 @@ hostapd_common_add_bss_config() {
 	config_add_int eapol_version
 
 	config_add_string 'auth_server:host' 'server:host'
-	config_add_string auth_secret
+	config_add_string auth_secret key
 	config_add_int 'auth_port:port' 'port:port'
 
 	config_add_string acct_server



More information about the lede-commits mailing list