summaryrefslogtreecommitdiffstats
path: root/ssh.c
diff options
context:
space:
mode:
authordlg@openbsd.org <dlg@openbsd.org>2023-07-04 05:59:21 +0200
committerDarren Tucker <dtucker@dtucker.net>2023-07-07 00:20:25 +0200
commit94842bfe9b09fc93189c6ed0dc9bbebc1d44a426 (patch)
treeb659dd88e1407fe5eb72650a309bf25a36a25efc /ssh.c
parentgss-serv.c: `MAXHOSTNAMELEN` -> `HOST_NAME_MAX` (diff)
downloadopenssh-94842bfe9b09fc93189c6ed0dc9bbebc1d44a426.tar.xz
openssh-94842bfe9b09fc93189c6ed0dc9bbebc1d44a426.zip
upstream: add support for unix domain sockets to ssh -W
ok djm@ dtucker@ OpenBSD-Commit-ID: 3e6d47567b895c7c28855c7bd614e106c987a6d8
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ssh.c b/ssh.c
index 6fc99d88d..83c509ccf 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.589 2023/06/21 05:08:32 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.590 2023/07/04 03:59:21 dlg Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -907,7 +907,9 @@ main(int ac, char **av)
if (muxclient_command != 0)
fatal("Cannot specify stdio forward with -O");
if (parse_forward(&fwd, optarg, 1, 0)) {
- options.stdio_forward_host = fwd.listen_host;
+ options.stdio_forward_host =
+ fwd.listen_port == PORT_STREAMLOCAL ?
+ fwd.listen_path : fwd.listen_host;
options.stdio_forward_port = fwd.listen_port;
free(fwd.connect_host);
} else {