From 92c7597c91b0f54c52b8cba7f13f07d089e617aa Mon Sep 17 00:00:00 2001
From: dsl <dsl@NetBSD.org>
Date: Tue, 22 Jul 2003 11:45:16 +0000
Subject: [PATCH] Specify username+password to ftp even when username is 'ftp'.
 Only use 'ftp -a ...' when the username is ftp and the password is null.
 Fixed PR install/13656

---
 distrib/utils/sysinst/net.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/distrib/utils/sysinst/net.c b/distrib/utils/sysinst/net.c
index 2ba1b2c44eca..6a2d1474b547 100644
--- a/distrib/utils/sysinst/net.c
+++ b/distrib/utils/sysinst/net.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: net.c,v 1.89 2003/07/22 08:30:10 dsl Exp $	*/
+/*	$NetBSD: net.c,v 1.90 2003/07/22 11:45:16 dsl Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -771,7 +771,7 @@ get_via_ftp(void)
 		 * example, ftp_dir could easily contain '~', which is
 		 * unsafe by a strict reading of RFC 1738).
 		 */
-		if (strcmp("ftp", ftp_user) == 0)
+		if (strcmp("ftp", ftp_user) == 0 && ftp_pass[0] == 0)
 			ret = run_prog(RUN_DISPLAY, NULL,
 			    "/usr/bin/ftp -a ftp://%s/%s/%s",
 			    ftp_host,