diff options
| author | des <des@FreeBSD.org> | 2000-07-21 10:25:33 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2000-07-21 10:25:33 +0000 |
| commit | 2fa9607541dd09eaa3e0c0e2bf73b4b4e0cf403e (patch) | |
| tree | 15f38388efbf14fdc0964b49e7ebc5bbc28a468f /lib | |
| parent | 117993c6a636f09f61a91a62375ab9950e471e41 (diff) | |
| download | FreeBSD-src-2fa9607541dd09eaa3e0c0e2bf73b4b4e0cf403e.zip FreeBSD-src-2fa9607541dd09eaa3e0c0e2bf73b4b4e0cf403e.tar.gz | |
Don't send port number to proxy unless it's not the standard FTP port
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libfetch/ftp.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c index 05f429b..de7d2d8 100644 --- a/lib/libfetch/ftp.c +++ b/lib/libfetch/ftp.c @@ -651,8 +651,12 @@ _ftp_connect(char *host, int port, char *user, char *pwd, char *flags) /* send user name and password */ if (!user || !*user) user = FTP_ANONYMOUS_USER; - e = p ? _ftp_cmd(cd, "USER %s@%s@%d", user, host, port) - : _ftp_cmd(cd, "USER %s", user); + if (p && port == FTP_DEFAULT_PORT) + e = _ftp_cmd(cd, "USER %s@%s", user, host); + else if (p) + e = _ftp_cmd(cd, "USER %s@%s@%d", user, host, port); + else + e = _ftp_cmd(cd, "USER %s", user); /* did the server request a password? */ if (e == FTP_NEED_PASSWORD) { |
