diff options
| author | des <des@FreeBSD.org> | 2002-10-29 10:16:02 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-10-29 10:16:02 +0000 |
| commit | 279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a (patch) | |
| tree | 404fa392fc6f2560e3c459fa20228c7031d0289d /crypto/openssh/channels.h | |
| parent | ce26c10eda4d687d476e9bbac51ccd26564af8da (diff) | |
| download | FreeBSD-src-279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a.zip FreeBSD-src-279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/channels.h')
| -rw-r--r-- | crypto/openssh/channels.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/openssh/channels.h b/crypto/openssh/channels.h index 7ef0039..9ff0fd9 100644 --- a/crypto/openssh/channels.h +++ b/crypto/openssh/channels.h @@ -78,6 +78,7 @@ struct Channel { int efd; /* extended fd */ int sock; /* sock fd */ int isatty; /* rfd is a tty */ + int wfd_isatty; /* wfd is a tty */ int force_drain; /* force close on iEOF */ int delayed; /* fdset hack */ Buffer input; /* data read from socket, to be sent over |
