summaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorRick Farina (Zero_Chaos) <zerochaos@gentoo.org>2018-09-19 10:43:42 -0400
committerJo-Philipp Wich <jo@mein.io>2018-09-19 16:52:04 +0200
commit3c8ac1c94d3be039c30a603082198768a82f4732 (patch)
tree4b075e31c8db339b182eabb628e56e5ab907019a /scripts
parent23941d7ef3134de9c89c363896e45a0ea4fbe45b (diff)
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)" <zerochaos@gentoo.org> [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 <jo@mein.io>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/netifd-wireless.sh2
1 files changed, 1 insertions, 1 deletions
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*)