Attachment 5320 Details for Bug 20805 – fix against OpenSSH 2.2.0

[patch] fix against OpenSSH 2.2.0

openssh-patch (text/plain), 1.50 KB, created by Daniel Roesen on 2000-11-14 00:12:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Roesen

Created: 2000-11-14 00:12:41 UTC

Size: 1.50 KB

patch

obsolete

>--- /openssh-2.2.0/clientloop.c	Sun Aug 20 00:21:19 2000
>+++ ssh/clientloop.c	Fri Nov 10 13:54:42 2000
>@@ -32,6 +32,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;
>
>@@ -750,7 +752,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];
>@@ -993,7 +994,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;
>@@ -1066,11 +1067,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()
>

Actions: View | Diff

Attachments on bug 20805: 5320