Diff

Differences From Artifact [a0e61afe0d]:

To Artifact [a51d8a82e7]:


3015
3016
3017
3018
3019
3020
3021

3022
3023
3024
3025
3026
3027
3028
    }

    if (cfg.x11_forward) {
	char proto[20], data[64];
	logevent("Requesting X11 forwarding");
	ssh->x11auth = x11_invent_auth(proto, sizeof(proto),
				       data, sizeof(data));

	if (ssh->v1_local_protoflags & SSH1_PROTOFLAG_SCREEN_NUMBER) {
	    send_packet(ssh, SSH1_CMSG_X11_REQUEST_FORWARDING,
			PKT_STR, proto, PKT_STR, data,
			PKT_INT, x11_get_screen_number(cfg.x11_display),
			PKT_END);
	} else {
	    send_packet(ssh, SSH1_CMSG_X11_REQUEST_FORWARDING,







>







3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
    }

    if (cfg.x11_forward) {
	char proto[20], data[64];
	logevent("Requesting X11 forwarding");
	ssh->x11auth = x11_invent_auth(proto, sizeof(proto),
				       data, sizeof(data));
        x11_get_real_auth(ssh->x11auth, cfg.x11_display);
	if (ssh->v1_local_protoflags & SSH1_PROTOFLAG_SCREEN_NUMBER) {
	    send_packet(ssh, SSH1_CMSG_X11_REQUEST_FORWARDING,
			PKT_STR, proto, PKT_STR, data,
			PKT_INT, x11_get_screen_number(cfg.x11_display),
			PKT_END);
	} else {
	    send_packet(ssh, SSH1_CMSG_X11_REQUEST_FORWARDING,
5064
5065
5066
5067
5068
5069
5070

5071
5072
5073
5074
5075
5076
5077
     * Potentially enable X11 forwarding.
     */
    if (cfg.x11_forward) {
	char proto[20], data[64];
	logevent("Requesting X11 forwarding");
	ssh->x11auth = x11_invent_auth(proto, sizeof(proto),
				       data, sizeof(data));

	ssh2_pkt_init(ssh, SSH2_MSG_CHANNEL_REQUEST);
	ssh2_pkt_adduint32(ssh, ssh->mainchan->remoteid);
	ssh2_pkt_addstring(ssh, "x11-req");
	ssh2_pkt_addbool(ssh, 1);	       /* want reply */
	ssh2_pkt_addbool(ssh, 0);	       /* many connections */
	ssh2_pkt_addstring(ssh, proto);
	ssh2_pkt_addstring(ssh, data);







>







5065
5066
5067
5068
5069
5070
5071
5072
5073
5074
5075
5076
5077
5078
5079
     * Potentially enable X11 forwarding.
     */
    if (cfg.x11_forward) {
	char proto[20], data[64];
	logevent("Requesting X11 forwarding");
	ssh->x11auth = x11_invent_auth(proto, sizeof(proto),
				       data, sizeof(data));
        x11_get_real_auth(ssh->x11auth, cfg.x11_display);
	ssh2_pkt_init(ssh, SSH2_MSG_CHANNEL_REQUEST);
	ssh2_pkt_adduint32(ssh, ssh->mainchan->remoteid);
	ssh2_pkt_addstring(ssh, "x11-req");
	ssh2_pkt_addbool(ssh, 1);	       /* want reply */
	ssh2_pkt_addbool(ssh, 0);	       /* many connections */
	ssh2_pkt_addstring(ssh, proto);
	ssh2_pkt_addstring(ssh, data);