From 3d3fa8d6a0b5b2d583bf7ad625c7d28ac80a8e1a Mon Sep 17 00:00:00 2001 From: Adam Blackburn Date: Sat, 29 May 2010 17:32:38 +0800 Subject: [PATCH] Debian patch: 27-fix_resolv.conf_perms.patch --- wicd/wicd-daemon.py | 4 ++++ wicd/wnettools.py | 1 + 2 files changed, 5 insertions(+) diff --git a/wicd/wicd-daemon.py b/wicd/wicd-daemon.py index b528901..c4a28e7 100644 --- a/wicd/wicd-daemon.py +++ b/wicd/wicd-daemon.py @@ -948,12 +948,14 @@ class WicdDaemon(dbus.service.Object): os.chmod(app_conf.get_config(), 0600) os.chmod(wireless_conf, 0600) os.chmod(wired_conf, 0600) + os.chmod(dhclient_conf, 0644) # Make root own them print "chowning configuration files root:root..." os.chown(app_conf.get_config(), 0, 0) os.chown(wireless_conf, 0, 0) os.chown(wired_conf, 0, 0) + os.chown(dhclient_conf, 0, 0) print "Using wireless interface..." + self.GetWirelessInterface() print "Using wired interface..." + self.GetWiredInterface() @@ -1702,6 +1704,7 @@ def main(argv): # wicd exploded if not os.path.exists(backup_location): shutil.copy2('/etc/resolv.conf', backup_location) + os.chmod(backup_location, 0644) except IOError: print 'error backing up resolv.conf' @@ -1748,6 +1751,7 @@ def main(argv): # restore resolv.conf on quit try: shutil.move(wpath.varlib + 'resolv.conf.orig', '/etc/resolv.conf') + os.chmod('/etc/resolv.conf', 0644) except IOError: print 'error restoring resolv.conf' diff --git a/wicd/wnettools.py b/wicd/wnettools.py index 656a91e..4d6d80e 100644 --- a/wicd/wnettools.py +++ b/wicd/wnettools.py @@ -325,6 +325,7 @@ class BaseInterface(object): output_conf.close() dhclient_template.close() + os.chmod(dhclient_conf_path, 0644) if not client_name or not cmd: print "WARNING: Failed to find a valid dhcp client!"