p
/
haven
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Handle wildcard values in Xauthority file 

Some field values in the Xauthority file have special meanings:
- a value of 65535 in the 'family' field means that the entry will
match a connection of any family on any address
- an empty string in the 'display number' field means that the entry
will match a connection on any display number

This behaviour is documented at:
https://cgit.freedesktop.org/xorg/lib/libXau/tree/AuGetBest.c#n109
This commit is contained in:
aarzilli 2016-03-21 18:50:49 +01:00 committed by Přemysl Janouch
parent becaf43dcb
commit 8d343cfd3a
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nexgb/auth.go
View File

@ -25,6 +25,7 @@ func readAuthority(hostname, display string) (
// As per /usr/include/X11/Xauth.h. // As per /usr/include/X11/Xauth.h.
const familyLocal = 256 const familyLocal = 256
const familyWild = 65535
if len(hostname) == 0 || hostname == "localhost" { if len(hostname) == 0 || hostname == "localhost" {
hostname, err = os.Hostname() hostname, err = os.Hostname()
@ -75,7 +76,10 @@ func readAuthority(hostname, display string) (
return "", nil, err return "", nil, err
} }
if family == familyLocal && addr == hostname && disp == display { addrmatch := (family == familyWild) || (family == familyLocal && addr == hostname)
dispmatch := (disp == "") || (disp == display)
if addrmatch && dispmatch {
return name0, data0, nil return name0, data0, nil
} }
} }