#3778 don't specify a default username

Xpra-org · Jul 12, 2023 · b4b7432 · b4b7432
1 parent 209dace
commit b4b7432
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/xpra/client/base/client_base.py b/xpra/client/base/client_base.py
@@ -424,9 +424,11 @@ def make_hello_base(self) -> Dict[str,Any]:
                 if digest not in digests:
                     digests.append(digest)
         capabilities.update(FilePrintMixin.get_caps(self))
+        if self.username:
+            #set for authentication:
+            capabilities["username"] = self.username
         capabilities.update({
                 "uuid"                  : self.uuid,
-                "username"              : self.username,    #for authentication
                 "compression_level"     : self.compression_level,
                 "version"               : vparts(XPRA_VERSION, FULL_INFO+1),
                 "packet-types"          : tuple(self._aliases.values()),

diff --git a/xpra/scripts/config.py b/xpra/scripts/config.py
@@ -906,11 +906,6 @@ def get_defaults():
         get_download_dir, get_remote_run_xpra_scripts,
         get_sessions_dir, get_socket_dirs, get_client_socket_dirs,
         )
-    try:
-        from xpra.platform.info import get_username
-        username = get_username()
-    except Exception:
-        username = ""
     conf_dirs = [os.environ.get("XPRA_CONF_DIR")]
     build_root = os.environ.get("RPM_BUILD_ROOT")
     if build_root:
@@ -951,7 +946,7 @@ def get_defaults():
     GLOBAL_DEFAULTS = {
                     "encoding"          : "auto",
                     "title"             : "@title@ on @hostinfo@",
-                    "username"          : username,
+                    "username"          : "",
                     "password"          : "",
                     "wm-name"           : DEFAULT_NET_WM_NAME,
                     "session-name"      : "",