Merge remote-tracking branch 'ms/wifi-fixes'

diff --git a/doc/language_issues.de b/doc/language_issues.de
index aae7ca565c736b48591a78538c41ceaff10b4190..5d079036a06c5eeac39e6d8182ca565db6009b21 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -889,6 +889,7 @@ WARNING: untranslated string: smb daemon = SMB Daemon
 WARNING: untranslated string: user management = User Management
 WARNING: untranslated string: winbind daemon = Winbind Daemon
 WARNING: untranslated string: wlan client encryption wpa3 = WPA3
+WARNING: untranslated string: wlan client management frame protection = Management Frame Protection
 WARNING: untranslated string: wlanap 802.11w disabled = Disabled
 WARNING: untranslated string: wlanap 802.11w enforced = Enforced
 WARNING: untranslated string: wlanap 802.11w optional = Optional

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 434115902592f0be8f43e68e898a40bf35d2a60e..6e30eb9957a1f1ea6c1f7b4cec86fe4c4e3a5dee 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -2132,6 +2132,7 @@ WARNING: untranslated string: wlan client group cipher = Group cipher
 WARNING: untranslated string: wlan client group key algorithm = GKA
 WARNING: untranslated string: wlan client identity = Identity
 WARNING: untranslated string: wlan client invalid key length = Invalid key length.
+WARNING: untranslated string: wlan client management frame protection = Management Frame Protection
 WARNING: untranslated string: wlan client method = Method
 WARNING: untranslated string: wlan client new entry = Create new wireless client configuration
 WARNING: untranslated string: wlan client new network = New network

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 2feec8924316ccd3bb3f8b1b79ad9eb9b953fd05..82d65d99c2d05745888593d14db508879e4688ac 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1509,6 +1509,7 @@ WARNING: untranslated string: wlan client group cipher = Group cipher
 WARNING: untranslated string: wlan client group key algorithm = GKA
 WARNING: untranslated string: wlan client identity = Identity
 WARNING: untranslated string: wlan client invalid key length = Invalid key length.
+WARNING: untranslated string: wlan client management frame protection = Management Frame Protection
 WARNING: untranslated string: wlan client method = Method
 WARNING: untranslated string: wlan client new entry = Create new wireless client configuration
 WARNING: untranslated string: wlan client new network = New network

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 835352cf560bf1372240b7e29ce6d701e0b5d1b7..942be73ecd86a7ff3d99816f8fc3ce032542ba49 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -919,3 +919,4 @@ WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: token = Token:
 WARNING: untranslated string: token not set = No Token has been given.
 WARNING: untranslated string: wlan client encryption wpa3 = WPA3
+WARNING: untranslated string: wlan client management frame protection = Management Frame Protection

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 152ce47865d13e519a2d77965d618651ea8adf73..98074e59f28700d9dd2fad0e8a01a4e4885641e6 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1197,6 +1197,7 @@ WARNING: untranslated string: wlan client eap state = EAP Status
 WARNING: untranslated string: wlan client encryption eap = EAP
 WARNING: untranslated string: wlan client encryption wpa3 = WPA3
 WARNING: untranslated string: wlan client identity = Identity
+WARNING: untranslated string: wlan client management frame protection = Management Frame Protection
 WARNING: untranslated string: wlan client method = Method
 WARNING: untranslated string: wlan client password = Password
 WARNING: untranslated string: wlan client tls cipher = TLS Cipher

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 683c08f44c7fcd99b39a3e71c8b990a05b3cee77..8eebbd57f3d605c87c33a19b87693396bb982cde 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1237,6 +1237,7 @@ WARNING: untranslated string: wlan client eap state = EAP Status
 WARNING: untranslated string: wlan client encryption eap = EAP
 WARNING: untranslated string: wlan client encryption wpa3 = WPA3
 WARNING: untranslated string: wlan client identity = Identity
+WARNING: untranslated string: wlan client management frame protection = Management Frame Protection
 WARNING: untranslated string: wlan client method = Method
 WARNING: untranslated string: wlan client password = Password
 WARNING: untranslated string: wlan client tls cipher = TLS Cipher

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 2feec8924316ccd3bb3f8b1b79ad9eb9b953fd05..82d65d99c2d05745888593d14db508879e4688ac 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1509,6 +1509,7 @@ WARNING: untranslated string: wlan client group cipher = Group cipher
 WARNING: untranslated string: wlan client group key algorithm = GKA
 WARNING: untranslated string: wlan client identity = Identity
 WARNING: untranslated string: wlan client invalid key length = Invalid key length.
+WARNING: untranslated string: wlan client management frame protection = Management Frame Protection
 WARNING: untranslated string: wlan client method = Method
 WARNING: untranslated string: wlan client new entry = Create new wireless client configuration
 WARNING: untranslated string: wlan client new network = New network

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index cbd25d176a2d50802c6ab42441d8e3f7b3f119ad..43c1f8c088c1c1690903a422aceef636757a179b 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1502,6 +1502,7 @@ WARNING: untranslated string: wlan client group cipher = Group cipher
 WARNING: untranslated string: wlan client group key algorithm = GKA
 WARNING: untranslated string: wlan client identity = Identity
 WARNING: untranslated string: wlan client invalid key length = Invalid key length.
+WARNING: untranslated string: wlan client management frame protection = Management Frame Protection
 WARNING: untranslated string: wlan client method = Method
 WARNING: untranslated string: wlan client new entry = Create new wireless client configuration
 WARNING: untranslated string: wlan client new network = New network

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index e4c25f931d8e575a209c462dd8a35f1e0c1b3aa5..439a588906aa6f26b5ead3dbb0395c44209da1c6 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1067,6 +1067,7 @@ WARNING: untranslated string: vulnerable = Vulnerable
 WARNING: untranslated string: whois results from = WHOIS results from
 WARNING: untranslated string: winbind daemon = Winbind Daemon
 WARNING: untranslated string: wlan client encryption wpa3 = WPA3
+WARNING: untranslated string: wlan client management frame protection = Management Frame Protection
 WARNING: untranslated string: wlanap 802.11w disabled = Disabled
 WARNING: untranslated string: wlanap 802.11w enforced = Enforced
 WARNING: untranslated string: wlanap 802.11w optional = Optional

diff --git a/doc/language_missings b/doc/language_missings
index 1956eac48737e537ec6e400167c7ab3b66ed611c..0d89426ca9e3f1de56fc31d0fb8fa567bc5f1ab2 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -65,6 +65,7 @@
 < wlanap 802.11w enforced
 < wlanap 802.11w optional
 < wlan client encryption wpa3
+< wlan client management frame protection
 ############################################################################
 # Checking cgi-bin translations for language: es                           #
 ############################################################################
@@ -927,6 +928,7 @@
 < wlan client group key algorithm
 < wlan client identity
 < wlan client invalid key length
+< wlan client management frame protection
 < wlan client method
 < wlan client new entry
 < wlan client new network
@@ -974,6 +976,7 @@
 < token not set
 < upload fcdsl.o
 < wlan client encryption wpa3
+< wlan client management frame protection
 ############################################################################
 # Checking cgi-bin translations for language: it                           #
 ############################################################################
@@ -1339,6 +1342,7 @@
 < wlan client encryption eap
 < wlan client encryption wpa3
 < wlan client identity
+< wlan client management frame protection
 < wlan client method
 < wlan client password
 < wlan client tls cipher
@@ -1777,6 +1781,7 @@
 < wlan client encryption eap
 < wlan client encryption wpa3
 < wlan client identity
+< wlan client management frame protection
 < wlan client method
 < wlan client password
 < wlan client tls cipher
@@ -2643,6 +2648,7 @@
 < wlan client group key algorithm
 < wlan client identity
 < wlan client invalid key length
+< wlan client management frame protection
 < wlan client method
 < wlan client new entry
 < wlan client new network
@@ -3529,6 +3535,7 @@
 < wlan client group key algorithm
 < wlan client identity
 < wlan client invalid key length
+< wlan client management frame protection
 < wlan client method
 < wlan client new entry
 < wlan client new network
@@ -3738,6 +3745,7 @@
 < wlanap neighbor scan warning
 < wlanap ssid
 < wlan client encryption wpa3
+< wlan client management frame protection
 < working
 < zoneconf access native
 < zoneconf access none

diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi
index e8c3c96284fab93e5da85cf8d2e5d5c72f6d70c0..d8637ccd2aec092dccf1debbb7653470730f15e7 100644 (file)
--- a/html/cgi-bin/wirelessclient.cgi
+++ b/html/cgi-bin/wirelessclient.cgi
@@ -324,6 +324,8 @@ END
                        $encryption_mode = $Lang::tr{'wlan client encryption wpa'};
                } elsif ($config[3] eq "WPA2") {
                        $encryption_mode = $Lang::tr{'wlan client encryption wpa2'};
+               } elsif ($config[3] eq "WPA3") {
+                       $encryption_mode = $Lang::tr{'wlan client encryption wpa3'};
                } elsif ($config[3] eq "EAP") {
                        $encryption_mode = $Lang::tr{'wlan client encryption eap'};
                }
@@ -682,6 +684,19 @@ sub ShowStatus() {
                                </tr>
 END
 
+               if ($status{'pmf'} eq "1") {
+                       print <<END;
+                               <tr>
+                                       <td width='20%'>
+                                               $Lang::tr{'wlan client management frame protection'}
+                                       </td>
+                                       <td width='80%'>
+                                               $Lang::tr{'active'}
+                                       </td>
+                               </tr>
+END
+               }
+
                if ($status{'EAP state'}) {
                        my $selected_method = $status{'selectedMethod'};
                        $selected_method =~ s/\d+ \((.*)\)/$1/e;
@@ -736,12 +751,25 @@ END
                }
 
                if (($status{'pairwise_cipher'} ne "NONE") || ($status{'group_cipher'} ne "NONE")) {
-                       print <<END;
+                       if ($status{'key_mgmt'} eq "SAE") {
+                               print <<END;
+                               <tr>
+                                       <td colspan='2'>
+                                               <strong>$Lang::tr{'wlan client encryption wpa3'}</strong>
+                                       </td>
+                               </tr>
+END
+                       } else {
+                               print <<END;
                                <tr>
                                        <td colspan='2'>
                                                <strong>$Lang::tr{'wlan client encryption wpa'}</strong>
                                        </td>
                                </tr>
+END
+                       }
+
+                       print <<END;
                                <tr>
                                        <td width='20%'>
                                                $Lang::tr{'wlan client pairwise cipher'}

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 22e8a4cc68a0f73ba70a4e6b76159a24cad1c125..95a1cfda4080674ad1083aac637731658dbfcf33 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2956,6 +2956,7 @@
 'wlan client group key algorithm' => 'GKA',
 'wlan client identity' => 'Identity',
 'wlan client invalid key length' => 'Invalid key length.',
+'wlan client management frame protection' => 'Management Frame Protection',
 'wlan client method' => 'Method',
 'wlan client new entry' => 'Create new wireless client configuration',
 'wlan client new network' => 'New network',

diff --git a/src/initscripts/system/wlanclient b/src/initscripts/system/wlanclient
index 4b3938b46678800e57ebd40c8c9d2f6d3a9f60ec..338a743ab72e4ad69efcb4780116d8d71e1807cc 100644 (file)
--- a/src/initscripts/system/wlanclient
+++ b/src/initscripts/system/wlanclient
@@ -275,9 +275,7 @@ function wpa_supplicant_start() {
        # Build wpa_supplicant command line.
        local wpa_suppl_cmd="wpa_supplicant -B -qqq -i${device} -c${config}"
 
-       if device_is_wireless ${device}; then
-               wpa_suppl_cmd="${wpa_suppl_cmd} -Dwext"
-       else
+       if ! device_is_wireless ${device}; then
                wpa_suppl_cmd="${wpa_suppl_cmd} -Dwired"
        fi