#1244: always add "socket-dir" to "socket-dirs" so we also create soc…

…kets there

git-svn-id: https://xpra.org/svn/Xpra/trunk@15287 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/xpra/platform/dotxpra.py

@@ -34,6 +34,8 @@ def __init__(self, sockdir=None, sockdirs=[], actual_username="", uid=0, gid=0):
                 sockdir = sockdirs[0]
             else:
                 sockdir = "undefined"
+        elif sockdir not in sockdirs:
+            sockdirs.insert(0, sockdir)
         self._sockdir = self.osexpand(sockdir)
         self._sockdirs = [self.osexpand(x) for x in sockdirs]
 
@@ -52,6 +54,9 @@ def mksockdir(self, d):
     def socket_expand(self, path):
         return self.osexpand(path, uid=self.uid, gid=self.gid)
 
+    def norm_socket_paths(self, local_display_name):
+        return [norm_makepath(x, local_display_name) for x in self._sockdirs]
+
     def socket_path(self, local_display_name):
         return norm_makepath(self._sockdir, local_display_name)
 

src/xpra/scripts/server.py

@@ -529,7 +529,7 @@ def setup_local_sockets(bind, socket_dir, socket_dirs, display_name, clobber, mm
         return []
     if not socket_dir and (not socket_dirs or (len(socket_dirs)==1 and not socket_dirs[0])):
         raise InitException("at least one socket directory must be set to use unix domain sockets")
-    dotxpra = DotXpra(socket_dir or socket_dirs[0])
+    dotxpra = DotXpra(socket_dir or socket_dirs[0], socket_dirs)
     display_name = normalize_local_display_name(display_name)
     from xpra.log import Logger
     defs = []
@@ -542,10 +542,7 @@ def setup_local_sockets(bind, socket_dir, socket_dirs, display_name, clobber, mm
             if b=="none" or b=="":
                 continue
             elif b=="auto":
-                if socket_dirs:
-                    try_sockpaths = [norm_makepath(socket_dir, display_name) for socket_dir in socket_dirs]
-                else:
-                    try_sockpaths = [dotxpra.socket_path(display_name)]
+                try_sockpaths = dotxpra.norm_socket_paths(display_name)
                 log("sockpaths(%s)=%s (uid=%i, gid=%i)", display_name, try_sockpaths, getuid(), getgid())
             else:
                 sockpath = dotxpra.osexpand(b)