- Merged OpenBSD CVS changes

   - [ChangeLog.Ylonen] noone needs this anymore
   - [authfd.c] close-on-exec for auth-socket, ok deraadt
   - [hostfile.c]
     in known_hosts key lookup the entry for the bits does not need
     to match, all the information is contained in n and e. This
     solves the problem with buggy servers announcing the wrong
     modulus length.  markus and me.
   - [serverloop.c]
     bugfix: check for space if child has terminated, from:
     iedowse@maths.tcd.ie
   - [ssh-add.1 ssh-add.c ssh-keygen.1 ssh-keygen.c sshconnect.c]
     [fingerprint.c fingerprint.h]
     rsa key fingerprints, idea from Bjoern Groenvall <bg@sics.se>
   - [ssh-agent.1] typo
   - [ssh.1] add OpenSSH information to AUTHOR section. okay markus@
   - [sshd.c]
     force logging to stderr while loading private key file
     (lost while converting to new log-levels)

1 files changed, 3 insertions, 2 deletions

diff --git a/serverloop.c b/serverloop.c
index 552c69c29..2aec2cf19 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -269,8 +269,9 @@ retry_select:
   if (channel_max_fd() > max_fd)
     max_fd = channel_max_fd();
   
-  /* If child has terminated, read as much as is available and then exit. */
-  if (child_terminated)
+  /* If child has terminated and there is enough buffer space to read from
+     it, then read as much as is available and exit. */
+  if (child_terminated && packet_not_very_much_data_to_write())
     if (max_time_milliseconds == 0)
       max_time_milliseconds = 100;