upstream commit

Move the host and port used by ssh -W into the Options
 struct. This will make future changes a bit easier.  ok djm@

Upstream-ID: 151bce5ecab2fbedf0d836250a27968d30389382

1 files changed, 4 insertions, 6 deletions

diff --git a/mux.c b/mux.c
index 6086f1ce1..98e3c0068 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mux.c,v 1.59 2016/04/01 02:34:10 djm Exp $ */
+/* $OpenBSD: mux.c,v 1.60 2016/06/03 03:14:41 dtucker Exp $ */
 /*
  * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
  *
@@ -88,8 +88,6 @@ extern char *host;
 extern int subsystem_flag;
 extern Buffer command;
 extern volatile sig_atomic_t quit_pending;
-extern char *stdio_forward_host;
-extern int stdio_forward_port;
 
 /* Context for session open confirmation callback */
 struct mux_session_confirm_ctx {
@@ -1991,8 +1989,8 @@ mux_client_request_stdio_fwd(int fd)
         buffer_put_int(&m, MUX_C_NEW_STDIO_FWD);
         buffer_put_int(&m, muxclient_request_id);
         buffer_put_cstring(&m, ""); /* reserved */
-        buffer_put_cstring(&m, stdio_forward_host);
-        buffer_put_int(&m, stdio_forward_port);
+        buffer_put_cstring(&m, options.stdio_forward_host);
+        buffer_put_int(&m, options.stdio_forward_port);
 
         if (mux_client_write_packet(fd, &m) != 0)
                 fatal("%s: write packet: %s", __func__, strerror(errno));
@@ -2116,7 +2114,7 @@ muxclient(const char *path)
         u_int pid;
 
         if (muxclient_command == 0) {
-                if (stdio_forward_host != NULL)
+                if (options.stdio_forward_host != NULL)
                         muxclient_command = SSHMUX_COMMAND_STDIO_FWD;
                 else
                         muxclient_command = SSHMUX_COMMAND_OPEN;