diff options
author | Damien Miller <djm@mindrot.org> | 2008-06-16 07:59:23 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2008-06-16 07:59:23 +1000 |
commit | d310d51badf6bbd1df56c8a0971d24e2d3e61887 (patch) | |
tree | c9be17fd3c127b573f18ef9b1855e87e9f7f45af /channels.h | |
parent | 307c1d10a78218fc2a67c3b285f90e701415004b (diff) |
- djm@cvs.openbsd.org 2008/06/15 20:06:26
[channels.c channels.h session.c]
don't call isatty() on a pty master, instead pass a flag down to
channel_set_fds() indicating that te fds refer to a tty. Fixes a
hang on exit on Solaris (bz#1463) in portable but is actually
a generic bug; ok dtucker deraadt markus
Diffstat (limited to 'channels.h')
-rw-r--r-- | channels.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels.h b/channels.h index ec8ea1c40..108b36068 100644 --- a/channels.h +++ b/channels.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.h,v 1.95 2008/06/12 15:19:17 djm Exp $ */ | 1 | /* $OpenBSD: channels.h,v 1.96 2008/06/15 20:06:26 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -188,7 +188,7 @@ struct Channel { | |||
188 | Channel *channel_by_id(int); | 188 | Channel *channel_by_id(int); |
189 | Channel *channel_lookup(int); | 189 | Channel *channel_lookup(int); |
190 | Channel *channel_new(char *, int, int, int, int, u_int, u_int, int, char *, int); | 190 | Channel *channel_new(char *, int, int, int, int, u_int, u_int, int, char *, int); |
191 | void channel_set_fds(int, int, int, int, int, int, u_int); | 191 | void channel_set_fds(int, int, int, int, int, int, int, u_int); |
192 | void channel_free(Channel *); | 192 | void channel_free(Channel *); |
193 | void channel_free_all(void); | 193 | void channel_free_all(void); |
194 | void channel_stop_listening(void); | 194 | void channel_stop_listening(void); |