merge 5.9p1

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 @@
-/* $OpenBSD: channels.c,v 1.310 2010/11/24 01:24:14 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.311 2011/06/22 22:08:42 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * 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)
  */
 void
 x11_request_forwarding_with_spoofing(int client_session_id, const char *disp,
-    const char *proto, const char *data)
+    const char *proto, const char *data, int want_reply)
 {
         u_int data_len = (u_int) strlen(data) / 2;
         u_int i, value;
@@ -3615,7 +3615,7 @@ x11_request_forwarding_with_spoofing(int client_session_id, const char *disp,
 
         /* Send the request packet. */
         if (compat20) {
-                channel_request_start(client_session_id, "x11-req", 0);
+                channel_request_start(client_session_id, "x11-req", want_reply);
                 packet_put_char(0);     /* XXX bool single connection */
         } else {
                 packet_start(SSH_CMSG_X11_REQUEST_FORWARDING);