summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CREDITS1
-rw-r--r--ChangeLog6
-rw-r--r--ssh-add.c2
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
3Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, 3Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos,
4Theo de Raadt, and Dug Song - Creators of OpenSSH 4Theo de Raadt, and Dug Song - Creators of OpenSSH
5 5
6Alain St-Denis <Alain.St-Denis@ec.gc.ca> - Irix fix
6Alexandre Oliva <oliva@lsd.ic.unicamp.br> - AIX fixes 7Alexandre Oliva <oliva@lsd.ic.unicamp.br> - AIX fixes
7Andre Lucas <andre.lucas@dial.pipex.com> - new login code, many fixes 8Andre Lucas <andre.lucas@dial.pipex.com> - new login code, many fixes
8Andreas Steinmetz <ast@domdv.de> - Shadow password expiry support 9Andreas 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 @@
20 - markus@cvs.openbsd.org 2000/09/28 12:03:18 20 - markus@cvs.openbsd.org 2000/09/28 12:03:18
21 [channels.c] 21 [channels.c]
22 debug -> debug2 cleanup 22 debug -> debug2 cleanup
23 - (djm) Irix strips "/dev/tty" from [uw]tmp entries (other systems only
24 strip "/dev/"). Fix loginrec.c based on patch from Alain St-Denis
25 <Alain.St-Denis@ec.gc.ca>
26 - (djm) Fix 9 character passphrase failure with gnome-ssh-askpass.
27 Problem was caused by interrupted read in ssh-add. Report from Donald
28 J. Barry <don@astro.cornell.edu>
23 29
2420000929 3020000929
25 - (djm) Fix SSH2 not terminating until all background tasks done problem. 31 - (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)
117 fatal("ssh_askpass: exec(%s): %s", askpass, strerror(errno)); 117 fatal("ssh_askpass: exec(%s): %s", askpass, strerror(errno));
118 } 118 }
119 close(p[1]); 119 close(p[1]);
120 len = read(p[0], buf, sizeof buf); 120 len = atomicio(read, p[0], buf, sizeof buf);
121 close(p[0]); 121 close(p[0]);
122 while (waitpid(pid, &status, 0) < 0) 122 while (waitpid(pid, &status, 0) < 0)
123 if (errno != EINTR) 123 if (errno != EINTR)