Index: server/site_wlan_connect.py |
diff --git a/server/site_wlan_connect.py b/server/site_wlan_connect.py |
index 0d4b59b89154a8318c8bb6b3be351c8605242cc5..7370a981f1bd04ebf39520e17c0b94acbfa761bb 100644 |
--- a/server/site_wlan_connect.py |
+++ b/server/site_wlan_connect.py |
@@ -157,10 +157,17 @@ def main(argv): |
if security == '802_1x': |
cert_args = psk.split(':') |
- (connection_settings['Identity'], |
- connection_settings['CertPath']) = cert_args[:2] |
- if len(cert_args) > 2: |
- connection_settings['AuthorityPath'] = cert_args[2] |
+ if cert_args[0] == 'EAP-TLS': |
+ (connection_settings['Identity'], |
+ connection_settings['CertPath']) = cert_args[1:3] |
+ if len(cert_args) > 3: |
+ connection_settings['AuthorityPath'] = cert_args[3] |
+ elif (cert_args[0] == 'EAP-PEAP' or |
+ cert_args[0] == 'EAP-TTLS'): |
+ (connection_settings['Identity'], |
+ connection_settings['Passphrase']) = cert_args[1:3] |
+ if len(cert_args) > 3: |
+ connection_settings['AuthorityPath'] = cert_args[3] |
else: |
connection_settings['Passphrase'] = psk |