Actually display the error messag we get when scanning fails in the ioctl backend.
Make sure we actually abort the connection attempt when authentication validation fails.
This commit is contained in:
1 parent
0467dd8fce
commit
f3d9a3b6da
2 files changed
+3
-2
No files matched your search
@@ -288,7 +288,7 @@ class WirelessInterface(Interface, BaseWirelessInterface):
|
||||
try:
|
||||
results = self.scan_iface.Scan()
|
||||
except iwscan.error, e:
|
||||
print "ERROR: %s"
|
||||
print "ERROR: %s" % e
|
||||
return []
|
||||
return filter(None, [self._parse_ap(cell) for cell in results])
|
||||
|
||||
|
||||
+2
-1
@@ -866,7 +866,8 @@ class WirelessConnectThread(ConnectThread):
|
||||
if self.network.get('enctype'):
|
||||
self.SetStatus('validating_authentication')
|
||||
if not wiface.ValidateAuthentication(time.time()):
|
||||
if not self.connect_result:
|
||||
print "connect result is %s" % self.connect_result
|
||||
if not self.connect_result or self.connect_result == 'Failed':
|
||||
self.abort_connection('bad_pass')
|
||||
|
||||
# Set up gateway, IP address, and DNS servers.
|
||||
|
||||
Reference in new issue
Block a user