diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-02-28 20:24:15 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-02-28 20:24:15 +0000 |
| commit | 608ee82e91ed42701bc08f4f3eaed992e8beccae (patch) | |
| tree | ddd2a4f1b4a218924325ef0f0e37fd719f34bdb7 /distrib | |
| parent | 68c59d886feb0c2e491e9608d0a185298de6d55c (diff) | |
Revert v1.314 changes adding '~' to user supplied relative ftp paths,
since today's ftp/fetch.c commit fixes real issue, and v1.314 broke
'ftp' user.
Problems with 'ftp' user reported by Stephen Kirkham of UofA.
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sub | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index fe86a2ca017..5e2d8aa01d6 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.331 2004/02/27 18:02:46 deraadt Exp $ +# $OpenBSD: install.sub,v 1.332 2004/02/28 20:24:14 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 @@ -854,7 +854,7 @@ ftp_error() { # Note: _ftp_server_ip, _ftp_server_dir, _ftp_server_login, # and _ftp_active must be global. install_url() { - local _url_type=$1 _file_list _url_base _oifs _prompt _home _passwd + local _url_type=$1 _file_list _url_base _oifs _prompt _passwd donetconfig @@ -952,10 +952,9 @@ install_url() { # Build up the base url since it is so nasty... _url_base=$_url_type:// if [[ $_url_type == ftp && $_ftp_server_login != anonymous ]]; then - [[ $_ftp_server_dir == /* || $_ftp_server_dir == ~* ]] || _home="~/" _url_base=$_url_base$(encode_for_url "$_ftp_server_login"):$(encode_for_url "$_passwd")@ fi - eval _url_base=$_url_base\$_${_url_type}_server_ip/$_home\$_${_url_type}_server_dir + eval _url_base=$_url_base\$_${_url_type}_server_ip/\$_${_url_type}_server_dir # Get list of files from the server. if [[ $_url_type == ftp && -z $ftp_proxy ]] ; then |