summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-12-16 13:18:04 +1100
committerDamien Miller <djm@mindrot.org>1999-12-16 13:18:04 +1100
commit5e7c10eedb1745b9d72dd184ceede504d92e5a3a (patch)
treeefe7b3894512f04a8b1f329f8ab5cb6ea3a361dd
parent18ccf85863520823b9210dfd1d67366d90d74735 (diff)
- 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()
-rw-r--r--ChangeLog6
-rw-r--r--authfd.c4
-rw-r--r--packet.c8
-rw-r--r--ssh-agent.c6
4 files changed, 16 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index d44707a1..9386369b 100644
--- 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 1a62c3ed..cb7bbd5e 100644
--- a/authfd.c
+++ b/authfd.c
@@ -14,7 +14,7 @@
*/
#include "includes.h"
-RCSID("$Id: authfd.c,v 1.9 1999/12/07 04:38:32 damien Exp $");
+RCSID("$Id: authfd.c,v 1.10 1999/12/16 02:18:04 damien Exp $");
#include "ssh.h"
#include "rsa.h"
@@ -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 9e8cf2e3..17f6f6e3 100644
--- a/packet.c
+++ b/packet.c
@@ -15,7 +15,7 @@
*/
#include "includes.h"
-RCSID("$Id: packet.c,v 1.7 1999/12/06 00:47:29 damien Exp $");
+RCSID("$Id: packet.c,v 1.8 1999/12/16 02:18:04 damien Exp $");
#include "xmalloc.h"
#include "buffer.h"
@@ -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 90c64ea8..d224386c 100644
--- 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. */