summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--serverloop.c10
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 @@
5 - markus@cvs.openbsd.org 2002/09/19 15:51:23 5 - markus@cvs.openbsd.org 2002/09/19 15:51:23
6 [ssh-add.c] 6 [ssh-add.c]
7 typo; cd@kalkatraz.de 7 typo; cd@kalkatraz.de
8 - stevesk@cvs.openbsd.org 2002/09/19 16:03:15
9 [serverloop.c]
10 log IP address also; ok markus@
8 11
920020919 1220020919
10 - (djm) OpenBSD CVS Sync 13 - (djm) OpenBSD CVS Sync
@@ -686,4 +689,4 @@
686 save auth method before monitor_reset_key_state(); bugzilla bug #284; 689 save auth method before monitor_reset_key_state(); bugzilla bug #284;
687 ok provos@ 690 ok provos@
688 691
689$Id: ChangeLog,v 1.2473 2002/09/21 15:26:00 djm Exp $ 692$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 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: serverloop.c,v 1.103 2002/06/24 14:33:27 markus Exp $"); 38RCSID("$OpenBSD: serverloop.c,v 1.104 2002/09/19 16:03:15 stevesk Exp $");
39 39
40#include "xmalloc.h" 40#include "xmalloc.h"
41#include "packet.h" 41#include "packet.h"
42#include "buffer.h" 42#include "buffer.h"
43#include "log.h" 43#include "log.h"
44#include "servconf.h" 44#include "servconf.h"
45#include "canohost.h"
45#include "sshpty.h" 46#include "sshpty.h"
46#include "channels.h" 47#include "channels.h"
47#include "compat.h" 48#include "compat.h"
@@ -347,14 +348,17 @@ process_input(fd_set * readset)
347 if (FD_ISSET(connection_in, readset)) { 348 if (FD_ISSET(connection_in, readset)) {
348 len = read(connection_in, buf, sizeof(buf)); 349 len = read(connection_in, buf, sizeof(buf));
349 if (len == 0) { 350 if (len == 0) {
350 verbose("Connection closed by remote host."); 351 verbose("Connection closed by %.100s",
352 get_remote_ipaddr());
351 connection_closed = 1; 353 connection_closed = 1;
352 if (compat20) 354 if (compat20)
353 return; 355 return;
354 fatal_cleanup(); 356 fatal_cleanup();
355 } else if (len < 0) { 357 } else if (len < 0) {
356 if (errno != EINTR && errno != EAGAIN) { 358 if (errno != EINTR && errno != EAGAIN) {
357 verbose("Read error from remote host: %.100s", strerror(errno)); 359 verbose("Read error from remote host "
360 "%.100s: %.100s",
361 get_remote_ipaddr(), strerror(errno));
358 fatal_cleanup(); 362 fatal_cleanup();
359 } 363 }
360 } else { 364 } else {