===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshconnect.c,v
retrieving revision 1.72
retrieving revision 1.72.2.1
diff -u -r1.72 -r1.72.2.1
--- src/usr.bin/ssh/sshconnect.c	2000/05/04 09:50:22	1.72
+++ src/usr.bin/ssh/sshconnect.c	2000/06/12 02:37:37	1.72.2.1
@@ -8,7 +8,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.72 2000/05/04 09:50:22 markus Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.72.2.1 2000/06/12 02:37:37 jason Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/dsa.h>
@@ -251,7 +251,7 @@
 			temporarily_use_uid(original_real_uid);
 			if (connect(sock, ai->ai_addr, ai->ai_addrlen) >= 0) {
 				/* Successful connection. */
-				memcpy(hostaddr, ai->ai_addr, sizeof(*hostaddr));
+				memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen); 
 				restore_uid();
 				break;
 			} else {
@@ -295,21 +295,6 @@
 	packet_set_connection(sock, sock);
 
 	return 1;
-}
-
-char *
-chop(char *s)
-{
-	char *t = s;
-	while (*t) {
-		if(*t == '\n' || *t == '\r') {
-			*t = '\0';
-			return s;
-		}
-		t++;
-	}
-	return s;
-
 }
 
 /*