diff options
Diffstat (limited to 'mux.c')
-rw-r--r-- | mux.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: mux.c,v 1.59 2016/04/01 02:34:10 djm Exp $ */ | 1 | /* $OpenBSD: mux.c,v 1.60 2016/06/03 03:14:41 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -88,8 +88,6 @@ extern char *host; | |||
88 | extern int subsystem_flag; | 88 | extern int subsystem_flag; |
89 | extern Buffer command; | 89 | extern Buffer command; |
90 | extern volatile sig_atomic_t quit_pending; | 90 | extern volatile sig_atomic_t quit_pending; |
91 | extern char *stdio_forward_host; | ||
92 | extern int stdio_forward_port; | ||
93 | 91 | ||
94 | /* Context for session open confirmation callback */ | 92 | /* Context for session open confirmation callback */ |
95 | struct mux_session_confirm_ctx { | 93 | struct mux_session_confirm_ctx { |
@@ -1991,8 +1989,8 @@ mux_client_request_stdio_fwd(int fd) | |||
1991 | buffer_put_int(&m, MUX_C_NEW_STDIO_FWD); | 1989 | buffer_put_int(&m, MUX_C_NEW_STDIO_FWD); |
1992 | buffer_put_int(&m, muxclient_request_id); | 1990 | buffer_put_int(&m, muxclient_request_id); |
1993 | buffer_put_cstring(&m, ""); /* reserved */ | 1991 | buffer_put_cstring(&m, ""); /* reserved */ |
1994 | buffer_put_cstring(&m, stdio_forward_host); | 1992 | buffer_put_cstring(&m, options.stdio_forward_host); |
1995 | buffer_put_int(&m, stdio_forward_port); | 1993 | buffer_put_int(&m, options.stdio_forward_port); |
1996 | 1994 | ||
1997 | if (mux_client_write_packet(fd, &m) != 0) | 1995 | if (mux_client_write_packet(fd, &m) != 0) |
1998 | fatal("%s: write packet: %s", __func__, strerror(errno)); | 1996 | fatal("%s: write packet: %s", __func__, strerror(errno)); |
@@ -2116,7 +2114,7 @@ muxclient(const char *path) | |||
2116 | u_int pid; | 2114 | u_int pid; |
2117 | 2115 | ||
2118 | if (muxclient_command == 0) { | 2116 | if (muxclient_command == 0) { |
2119 | if (stdio_forward_host != NULL) | 2117 | if (options.stdio_forward_host != NULL) |
2120 | muxclient_command = SSHMUX_COMMAND_STDIO_FWD; | 2118 | muxclient_command = SSHMUX_COMMAND_STDIO_FWD; |
2121 | else | 2119 | else |
2122 | muxclient_command = SSHMUX_COMMAND_OPEN; | 2120 | muxclient_command = SSHMUX_COMMAND_OPEN; |