Skip to content

Commit

Permalink
win32 must also use 'bind=auto' to be able to start more than one ser…
Browse files Browse the repository at this point in the history
…ver at a time (ie: proxy and shadow)

git-svn-id: https://xpra.org/svn/Xpra/trunk@27164 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Aug 15, 2020
1 parent 2d02f5d commit dd8d241
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -802,16 +802,12 @@ def bstr(b):
)
#remove build paths and user specific paths with UID ("/run/user/UID/Xpra"):
socket_dirs = get_socket_dirs()
if WIN32:
bind = "Main"
else:
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]
bind = "auto"
if POSIX and 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]
#FIXME: we should probably get these values from the default config instead
pdf, postscript = "", ""
if POSIX and printing_ENABLED:
Expand Down Expand Up @@ -842,7 +838,7 @@ def pretty_cmd(cmd):
'pulseaudio_command' : pretty_cmd(get_default_pulseaudio_command()),
'pulseaudio_configure_commands' : "\n".join(("pulseaudio-configure-commands = %s" % pretty_cmd(x)) for x in DEFAULT_PULSEAUDIO_CONFIGURE_COMMANDS),
'conf_dir' : conf_dir,
'bind' : bind,
'bind' : "auto",
'ssl_cert' : ssl_cert or "",
'ssl_key' : ssl_key or "",
'systemd_run' : get_default_systemd_run(),
Expand Down

0 comments on commit dd8d241

Please sign in to comment.