#1614 since we allow the user to override XDG_RUNTIME_DIR, make sure …

…we don't clobber it with values from pam git-svn-id: https://xpra.org/svn/Xpra/trunk@16669 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Aug 8, 2017 · dc7a3ee · dc7a3ee
1 parent 2a3a8e2
commit dc7a3ee
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/xpra/scripts/server.py b/src/xpra/scripts/server.py
@@ -514,6 +514,10 @@ def run_server(error_cb, opts, mode, xpra_file, extra_args, desktop_display=None
     if not xrd:
         xrd = os.environ.get("XDG_RUNTIME_DIR")
     xrd = create_runtime_dir(xrd, uid, gid)
+    if xrd:
+        #this may override the value we get from pam
+        #with the value supplied by the user:
+        protected_env["XDG_RUNTIME_DIR"] = xrd
 
     if opts.pidfile:
         write_pidfile(opts.pidfile, uid, gid)