summaryrefslogtreecommitdiff
path: root/crypto/dist/ssh/serverloop.c
diff options
context:
space:
mode:
authoritojun <itojun@NetBSD.org>2002-10-01 14:07:26 +0000
committeritojun <itojun@NetBSD.org>2002-10-01 14:07:26 +0000
commitef7d24574a1d9ea83a2c436226514fd92a4e22bb (patch)
treea81dba621ab3d057c5067f846ab45c872f6c05db /crypto/dist/ssh/serverloop.c
parent5964b80cf8a6bac444e9e0ac31021ae27fc7191e (diff)
upgrade to openssh 3.5. major changes include:
- krb4/5 support for privsep (krb5 diff was already applied) includes fake implementaation of getpeereid() from openssh-portable, which does nothing useful - need improvement.
Diffstat (limited to 'crypto/dist/ssh/serverloop.c')
-rw-r--r--crypto/dist/ssh/serverloop.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/crypto/dist/ssh/serverloop.c b/crypto/dist/ssh/serverloop.c
index fbc174b3daf..850474e16b2 100644
--- a/crypto/dist/ssh/serverloop.c
+++ b/crypto/dist/ssh/serverloop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: serverloop.c,v 1.19 2002/06/26 14:08:31 itojun Exp $ */
+/* $NetBSD: serverloop.c,v 1.20 2002/10/01 14:07:37 itojun Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -36,13 +36,14 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.103 2002/06/24 14:33:27 markus Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.104 2002/09/19 16:03:15 stevesk Exp $");
#include "xmalloc.h"
#include "packet.h"
#include "buffer.h"
#include "log.h"
#include "servconf.h"
+#include "canohost.h"
#include "sshpty.h"
#include "channels.h"
#include "compat.h"
@@ -348,14 +349,17 @@ process_input(fd_set * readset)
if (FD_ISSET(connection_in, readset)) {
len = read(connection_in, buf, sizeof(buf));
if (len == 0) {
- verbose("Connection closed by remote host.");
+ verbose("Connection closed by %.100s",
+ get_remote_ipaddr());
connection_closed = 1;
if (compat20)
return;
fatal_cleanup();
} else if (len < 0) {
if (errno != EINTR && errno != EAGAIN) {
- verbose("Read error from remote host: %.100s", strerror(errno));
+ verbose("Read error from remote host "
+ "%.100s: %.100s",
+ get_remote_ipaddr(), strerror(errno));
fatal_cleanup();
}
} else {