diff options
| author | Sascha Silbe <sascha-pgp@silbe.org> | 2010-07-21 17:41:18 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha-pgp@silbe.org> | 2010-07-21 17:41:18 (GMT) |
| commit | 010dcd3093c2317fca32a4cf203977bfb32b647d (patch) | |
| tree | c5751a72a0631b143f86983f8f95f16286ef6d32 | |
| parent | 07cdb12f96704d6b0581d9ddcaac76959256798d (diff) | |
Revert "Temporarily disable $XAUTHORITY processing in rainbow-sugarize."
This reverts commit a35db932075599db7c0be82128ed8403d6578c31.
be965e13 already contains a better fix and a35db93 breaks X forwarding on
some systems.
| -rwxr-xr-x | bin/rainbow-sugarize | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/rainbow-sugarize b/bin/rainbow-sugarize index ea0e312..94446d5 100755 --- a/bin/rainbow-sugarize +++ b/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')) |