Diff

Differences From Artifact [23a3a77e81]:

To Artifact [c801d590d2]:


4375
4376
4377
4378
4379
4380
4381
4382

4383
4384
4385
4386
4387
4388
4389
		    continue;	       /* nonexistent channel */
		c->v.v2.remwindow += ssh2_pkt_getuint32();
	    }
	} while (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST);

	if (pktin.type != SSH2_MSG_CHANNEL_SUCCESS) {
	    if (pktin.type != SSH2_MSG_CHANNEL_FAILURE) {
		bombout(("Server got confused by X11 forwarding request"));

		crReturnV;
	    }
	    logevent("X11 forwarding refused");
	} else {
	    logevent("X11 forwarding enabled");
	    ssh_X11_fwd_enabled = TRUE;
	}







|
>







4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
		    continue;	       /* nonexistent channel */
		c->v.v2.remwindow += ssh2_pkt_getuint32();
	    }
	} while (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST);

	if (pktin.type != SSH2_MSG_CHANNEL_SUCCESS) {
	    if (pktin.type != SSH2_MSG_CHANNEL_FAILURE) {
		bombout(("Unexpected response to X11 forwarding request:"
			 " packet type %d", pktin.type));
		crReturnV;
	    }
	    logevent("X11 forwarding refused");
	} else {
	    logevent("X11 forwarding enabled");
	    ssh_X11_fwd_enabled = TRUE;
	}
4463
4464
4465
4466
4467
4468
4469

4470

4471
4472
4473
4474
4475
4476
4477
				    continue;/* nonexistent channel */
				c->v.v2.remwindow += ssh2_pkt_getuint32();
			    }
			} while (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST);

			if (pktin.type != SSH2_MSG_REQUEST_SUCCESS) {
			    if (pktin.type != SSH2_MSG_REQUEST_FAILURE) {

				bombout(("Server got confused by port forwarding request"));

				crReturnV;
			    }
			    logevent("Server refused this port forwarding");
			} else {
			    logevent("Remote port forwarding enabled");
			}
		    }







>
|
>







4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
				    continue;/* nonexistent channel */
				c->v.v2.remwindow += ssh2_pkt_getuint32();
			    }
			} while (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST);

			if (pktin.type != SSH2_MSG_REQUEST_SUCCESS) {
			    if (pktin.type != SSH2_MSG_REQUEST_FAILURE) {
				bombout(("Unexpected response to port "
					 "forwarding request: packet type %d",
					 pktin.type));
				crReturnV;
			    }
			    logevent("Server refused this port forwarding");
			} else {
			    logevent("Remote port forwarding enabled");
			}
		    }
4501
4502
4503
4504
4505
4506
4507
4508
4509

4510
4511
4512
4513
4514
4515
4516
		    continue;	       /* nonexistent channel */
		c->v.v2.remwindow += ssh2_pkt_getuint32();
	    }
	} while (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST);

	if (pktin.type != SSH2_MSG_CHANNEL_SUCCESS) {
	    if (pktin.type != SSH2_MSG_CHANNEL_FAILURE) {
		bombout(
			("Server got confused by agent forwarding request"));

		crReturnV;
	    }
	    logevent("Agent forwarding refused");
	} else {
	    logevent("Agent forwarding enabled");
	    ssh_agentfwd_enabled = TRUE;
	}







<
|
>







4504
4505
4506
4507
4508
4509
4510

4511
4512
4513
4514
4515
4516
4517
4518
4519
		    continue;	       /* nonexistent channel */
		c->v.v2.remwindow += ssh2_pkt_getuint32();
	    }
	} while (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST);

	if (pktin.type != SSH2_MSG_CHANNEL_SUCCESS) {
	    if (pktin.type != SSH2_MSG_CHANNEL_FAILURE) {

		bombout(("Unexpected response to agent forwarding request:"
			 " packet type %d", pktin.type));
		crReturnV;
	    }
	    logevent("Agent forwarding refused");
	} else {
	    logevent("Agent forwarding enabled");
	    ssh_agentfwd_enabled = TRUE;
	}
4544
4545
4546
4547
4548
4549
4550
4551

4552
4553
4554
4555
4556
4557
4558
		    continue;	       /* nonexistent channel */
		c->v.v2.remwindow += ssh2_pkt_getuint32();
	    }
	} while (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST);

	if (pktin.type != SSH2_MSG_CHANNEL_SUCCESS) {
	    if (pktin.type != SSH2_MSG_CHANNEL_FAILURE) {
		bombout(("Server got confused by pty request"));

		crReturnV;
	    }
	    c_write_str("Server refused to allocate pty\r\n");
	    ssh_editing = ssh_echoing = 1;
	} else {
	    logevent("Allocated pty");
	}







|
>







4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
		    continue;	       /* nonexistent channel */
		c->v.v2.remwindow += ssh2_pkt_getuint32();
	    }
	} while (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST);

	if (pktin.type != SSH2_MSG_CHANNEL_SUCCESS) {
	    if (pktin.type != SSH2_MSG_CHANNEL_FAILURE) {
		bombout(("Unexpected response to pty request:"
			 " packet type %d", pktin.type));
		crReturnV;
	    }
	    c_write_str("Server refused to allocate pty\r\n");
	    ssh_editing = ssh_echoing = 1;
	} else {
	    logevent("Allocated pty");
	}
4601
4602
4603
4604
4605
4606
4607
4608

4609
4610
4611
4612
4613
4614
4615
		if (!c)
		    continue;	       /* nonexistent channel */
		c->v.v2.remwindow += ssh2_pkt_getuint32();
	    }
	} while (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST);
	if (pktin.type != SSH2_MSG_CHANNEL_SUCCESS) {
	    if (pktin.type != SSH2_MSG_CHANNEL_FAILURE) {
		bombout(("Server got confused by shell/command request"));

		crReturnV;
	    }
	    /*
	     * We failed to start the command. If this is the
	     * fallback command, we really are finished; if it's
	     * not, and if the fallback command exists, try falling
	     * back to it before complaining.







|
>







4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
		if (!c)
		    continue;	       /* nonexistent channel */
		c->v.v2.remwindow += ssh2_pkt_getuint32();
	    }
	} while (pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST);
	if (pktin.type != SSH2_MSG_CHANNEL_SUCCESS) {
	    if (pktin.type != SSH2_MSG_CHANNEL_FAILURE) {
		bombout(("Unexpected response to shell/command request:"
			 " packet type %d", pktin.type));
		crReturnV;
	    }
	    /*
	     * We failed to start the command. If this is the
	     * fallback command, we really are finished; if it's
	     * not, and if the fallback command exists, try falling
	     * back to it before complaining.