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

Debian patch: 27-fix_resolv.conf_perms.patch

Browse Source
This commit is contained in:
Adam Blackburn
2010-05-29 17:32:38 +08:00
parent b48c24a215
commit 3d3fa8d6a0
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wicd/wicd-daemon.py
View File

@@ -948,12 +948,14 @@ class WicdDaemon(dbus.service.Object):
os.chmod(app_conf.get_config(), 0600) os.chmod(app_conf.get_config(), 0600)
os.chmod(wireless_conf, 0600) os.chmod(wireless_conf, 0600)
os.chmod(wired_conf, 0600) os.chmod(wired_conf, 0600)
os.chmod(dhclient_conf, 0644)
# Make root own them # Make root own them
print "chowning configuration files root:root..." print "chowning configuration files root:root..."
os.chown(app_conf.get_config(), 0, 0) os.chown(app_conf.get_config(), 0, 0)
os.chown(wireless_conf, 0, 0) os.chown(wireless_conf, 0, 0)
os.chown(wired_conf, 0, 0) os.chown(wired_conf, 0, 0)
os.chown(dhclient_conf, 0, 0)
print "Using wireless interface..." + self.GetWirelessInterface() print "Using wireless interface..." + self.GetWirelessInterface()
print "Using wired interface..." + self.GetWiredInterface() print "Using wired interface..." + self.GetWiredInterface()
@@ -1702,6 +1704,7 @@ def main(argv):
# wicd exploded # wicd exploded
if not os.path.exists(backup_location): if not os.path.exists(backup_location):
shutil.copy2('/etc/resolv.conf', backup_location) shutil.copy2('/etc/resolv.conf', backup_location)
os.chmod(backup_location, 0644)
except IOError: except IOError:
print 'error backing up resolv.conf' print 'error backing up resolv.conf'
@@ -1748,6 +1751,7 @@ def main(argv):
# restore resolv.conf on quit # restore resolv.conf on quit
try: try:
shutil.move(wpath.varlib + 'resolv.conf.orig', '/etc/resolv.conf') shutil.move(wpath.varlib + 'resolv.conf.orig', '/etc/resolv.conf')
os.chmod('/etc/resolv.conf', 0644)
except IOError: except IOError:
print 'error restoring resolv.conf' print 'error restoring resolv.conf'

1
wicd/wnettools.py
View File

@@ -325,6 +325,7 @@ class BaseInterface(object):
output_conf.close() output_conf.close()
dhclient_template.close() dhclient_template.close()
os.chmod(dhclient_conf_path, 0644)
if not client_name or not cmd: if not client_name or not cmd:
print "WARNING: Failed to find a valid dhcp client!" print "WARNING: Failed to find a valid dhcp client!"