- Merged OpenBSD CVS changes:

   - [authfd.c ssh-agent.c]
     keysize warnings talk about identity files
   - [packet.c]
     "Connection closed by x.x.x.x": fatal() -> log()

diff --git a/ChangeLog b/ChangeLog
index d44707a161c75dc4018d03b220041eae7757331f..9386369b2de7f8299def3041c8268647763f7f7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 19991216
  - Makefile changes for Solaris from Peter Kocks 
    <peter.kocks@baygate.com>
+ - Minor updates to docs
+ - Merged OpenBSD CVS changes:
+   - [authfd.c ssh-agent.c]
+     keysize warnings talk about identity files
+   - [packet.c]
+     "Connection closed by x.x.x.x": fatal() -> log()
 
 19991215
  - Integrated patchs from Juergen Keil <jk@tools.de>

diff --git a/authfd.c b/authfd.c
index e30eab8b9ccef1cb3bdc65e7c2d82746240bc357..a56f2969c2cc3f4c0d690baf8dac2c7feaf73033 100644 (file)
--- a/authfd.c
+++ b/authfd.c
@@ -222,7 +222,7 @@ ssh_get_next_identity(AuthenticationConnection *auth,
        *comment = buffer_get_string(&auth->identities, NULL);
 
        if (bits != BN_num_bits(n))
-               error("Warning: keysize mismatch: actual %d, announced %u",
+               error("Warning: identity keysize mismatch: actual %d, announced %u",
                      BN_num_bits(n), bits);
 
        /* Decrement the number of remaining entries. */

diff --git a/packet.c b/packet.c
index f7b4f2c939b6603bbcb73e0a85edf828ce401eb3..c8acbd087f2fa5be5eb069ef7aefb74be1dbc373 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -415,8 +415,10 @@ packet_read(int *payload_len_ptr)
 
                /* Read data from the socket. */
                len = read(connection_in, buf, sizeof(buf));
-               if (len == 0)
-                       fatal("Connection closed by %.200s", get_remote_ipaddr());
+               if (len == 0) {
+                       log("Connection closed by %.200s", get_remote_ipaddr());
+                       fatal_cleanup();
+               }
                if (len < 0)
                        fatal("Read from socket failed: %.100s", strerror(errno));
                /* Append it to the buffer. */

diff --git a/ssh-agent.c b/ssh-agent.c
index 90c64ea8a6e9ff746cc944aea696b58e9d0b239b..d224386c823ba42a4cfc7b17fb16e940a664e7c9 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ssh-agent.c,v 1.23 1999/11/24 19:53:51 markus Exp $   */
+/*     $OpenBSD: ssh-agent.c,v 1.24 1999/12/15 19:43:10 markus Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -9,7 +9,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.23 1999/11/24 19:53:51 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.24 1999/12/15 19:43:10 markus Exp $");
 
 #include "ssh.h"
 #include "rsa.h"
@@ -183,7 +183,7 @@ process_remove_identity(SocketEntry *e)
        buffer_get_bignum(&e->input, n);
 
        if (bits != BN_num_bits(n))
-               error("Warning: keysize mismatch: actual %d, announced %d",
+               error("Warning: identity keysize mismatch: actual %d, announced %d",
                      BN_num_bits(n), bits);
 
        /* Check if we have the key. */