Skip to content

Commit

Permalink
use socket-dirs value from server
Browse files Browse the repository at this point in the history
  • Loading branch information
totaam committed Sep 24, 2021
1 parent 952ae48 commit 6a464c4
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions xpra/server/server_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ def __init__(self):
self._socket_timeout = SERVER_SOCKET_TIMEOUT
self._ws_timeout = 5
self._socket_dir = None
self._socket_dirs = []
self.dbus_pid = 0
self.dbus_env = {}
self.dbus_control = False
Expand Down Expand Up @@ -282,6 +283,7 @@ def init(self, opts):
self._socket_dir = opts.socket_dir or ""
if not self._socket_dir and opts.socket_dirs:
self._socket_dir = opts.socket_dirs[0]
self._socket_dirs = opts.socket_dirs
self.encryption = opts.encryption
self.encryption_keyfile = opts.encryption_keyfile
self.tcp_encryption = opts.tcp_encryption
Expand Down Expand Up @@ -1643,6 +1645,11 @@ def make_authenticators(self, socktype, username, conn):
auth, aclass, options = auth_class
opts = dict(options)
opts["connection"] = conn
def parse_socket_dirs(v):
if isinstance(v, (tuple, list)):
return v
return str(v).split(",")
opts["socket-dirs"] = parse_socket_dirs(opts.get("socket-dirs", self._socket_dirs))
authenticator = aclass(username, **opts)
authlog("authenticator %i: %s(%s, %s)=%s", i, auth, username, opts, authenticator)
authenticators.append(authenticator)
Expand Down

0 comments on commit 6a464c4

Please sign in to comment.