1 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 1a3b3b1a8..77d7739dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,12 @@
    - dtucker@cvs.openbsd.org 2008/06/15 16:58:40
      [servconf.c sshd_config.5]
      Allow MaxAuthTries within a Match block.  ok djm@
+   - 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
 
 20080614
  - (djm) [openbsd-compat/sigact.c] Avoid NULL derefs in ancient sigaction
@@ -4393,4 +4399,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5018 2008/06/15 21:56:20 djm Exp $
+$Id: ChangeLog,v 1.5019 2008/06/15 21:59:23 djm Exp $