2 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 82415d2ef..0e2c2ba3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
    - markus@cvs.openbsd.org 2002/09/19 15:51:23
      [ssh-add.c]
      typo; cd@kalkatraz.de
+   - stevesk@cvs.openbsd.org 2002/09/19 16:03:15
+     [serverloop.c]
+     log IP address also; ok markus@
 
 20020919
  - (djm) OpenBSD CVS Sync
@@ -686,4 +689,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2473 2002/09/21 15:26:00 djm Exp $
+$Id: ChangeLog,v 1.2474 2002/09/21 15:26:27 djm Exp $
diff --git a/serverloop.c b/serverloop.c
index 912f62501..5112de680 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,13 +35,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"
@@ -347,14 +348,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 {