===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/canohost.c,v
retrieving revision 1.41.2.2
retrieving revision 1.42
diff -u -r1.41.2.2 -r1.42
--- src/usr.bin/ssh/canohost.c	2005/09/02 03:44:59	1.41.2.2
+++ src/usr.bin/ssh/canohost.c	2005/02/18 03:05:53	1.42
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: canohost.c,v 1.41.2.2 2005/09/02 03:44:59 brad Exp $");
+RCSID("$OpenBSD: canohost.c,v 1.42 2005/02/18 03:05:53 djm Exp $");
 
 #include "packet.h"
 #include "xmalloc.h"
@@ -137,8 +137,7 @@
 	u_char options[200];
 	char text[sizeof(options) * 3 + 1];
 	socklen_t option_size;
-	u_int i;
-	int ipproto;
+	int i, ipproto;
 	struct protoent *ip;
 
 	if ((ip = getprotobyname("ip")) != NULL)
@@ -308,7 +307,7 @@
 	} else {
 		if (getpeername(sock, (struct sockaddr *)&from, &fromlen) < 0) {
 			debug("getpeername failed: %.100s", strerror(errno));
-			return -1;
+			cleanup_exit(255);
 		}
 	}
 	/* Return port number. */