[tor-commits] [sandboxed-tor-browser/master] Unbreak systems that don't have a ~/.Xauthority.

yawning at torproject.org yawning at torproject.org
Mon Jun 19 12:19:42 UTC 2017


commit 07e4f45f9cf02085e9e2faccb7428927cb27b905
Author: Yawning Angel <yawning at schwanenlied.me>
Date:   Mon Jun 19 12:18:05 2017 +0000

    Unbreak systems that don't have a ~/.Xauthority.
    
    Fallout from #22648, broke on my Fedora VM that uses XWayland, works
    now.
---
 src/cmd/sandboxed-tor-browser/internal/sandbox/x11/x11.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cmd/sandboxed-tor-browser/internal/sandbox/x11/x11.go b/src/cmd/sandboxed-tor-browser/internal/sandbox/x11/x11.go
index 60e1781..908bedd 100644
--- a/src/cmd/sandboxed-tor-browser/internal/sandbox/x11/x11.go
+++ b/src/cmd/sandboxed-tor-browser/internal/sandbox/x11/x11.go
@@ -237,7 +237,8 @@ func New(display, hostname, pSock string) (*SandboxedX11, error) {
 
 	var err error
 	if x.Xauthority, err = craftAuthority(hostname, displayNum); err != nil {
-		return nil, fmt.Errorf("sandbox: Xauthority: %v", err)
+		// Some systems don't have an Xauthority file, like my Fedora VM.
+		Debugf("sandbox: Xauthority: %v", err)
 	}
 
 	return x, nil



More information about the tor-commits mailing list