summaryrefslogtreecommitdiffstats
path: root/channels.c
diff options
context:
space:
mode:
authordlg@openbsd.org <dlg@openbsd.org>2023-07-04 03:59:21 +0000
committerDarren Tucker <dtucker@dtucker.net>2023-07-07 08:20:25 +1000
commit94842bfe9b09fc93189c6ed0dc9bbebc1d44a426 (patch)
treeb659dd88e1407fe5eb72650a309bf25a36a25efc /channels.c
parenta95fc5eed09a0238fb127b6c50e8498432b79dae (diff)
upstream: add support for unix domain sockets to ssh -W
ok djm@ dtucker@ OpenBSD-Commit-ID: 3e6d47567b895c7c28855c7bd614e106c987a6d8
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/channels.c b/channels.c
index f2c873d7..da66b7b3 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.431 2023/06/05 13:24:36 millert Exp $ */
+/* $OpenBSD: channels.c,v 1.432 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
@@ -1634,7 +1634,7 @@ channel_decode_socks5(Channel *c, struct sshbuf *input, struct sshbuf *output)
Channel *
channel_connect_stdio_fwd(struct ssh *ssh,
- const char *host_to_connect, u_short port_to_connect,
+ const char *host_to_connect, int port_to_connect,
int in, int out, int nonblock)
{
Channel *c;
@@ -1651,7 +1651,8 @@ channel_connect_stdio_fwd(struct ssh *ssh,
c->force_drain = 1;
channel_register_fds(ssh, c, in, out, -1, 0, 1, 0);
- port_open_helper(ssh, c, "direct-tcpip");
+ port_open_helper(ssh, c, port_to_connect == PORT_STREAMLOCAL ?
+ "direct-streamlocal@openssh.com" : "direct-tcpip");
return c;
}