summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2000-12-06 09:23:27 +0000
committerdes <des@FreeBSD.org>2000-12-06 09:23:27 +0000
commit1f1139ecc01785d0e985c57f366ae3135b67276a (patch)
tree92fbcbdabda9a17252dd95b41190ca944ec13341 /lib
parent35ab1437f2af1825409d35daf63f4fae982a493e (diff)
downloadFreeBSD-src-1f1139ecc01785d0e985c57f366ae3135b67276a.zip
FreeBSD-src-1f1139ecc01785d0e985c57f366ae3135b67276a.tar.gz
Somewhere along the line, I misunderstood the whole FTP_PASSIVE_MODE debate
and had libfetch selecting passive mode even when FTP_PASSIVE_MODE was not set at all, which is really quite surprising unless you know about it. So change it to the agreed default behaviour of selecting passive mode if FTP_PASSIVE_MODE is set, but not "no".
Diffstat (limited to 'lib')
-rw-r--r--lib/libfetch/fetch.36
-rw-r--r--lib/libfetch/ftp.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3
index 5f5acb0..9c21fcd 100644
--- a/lib/libfetch/fetch.3
+++ b/lib/libfetch/fetch.3
@@ -422,9 +422,9 @@ and message, e.g. "File is not available (404 Not Found)"
.Sh ENVIRONMENT
.Bl -tag -width FTP_PASSIVE_MODE
.It Ev FTP_PASSIVE_MODE
-The FTP code selects passive mode by default.
-To force active mode FTP, set this variable to
-.Ql no .
+If set to anything but
+.Ql no ,
+forces the FTP code to use passive mode.
.It Ev FTP_PASSWORD
Default FTP password if the remote server requests one and none was
provided in the URL.
diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c
index d9f624e..59d7190 100644
--- a/lib/libfetch/ftp.c
+++ b/lib/libfetch/ftp.c
@@ -464,7 +464,7 @@ _ftp_transfer(int cd, char *oper, char *file,
/* passive mode */
if (!pasv)
- pasv = ((s = getenv("FTP_PASSIVE_MODE")) == NULL ||
+ pasv = ((s = getenv("FTP_PASSIVE_MODE")) != NULL &&
strncasecmp(s, "no", 2) != 0);
/* find our own address, bind, and listen */
OpenPOWER on IntegriCloud