=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/canohost.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- src/usr.bin/ssh/canohost.c 1999/11/14 22:30:58 1.4 +++ src/usr.bin/ssh/canohost.c 1999/11/15 00:42:01 1.5 @@ -14,7 +14,7 @@ */ #include "includes.h" -RCSID("$Id: canohost.c,v 1.4 1999/11/14 22:30:58 markus Exp $"); +RCSID("$Id: canohost.c,v 1.5 1999/11/15 00:42:01 markus Exp $"); #include "packet.h" #include "xmalloc.h" @@ -35,9 +35,8 @@ memset(&from, 0, sizeof(from)); if (getpeername(socket, (struct sockaddr *)&from, &fromlen) < 0) { - error("getpeername failed: %.100s", strerror(errno)); - strlcpy(name, "UNKNOWN", sizeof name); - goto check_ip_options; + debug("getpeername failed: %.100s", strerror(errno)); + fatal_cleanup(); } /* Map the IP address to a host name. */ @@ -184,8 +183,8 @@ memset(&from, 0, sizeof(from)); if (getpeername(socket, (struct sockaddr *)&from, &fromlen) < 0) { - error("getpeername failed: %.100s", strerror(errno)); - return NULL; + debug("getpeername failed: %.100s", strerror(errno)); + fatal_cleanup(); } /* Get the IP address in ascii. */ @@ -207,8 +206,8 @@ memset(&from, 0, sizeof(from)); if (getpeername(sock, (struct sockaddr *)&from, &fromlen) < 0) { - error("getpeername failed: %.100s", strerror(errno)); - return 0; + debug("getpeername failed: %.100s", strerror(errno)); + fatal_cleanup(); } /* Return port number. */