Attachment #2322 for bug #2135

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

Lines 102-108 Link Here

(-)openssh-6.2p2-orig/channels.h (+2 lines)
102	int sock; /* sock fd */	102	int sock; /* sock fd */
103	int ctl_chan; /* control channel (multiplexed connections) */	103	int ctl_chan; /* control channel (multiplexed connections) */
104	int isatty; /* rfd is a tty */	104	int isatty; /* rfd is a tty */
		105	#ifdef _AIX
105	int wfd_isatty; /* wfd is a tty */	106	int wfd_isatty; /* wfd is a tty */
		107	#endif
106	int client_tty; /* (client) TTY has been requested */	108	int client_tty; /* (client) TTY has been requested */
107	int force_drain; /* force close on iEOF */	109	int force_drain; /* force close on iEOF */
108	time_t notbefore; /* Pause IO until deadline (time_t) */	110	time_t notbefore; /* Pause IO until deadline (time_t) */

Lines 247-253 Link Here

(-)openssh-6.2p2-orig/channels.c (+2 lines)
247		247
248	if ((c->isatty = is_tty) != 0)	248	if ((c->isatty = is_tty) != 0)
249	debug2("channel %d: rfd %d isatty", c->self, c->rfd);	249	debug2("channel %d: rfd %d isatty", c->self, c->rfd);
		250	#ifdef _AIX
250	c->wfd_isatty = is_tty \|\| isatty(c->wfd);	251	c->wfd_isatty = is_tty \|\| isatty(c->wfd);
		252	#endif
251		253
252	/* enable nonblocking mode */	254	/* enable nonblocking mode */
253	if (nonblock) {	255	if (nonblock) {

Return to bug 2135