Skip to content

Commit

Permalink
#3276 use socket-dirs value from server
Browse files Browse the repository at this point in the history
if the connection options don't override it
  • Loading branch information
totaam committed Sep 23, 2021
1 parent 590fe65 commit d8018a1
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions xpra/server/server_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -1878,6 +1878,14 @@ def make_authenticators(self, socktype, username, conn):
for auth, _, aclass, options in auth_classes:
opts = dict(options)
opts["connection"] = conn
def parse_socket_dirs(v):
if isinstance(v, (tuple, list)):
return v
#FIXME: this can never actually match ","
# because we already split connection options with it.
# We need to change the connection options parser to be smarter
return str(v).split(",")
opts["socket-dirs"] = parse_socket_dirs(opts.get("socket-dirs", self.dotxpra._sockdirs))
try:
for o in ("self", "username"):
if o in opts:
Expand Down

0 comments on commit d8018a1

Please sign in to comment.