Skip to content

Commit

Permalink
remove any "socket-dir" paths containing the uid: osx uses /var/tmp/$…
Browse files Browse the repository at this point in the history
…UID-Xpra, but this should not be included in the default config for all users! (the buildbot's uid!)

git-svn-id: https://xpra.org/svn/Xpra/trunk@11713 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Jan 21, 2016
1 parent 5de9756 commit c7b8795
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,12 @@ def bstr(b):
from xpra.platform.paths import get_socket_dirs, get_default_log_dir
#remove build paths and user specific paths with UID ("/run/user/UID/Xpra"):
socket_dirs = get_socket_dirs()
if os.getuid()>0:
#remove any paths containing the uid,
#osx uses /var/tmp/$UID-Xpra,
#but this should not be included in the default config for all users!
#(the buildbot's uid!)
socket_dirs = [x for x in socket_dirs if x.find(str(os.getuid()))<0]
if WIN32:
bind = ""
else:
Expand Down

0 comments on commit c7b8795

Please sign in to comment.