From d8018a1a18903c13ee85b144717040bcae01836b Mon Sep 17 00:00:00 2001 From: totaam Date: Thu, 23 Sep 2021 12:54:24 +0700 Subject: [PATCH] #3276 use socket-dirs value from server if the connection options don't override it --- xpra/server/server_core.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xpra/server/server_core.py b/xpra/server/server_core.py index 47d5e6df92..54512230dc 100644 --- a/xpra/server/server_core.py +++ b/xpra/server/server_core.py @@ -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: