View | Details | Raw Unified | Return to bug 1398 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-1 / +2 lines)
Line  Link Here
0 
-- clientloop.c
 0 
++ clientloop.c
Lines 883-888 client_process_control(fd_set *readset) Link Here
883 
			xfree(cctx->term);
 883 
			xfree(cctx->term);
884 
			buffer_free(&cctx->cmd);
 884 
			buffer_free(&cctx->cmd);
885 
			xfree(cctx);
 885 
			xfree(cctx);
886 
			close(client_fd);
886 
			return;
 887 
			return;
887 
		}
 888 
		}
888 
	}
 889 
	}
(-)ssh.c (-3 / +7 lines)
Lines 1365-1370 Link Here
1365 
	if (options.forward_agent)
 1365 
	if (options.forward_agent)
1366 
		flags |= SSHMUX_FLAG_AGENT_FWD;
 1366 
		flags |= SSHMUX_FLAG_AGENT_FWD;
1367 
	signal(SIGPIPE, SIG_IGN);
1367 
	buffer_init(&m);
 1368 
	buffer_init(&m);
1368 
	/* Send our command to server */
 1369 
	/* Send our command to server */
Lines 1426-1434 Link Here
1426 
	if (ssh_msg_send(sock, SSHMUX_VER, &m) == -1)
 1427 
	if (ssh_msg_send(sock, SSHMUX_VER, &m) == -1)
1427 
		fatal("%s: msg_send", __func__);
 1428 
		fatal("%s: msg_send", __func__);
1428 
	mm_send_fd(sock, STDIN_FILENO);
 1429 
	if ( mm_send_fd(sock, STDIN_FILENO) == -1 )
1429 
	mm_send_fd(sock, STDOUT_FILENO);
 1430 
		fatal("%s: failed to send stdin", __func__);
1430 
	mm_send_fd(sock, STDERR_FILENO);
 1431 
	else if ( mm_send_fd(sock, STDOUT_FILENO) == -1 )
1432 
		fatal("%s: failed to send stdout", __func__);
1433 
	else if ( mm_send_fd(sock, STDERR_FILENO) == -1 )
1434 
		fatal("%s: failed to send stderr", __func__);
1431 
	/* Wait for reply, so master has a chance to gather ttymodes */
 1435 
	/* Wait for reply, so master has a chance to gather ttymodes */
1432 
	buffer_clear(&m);
 1436 
	buffer_clear(&m);

Return to bug 1398