[source] wpa_supplicant: Fix mesh encryption config

LEDE Commits lede-commits at lists.infradead.org
Tue Jan 10 19:20:13 PST 2017


stintel pushed a commit to source.git, branch master:
https://git.lede-project.org/593240075f8d3074164ffce99ab67a88277f9fb3

commit 593240075f8d3074164ffce99ab67a88277f9fb3
Author: Sujith Manoharan <m.sujith at gmail.com>
AuthorDate: Wed Jan 11 07:39:22 2017 +0530

    wpa_supplicant: Fix mesh encryption config
    
    wpa_supplicant allows only SAE as the key management
    type for mesh mode. The recent key_mgmt rework unconditionally
    added WPA-PSK - this breaks interface bringup and wpa_s
    throws this error message:
    
    Line 10: key_mgmt for mesh network should be open or SAE
    Line 10: failed to parse network block.
    Failed to read or parse configuration '/var/run/wpa_supplicant-wlan0.conf
    
    Fix this by making sure that only SAE is used for mesh.
    
    Signed-off-by: Sujith Manoharan <m.sujith at gmail.com>
---
 package/network/services/hostapd/files/netifd.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index a7a6a64..fb23e52 100644
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -617,7 +617,10 @@ wpa_supplicant_add_network() {
 		psk)
 			local passphrase
 
-			hostapd_append_wpa_key_mgmt
+			if [ "$_w_mode" != "mesh" ]; then
+				hostapd_append_wpa_key_mgmt
+			fi
+
 			key_mgmt="$wpa_key_mgmt"
 
 			if [ ${#key} -eq 64 ]; then



More information about the lede-commits mailing list