989d921f5d
I'm very pleased to announce the release of our new website and documentation using the new toolchain with Hugo and AsciiDoctor. To get more information about the new toolchain please read the FreeBSD Documentation Project Primer[1], Hugo docs[2] and AsciiDoctor docs[3]. Acknowledgment: Benedict Reuschling <bcr@> Glen Barber <gjb@> Hiroki Sato <hrs@> Li-Wen Hsu <lwhsu@> Sean Chittenden <seanc@> The FreeBSD Foundation [1] https://docs.FreeBSD.org/en/books/fdp-primer/ [2] https://gohugo.io/documentation/ [3] https://docs.asciidoctor.org/home/ Approved by: doceng, core
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
Index: clientloop.c
|
|
===================================================================
|
|
RCS file: /home/ncvs/src/crypto/openssh/clientloop.c,v
|
|
retrieving revision 1.1.1.1.2.2
|
|
diff -u -r1.1.1.1.2.2 clientloop.c
|
|
--- clientloop.c 2000/10/28 23:00:47 1.1.1.1.2.2
|
|
+++ clientloop.c 2000/12/19 22:57:31
|
|
@@ -75,6 +75,8 @@
|
|
#include "buffer.h"
|
|
#include "bufaux.h"
|
|
|
|
+extern Options options;
|
|
+
|
|
/* Flag indicating that stdin should be redirected from /dev/null. */
|
|
extern int stdin_null_flag;
|
|
|
|
@@ -793,7 +795,6 @@
|
|
int
|
|
client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
|
|
{
|
|
- extern Options options;
|
|
double start_time, total_time;
|
|
int len;
|
|
char buf[100];
|
|
@@ -1036,7 +1037,7 @@
|
|
debug("client_input_channel_open: ctype %s rchan %d win %d max %d",
|
|
ctype, rchan, rwindow, rmaxpack);
|
|
|
|
- if (strcmp(ctype, "x11") == 0) {
|
|
+ if (strcmp(ctype, "x11") == 0 && options.forward_x11) {
|
|
int sock;
|
|
char *originator;
|
|
int originator_port;
|
|
@@ -1108,11 +1109,14 @@
|
|
dispatch_set(SSH_MSG_CHANNEL_OPEN_CONFIRMATION, &channel_input_open_confirmation);
|
|
dispatch_set(SSH_MSG_CHANNEL_OPEN_FAILURE, &channel_input_open_failure);
|
|
dispatch_set(SSH_MSG_PORT_OPEN, &channel_input_port_open);
|
|
- dispatch_set(SSH_SMSG_AGENT_OPEN, &auth_input_open_request);
|
|
dispatch_set(SSH_SMSG_EXITSTATUS, &client_input_exit_status);
|
|
dispatch_set(SSH_SMSG_STDERR_DATA, &client_input_stderr_data);
|
|
dispatch_set(SSH_SMSG_STDOUT_DATA, &client_input_stdout_data);
|
|
- dispatch_set(SSH_SMSG_X11_OPEN, &x11_input_open);
|
|
+
|
|
+ dispatch_set(SSH_SMSG_AGENT_OPEN, options.forward_agent ?
|
|
+ &auth_input_open_request : NULL);
|
|
+ dispatch_set(SSH_SMSG_X11_OPEN, options.forward_x11 ?
|
|
+ &x11_input_open : NULL);
|
|
}
|
|
void
|
|
client_init_dispatch_15()
|