summaryrefslogtreecommitdiff
path: root/mux.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2018-07-09 21:03:30 +0000
committerDamien Miller <djm@mindrot.org>2018-07-10 15:14:26 +1000
commitcecee2d607099a7bba0a84803e2325d15be4277b (patch)
treee5f685fb39c9d8512235334afc4b26e8461bfc36 /mux.c
parentff55f4ad898137d4703e7a2bcc81167dfe8e9324 (diff)
upstream: client: switch to sshbuf API; ok djm@
OpenBSD-Commit-ID: 60cb0356114acc7625ab85105f6f6a7cd44a8d05
Diffstat (limited to 'mux.c')
-rw-r--r--mux.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mux.c b/mux.c
index 8433cd8e5..474d610a3 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mux.c,v 1.71 2018/06/09 03:01:12 djm Exp $ */ 1/* $OpenBSD: mux.c,v 1.72 2018/07/09 21:03:30 markus 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 *
@@ -87,7 +87,7 @@ extern Options options;
87extern int stdin_null_flag; 87extern int stdin_null_flag;
88extern char *host; 88extern char *host;
89extern int subsystem_flag; 89extern int subsystem_flag;
90extern Buffer command; 90extern struct sshbuf *command;
91extern volatile sig_atomic_t quit_pending; 91extern volatile sig_atomic_t quit_pending;
92 92
93/* Context for session open confirmation callback */ 93/* Context for session open confirmation callback */
@@ -1887,7 +1887,7 @@ mux_client_request_session(int fd)
1887 buffer_put_int(&m, options.escape_char == SSH_ESCAPECHAR_NONE ? 1887 buffer_put_int(&m, options.escape_char == SSH_ESCAPECHAR_NONE ?
1888 0xffffffff : (u_int)options.escape_char); 1888 0xffffffff : (u_int)options.escape_char);
1889 buffer_put_cstring(&m, term == NULL ? "" : term); 1889 buffer_put_cstring(&m, term == NULL ? "" : term);
1890 buffer_put_string(&m, buffer_ptr(&command), buffer_len(&command)); 1890 buffer_put_string(&m, buffer_ptr(command), buffer_len(command));
1891 1891
1892 /* Pass environment */ 1892 /* Pass environment */
1893 if (options.num_send_env > 0 && environ != NULL) { 1893 if (options.num_send_env > 0 && environ != NULL) {