Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/usr.bin/ftp/ftp.c,v
rcsdiff: /ftp/cvs/cvsroot/src/usr.bin/ftp/ftp.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.162.2.2
retrieving revision 1.163
diff -u -p -r1.162.2.2 -r1.163
--- src/usr.bin/ftp/ftp.c	2012/10/30 19:00:18	1.162.2.2
+++ src/usr.bin/ftp/ftp.c	2011/12/10 05:53:58	1.163
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftp.c,v 1.162.2.2 2012/10/30 19:00:18 yamt Exp $	*/
+/*	$NetBSD: ftp.c,v 1.163 2011/12/10 05:53:58 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
 #if 0
 static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
 #else
-__RCSID("$NetBSD: ftp.c,v 1.162.2.2 2012/10/30 19:00:18 yamt Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.163 2011/12/10 05:53:58 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -208,8 +208,7 @@ hookup(const char *host, const char *por
 			    hname, sname);
 			continue;
 		}
-		if (ftp_connect(s, res->ai_addr, res->ai_addrlen,
-		    verbose || !res->ai_next) < 0) {
+		if (ftp_connect(s, res->ai_addr, res->ai_addrlen) < 0) {
 			close(s);
 			s = -1;
 			continue;
@@ -1469,7 +1468,7 @@ initconn(void)
 			goto bad;
 
 		if (ftp_connect(data, (struct sockaddr *)&data_addr.si_su,
-		    data_addr.su_len, 1) < 0) {
+		    data_addr.su_len) < 0) {
 			if (activefallback) {
 				(void)close(data);
 				data = -1;