Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Stone <michael@laptop.org>2009-07-08 03:03:39 (GMT)
committer Michael Stone <michael@laptop.org>2009-07-08 03:03:39 (GMT)
commita35db932075599db7c0be82128ed8403d6578c31 (patch)
treee68e4cfcacd8f2da8bdce15c65a88aec0b338a16
parent8f3515ede75318baad458c316c21acfb7c9f0f62 (diff)
Temporarily disable $XAUTHORITY processing in rainbow-sugarize.
-rwxr-xr-xrainbow/bin/rainbow-sugarize10
1 files changed, 5 insertions, 5 deletions
diff --git a/rainbow/bin/rainbow-sugarize b/rainbow/bin/rainbow-sugarize
index 4287339..33d2e09 100755
--- a/rainbow/bin/rainbow-sugarize
+++ b/rainbow/bin/rainbow-sugarize
@@ -51,14 +51,14 @@ def main():
# We want to use xauth generate $DISPLAY . untrusted, but we don't have
# XSECURITY enabled. <MS>
- environ.setdefault('XAUTHORITY', join(h_o, '.Xauthority'))
+ #environ.setdefault('XAUTHORITY', join(h_o, '.Xauthority'))
environ.setdefault('ICEAUTHORITY', join(h_o, '.ICEauthority'))
x_cookie_path = join(h_i, '.Xauthority')
make_dirs(dirname(x_cookie_path), getuid(), getgid(), 0777)
- copyfile(environ['XAUTHORITY'], x_cookie_path)
- chmod(x_cookie_path, 0666)
- chown(x_cookie_path, o.pw_uid, i.pw_gid)
+ #copyfile(environ['XAUTHORITY'], x_cookie_path)
+ #chmod(x_cookie_path, 0666)
+ #chown(x_cookie_path, o.pw_uid, i.pw_gid)
ice_cookie_path = join(h_i, '.ICEauthority')
make_dirs(dirname(ice_cookie_path), getuid(), getgid(), 0777)
@@ -74,7 +74,7 @@ def main():
write_envvar('USER', i.pw_name)
write_envvar('HOME', h_i)
- write_envvar('XAUTHORITY', x_cookie_path)
+ #write_envvar('XAUTHORITY', x_cookie_path)
write_envvar('ICEAUTHORITY', ice_cookie_path)
write_envvar('SUGAR_ACTIVITY_ROOT', h_i)
write_envvar('TMPDIR', join(h_i, 'tmp'))