From: Rick Farina (Zero_Chaos) Date: Wed, 19 Sep 2018 14:43:42 +0000 (-0400) Subject: netifd: fix wpa mixed mode matching X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3c8ac1c;p=oweals%2Fnetifd.git netifd: fix wpa mixed mode matching Change wpa mixed mode matching to not accidently catch wep+mixed. All documented cases have the character between {wpa,psk} and mixed as a '-' but no need to break things which were working, so preserve the * case. Reported-by: "Rick Farina (Zero_Chaos)" [Allow "psk-mixed" to be prefixed, to align with the *psk2* and *psk* cases, slightly reword subject and commit message.] Signed-off-by: Jo-Philipp Wich --- diff --git a/scripts/netifd-wireless.sh b/scripts/netifd-wireless.sh index 8816bff..45f84fe 100644 --- a/scripts/netifd-wireless.sh +++ b/scripts/netifd-wireless.sh @@ -214,7 +214,7 @@ wireless_vif_parse_encryption() { wpa2*|*psk2*) wpa=2 ;; - *mixed*) + wpa*mixed*|psk*mixed*) wpa=3 ;; wpa*|*psk*)