#3692 ssh config overrides url

Xpra-org · Nov 25, 2022 · 3280205 · 3280205
1 parent 5563b3c
commit 3280205
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/xpra/net/ssh/paramiko_client.py b/xpra/net/ssh/paramiko_client.py
@@ -224,14 +224,12 @@ def ssh_lookup(key):
             if host_config:
                 log(f"got host config for {host!r}: {host_config}")
                 host = host_config.get("hostname", host)
-                if "username" not in display_desc:
-                    username = host_config.get("user", username)
-                if "port" not in display_desc:
-                    port = host_config.get("port", port)
-                    try:
-                        port = int(port)
-                    except (TypeError, ValueError):
-                        raise InitExit(EXIT_SSH_FAILURE, f"invalid ssh port specified: {port!r}") from None
+                username = host_config.get("user", username)
+                port = host_config.get("port", port)
+                try:
+                    port = int(port)
+                except (TypeError, ValueError):
+                    raise InitExit(EXIT_SSH_FAILURE, f"invalid ssh port specified: {port!r}") from None
                 proxycommand = host_config.get("proxycommand")
                 if proxycommand:
                     log(f"found proxycommand={proxycommand!r} for host {host!r}")