- OpenBSD CVS updates to v1.2.3

	[ssh.h atomicio.c]
	 - int atomicio -> ssize_t (for alpha). ok deraadt@
	[auth-rsa.c]
	 - delay MD5 computation until client sends response, free() early, cleanup.
	[cipher.c]
	 - void* -> unsigned char*, ok niels@
	[hostfile.c]
	 - remove unused variable 'len'. fix comments.
	 - remove unused variable
	[log-client.c log-server.c]
	 - rename a cpp symbol, to avoid param.h collision
	[packet.c]
	 - missing xfree()
	 - getsockname() requires initialized tolen; andy@guildsoftware.com
	 - use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
	from Holger.Trapp@Informatik.TU-Chemnitz.DE
	[pty.c pty.h]
	 - register cleanup for pty earlier. move code for pty-owner handling to
   	pty.c ok provos@, dugsong@
	[readconf.c]
	 - turn off x11-fwd for the client, too.
	[rsa.c]
	 - PKCS#1 padding
	[scp.c]
	 - allow '.' in usernames; from jedgar@fxp.org
	[servconf.c]
	 - typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
	 - sync with sshd_config
	[ssh-keygen.c]
	 - enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
	[ssh.1]
	 - Change invalid 'CHAT' loglevel to 'VERBOSE'
	[ssh.c]
	 - suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
	 - turn off x11-fwd for the client, too.
	[sshconnect.c]
	 - missing xfree()
	 - retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
	 - read error vs. "Connection closed by remote host"
	[sshd.8]
	 - ie. -> i.e.,
	 - do not link to a commercial page..
	 - sync with sshd_config
	[sshd.c]
	 - no need for poll.h; from bright@wintelcom.net
	 - log with level log() not fatal() if peer behaves badly.
	 - don't panic if client behaves strange. ok deraadt@
	 - make no-port-forwarding for RSA keys deny both -L and -R style fwding
	 - delay close() of pty until the pty has been chowned back to root
	 - oops, fix comment, too.
	 - missing xfree()
	 - move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
   	(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
	 - register cleanup for pty earlier. move code for pty-owner handling to
      pty.c ok provos@, dugsong@
	 - create x11 cookie file
	 - fix pr 1113, fclose() -> pclose(), todo: remote popen()
	 - version 1.2.3
 - Cleaned up

1 files changed, 9 insertions, 4 deletions

diff --git a/sshconnect.c b/sshconnect.c
index 5e2a34497..c4c9aee1f 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -8,7 +8,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.53 2000/01/18 09:42:17 markus Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.56 2000/02/18 08:50:33 markus Exp $");
 
 #ifdef HAVE_OPENSSL
 #include <openssl/bn.h>
@@ -156,8 +156,9 @@ ssh_create_socket(uid_t original_real_uid, int privileged, int family)
                 int p = IPPORT_RESERVED - 1;
                 sock = rresvport_af(&p, family);
                 if (sock < 0)
-                        fatal("rresvport: af=%d %.100s", family, strerror(errno));
-                debug("Allocated local port %d.", p);
+                        error("rresvport: af=%d %.100s", family, strerror(errno));
+                else
+                        debug("Allocated local port %d.", p);
         } else {
                 /*
                  * Just create an ordinary socket on arbitrary port.  We use
@@ -891,6 +892,7 @@ try_skey_authentication()
                 log("WARNING: Encryption is disabled! "
                     "Reponse will be transmitted in clear text.");
         fprintf(stderr, "%s\n", challenge);
+        xfree(challenge);
         fflush(stderr);
         for (i = 0; i < options.number_of_password_prompts; i++) {
                 if (i != 0)
@@ -960,8 +962,11 @@ ssh_exchange_identification()
 
         /* Read other side\'s version identification. */
         for (i = 0; i < sizeof(buf) - 1; i++) {
-                if (read(connection_in, &buf[i], 1) != 1)
+                int len = read(connection_in, &buf[i], 1);
+                if (len < 0)
                         fatal("ssh_exchange_identification: read: %.100s", strerror(errno));
+                if (len != 1)
+                        fatal("ssh_exchange_identification: Connection closed by remote host");
                 if (buf[i] == '\r') {
                         buf[i] = '\n';
                         buf[i + 1] = 0;