summaryrefslogtreecommitdiff
path: root/channels.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-08-01 14:29:20 +1000
committerDamien Miller <djm@mindrot.org>2013-08-01 14:29:20 +1000
commitc192a4c4f6da907dc0e67a3ca61d806f9a92c931 (patch)
treec9ea84bd9379a08bb53ee8051a69c597cec8da15 /channels.h
parent81f7cf1ec5bc2fd202eda05abc2e5361c54633c5 (diff)
- (djm) [channels.c channels.h] bz#2135: On Solaris, isatty() on a non-
blocking connecting socket will clear any stored errno that might otherwise have been retrievable via getsockopt(). A hack to limit writes to TTYs on AIX was triggering this. Since only AIX needs the hack, wrap it in an #ifdef. Diagnosis and patch from Ivo Raisr.
Diffstat (limited to 'channels.h')
-rw-r--r--channels.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/channels.h b/channels.h
index ffd580727..4fab9d7c4 100644
--- a/channels.h
+++ b/channels.h
@@ -103,7 +103,9 @@ struct Channel {
103 int sock; /* sock fd */ 103 int sock; /* sock fd */
104 int ctl_chan; /* control channel (multiplexed connections) */ 104 int ctl_chan; /* control channel (multiplexed connections) */
105 int isatty; /* rfd is a tty */ 105 int isatty; /* rfd is a tty */
106#ifdef _AIX
106 int wfd_isatty; /* wfd is a tty */ 107 int wfd_isatty; /* wfd is a tty */
108#endif
107 int client_tty; /* (client) TTY has been requested */ 109 int client_tty; /* (client) TTY has been requested */
108 int force_drain; /* force close on iEOF */ 110 int force_drain; /* force close on iEOF */
109 time_t notbefore; /* Pause IO until deadline (time_t) */ 111 time_t notbefore; /* Pause IO until deadline (time_t) */