3 files changed, 8 insertions, 1 deletions

diff --git a/CREDITS b/CREDITS
index 5e976859e..1e317f6ca 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3,6 +3,7 @@ Tatu Ylonen <ylo@cs.hut.fi> - Creator of SSH
 Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, 
 Theo de Raadt, and Dug Song - Creators of OpenSSH
 
+Alain St-Denis <Alain.St-Denis@ec.gc.ca> - Irix fix
 Alexandre Oliva <oliva@lsd.ic.unicamp.br> - AIX fixes
 Andre Lucas <andre.lucas@dial.pipex.com> - new login code, many fixes
 Andreas Steinmetz <ast@domdv.de> - Shadow password expiry support
diff --git a/ChangeLog b/ChangeLog
index 5f0b2979c..3ab9070aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,12 @@
    - markus@cvs.openbsd.org  2000/09/28 12:03:18
      [channels.c]
      debug -> debug2 cleanup
+ - (djm) Irix strips "/dev/tty" from [uw]tmp entries (other systems only 
+   strip "/dev/"). Fix loginrec.c based on patch from Alain St-Denis
+   <Alain.St-Denis@ec.gc.ca>
+ - (djm) Fix 9 character passphrase failure with gnome-ssh-askpass. 
+   Problem was caused by interrupted read in ssh-add. Report from Donald 
+   J. Barry <don@astro.cornell.edu>
 
 20000929
  - (djm) Fix SSH2 not terminating until all background tasks done problem.
diff --git a/ssh-add.c b/ssh-add.c
index 06884d67f..efbf771d3 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -117,7 +117,7 @@ ssh_askpass(char *askpass, char *msg)
                 fatal("ssh_askpass: exec(%s): %s", askpass, strerror(errno));
         }
         close(p[1]);
-        len = read(p[0], buf, sizeof buf);
+        len = atomicio(read, p[0], buf, sizeof buf);
         close(p[0]);
         while (waitpid(pid, &status, 0) < 0)
                 if (errno != EINTR)