summaryrefslogtreecommitdiff
path: root/channels.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-09-06 09:45:52 +0100
committerColin Watson <cjwatson@debian.org>2011-09-06 09:45:52 +0100
commitf38224d546cdde55f45c13d3d8225d273a3f920e (patch)
treea91a26b88ac90dc72d0ea3767feabb341eaa50a8 /channels.c
parent338146a3fc257e216fe5c10fe40e6896b40d7739 (diff)
parente90790abaf031e037f444a6658e136e48577ea49 (diff)
merge 5.9p1
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/channels.c b/channels.c
index 6abe2d012..24d4a9f42 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.c,v 1.310 2010/11/24 01:24:14 djm Exp $ */ 1/* $OpenBSD: channels.c,v 1.311 2011/06/22 22:08:42 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3562,7 +3562,7 @@ deny_input_open(int type, u_int32_t seq, void *ctxt)
3562 */ 3562 */
3563void 3563void
3564x11_request_forwarding_with_spoofing(int client_session_id, const char *disp, 3564x11_request_forwarding_with_spoofing(int client_session_id, const char *disp,
3565 const char *proto, const char *data) 3565 const char *proto, const char *data, int want_reply)
3566{ 3566{
3567 u_int data_len = (u_int) strlen(data) / 2; 3567 u_int data_len = (u_int) strlen(data) / 2;
3568 u_int i, value; 3568 u_int i, value;
@@ -3615,7 +3615,7 @@ x11_request_forwarding_with_spoofing(int client_session_id, const char *disp,
3615 3615
3616 /* Send the request packet. */ 3616 /* Send the request packet. */
3617 if (compat20) { 3617 if (compat20) {
3618 channel_request_start(client_session_id, "x11-req", 0); 3618 channel_request_start(client_session_id, "x11-req", want_reply);
3619 packet_put_char(0); /* XXX bool single connection */ 3619 packet_put_char(0); /* XXX bool single connection */
3620 } else { 3620 } else {
3621 packet_start(SSH_CMSG_X11_REQUEST_FORWARDING); 3621 packet_start(SSH_CMSG_X11_REQUEST_FORWARDING);