View | Details | Raw Unified | Return to bug 1682
Collapse All | Expand All

(-)a/ssh.c (+4 lines)
Lines 1623-1628 ssh_session(void) Link Here
1623
	}
1623
	}
1624
	/* Request X11 forwarding if enabled and DISPLAY is set. */
1624
	/* Request X11 forwarding if enabled and DISPLAY is set. */
1625
	display = getenv("DISPLAY");
1625
	display = getenv("DISPLAY");
1626
	if (display == NULL && options.forward_x11)
1627
		debug("X11 forwarding requested but DISPLAY not set");
1626
	if (options.forward_x11 && display != NULL) {
1628
	if (options.forward_x11 && display != NULL) {
1627
		char *proto, *data;
1629
		char *proto, *data;
1628
		/* Get reasonable local authentication information. */
1630
		/* Get reasonable local authentication information. */
Lines 1724-1729 ssh_session2_setup(int id, int success, void *arg) Link Here
1724
		return; /* No need for error message, channels code sens one */
1726
		return; /* No need for error message, channels code sens one */
1725
1727
1726
	display = getenv("DISPLAY");
1728
	display = getenv("DISPLAY");
1729
	if (display == NULL && options.forward_x11)
1730
		debug("X11 forwarding requested but DISPLAY not set");
1727
	if (options.forward_x11 && display != NULL) {
1731
	if (options.forward_x11 && display != NULL) {
1728
		char *proto, *data;
1732
		char *proto, *data;
1729
		/* Get reasonable local authentication information. */
1733
		/* Get reasonable local authentication information. */

Return to bug 1682