diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2003-03-06 00:27:42 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2003-03-06 00:27:42 +0000 |
| commit | 6bcadbfc198b853f06a8c62417b373c58b32d148 (patch) | |
| tree | dfbafbb2a24634571de00a386d9aa06e0b6c9366 | |
| parent | 14cc13938e1a2b9e623c03d2112e7a987357f9e9 (diff) | |
Delete the password from the ftp url shown when no sets are found.
a) We shouldn't display passwords.
b) If it is encoded, and thus different from what was entered,
installers will leap to the incorrect conclusion that the logon
failed.
c) At this point the logon to the server was successful so the
password worked, and the user shouldn't have forgotten it already.
ok deraadt@.
| -rw-r--r-- | distrib/miniroot/install.sub | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 45ac3c52365..b75ce75c771 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.291 2003/03/02 00:17:20 krw Exp $ +# $OpenBSD: install.sub,v 1.292 2003/03/06 00:27:41 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2003 Todd Miller, Theo de Raadt, Ken Westerback @@ -857,10 +857,11 @@ install_files () { done if [[ -z $_sets ]]; then + # Show $_src, but delete any ftp password. cat << __EOT No $OBSD sets were found at - '$_src' + $(echo $_src | sed -e 's/\(^ftp:\/\/[^/]*\)\(:[^/]*\)\(@.*\)/\1\3/') Set names are: $THESETS __EOT |