gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-01-06 22:04:19 +01:00
Code Issues Projects Releases Wiki Activity

Fix bug where the daemon could crash if an encryption key was entered for a network without encryption on.

Browse Source 
Some minor code formatting changes
Replace "new" with "experimental" in description for ioctl backend.
This commit is contained in:
Dan O'Reilly
2008-12-28 16:19:18 -05:00
parent f66e8759cc
commit da54e6033b
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ import array
NAME = "ioctl" NAME = "ioctl"
UPDATE_INTERVAL = 4 UPDATE_INTERVAL = 4
DESCRIPTION = """IOCTL (new) backend DESCRIPTION = """IOCTL (experimental) backend
This backend uses IOCTL calls and python libraries to query This backend uses IOCTL calls and python libraries to query
network information whenever possible. This makes it fast, network information whenever possible. This makes it fast,

2
wicd/networking.py
View File

@@ -780,7 +780,7 @@ class WirelessConnectThread(ConnectThread):
# cards). # cards).
if self.debug: if self.debug:
print "enctype is %s" % self.network.get('enctype') print "enctype is %s" % self.network.get('enctype')
if self.network.get('key') and 'wpa' in self.network.get('enctype'): if self.network.get('key') and 'wpa' in str(self.network.get('enctype')):
self.SetStatus('generating_psk') self.SetStatus('generating_psk')
print 'Generating psk...' print 'Generating psk...'
self.network['psk'] = wiface.GeneratePSK(self.network) self.network['psk'] = wiface.GeneratePSK(self.network)

2
wicd/wicd-daemon.py
View File

@@ -104,7 +104,7 @@ class WicdDaemon(dbus.service.Object):
# This will speed up the scanning process - if a client doesn't # This will speed up the scanning process - if a client doesn't
# need a fresh scan, just feed them the old one. A fresh scan # need a fresh scan, just feed them the old one. A fresh scan
# can be done by calling Scan(fresh=True). # can be done by calling Scan(fresh=True).
self.LastScan = '' self.LastScan = []
signal.signal(signal.SIGTERM, self.DaemonClosing) signal.signal(signal.SIGTERM, self.DaemonClosing)
self.DaemonStarting() self.DaemonStarting()