gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-01-31 13:05:49 +01:00
Code Issues Projects Releases Wiki Activity

Actually display the error messag we get when scanning fails in the ioctl backend.

Browse Source 
Make sure we actually abort the connection attempt when authentication validation fails.
This commit is contained in:
Dan O'Reilly
2009-08-03 19:29:18 -04:00
parent 0467dd8fce
commit f3d9a3b6da
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wicd/backends/be-ioctl.py
View File

@@ -288,7 +288,7 @@ class WirelessInterface(Interface, BaseWirelessInterface):
try: try:
results = self.scan_iface.Scan() results = self.scan_iface.Scan()
except iwscan.error, e: except iwscan.error, e:
print "ERROR: %s" print "ERROR: %s" % e
return [] return []
return filter(None, [self._parse_ap(cell) for cell in results]) return filter(None, [self._parse_ap(cell) for cell in results])

3
wicd/networking.py
View File

@@ -866,7 +866,8 @@ class WirelessConnectThread(ConnectThread):
if self.network.get('enctype'): if self.network.get('enctype'):
self.SetStatus('validating_authentication') self.SetStatus('validating_authentication')
if not wiface.ValidateAuthentication(time.time()): 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') self.abort_connection('bad_pass')
# Set up gateway, IP address, and DNS servers. # Set up gateway, IP address, and DNS servers.