diff options
| author |   djm <djm@openbsd.org> | 2008-06-15 20:06:26 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2008-06-15 20:06:26 +0000 |
| commit | d1a28ca63749ef484f4cbecf59d84f1fa49783c7 (patch) | |
| tree | 131c2df5620bd18fa4e60ee1b6b09d6e0ca82faf /usr.bin/ssh/channels.h | |
| parent | A bit of cleanup: (diff) | |
| download | wireguard-openbsd-d1a28ca63749ef484f4cbecf59d84f1fa49783c7.tar.xz wireguard-openbsd-d1a28ca63749ef484f4cbecf59d84f1fa49783c7.zip | |
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 'usr.bin/ssh/channels.h')
| -rw-r--r-- | usr.bin/ssh/channels.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/channels.h b/usr.bin/ssh/channels.h index 295774cf3e0..d82e44f3f87 100644 --- a/usr.bin/ssh/channels.h +++ b/usr.bin/ssh/channels.h @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.h,v 1.95 2008/06/12 15:19:17 djm Exp $ */ +/* $OpenBSD: channels.h,v 1.96 2008/06/15 20:06:26 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -187,7 +187,7 @@ struct Channel { Channel *channel_by_id(int); Channel *channel_lookup(int); Channel *channel_new(char *, int, int, int, int, u_int, u_int, int, char *, int); -void channel_set_fds(int, int, int, int, int, int, u_int); +void channel_set_fds(int, int, int, int, int, int, int, u_int); void channel_free(Channel *); void channel_free_all(void); void channel_stop_listening(void); |