summaryrefslogtreecommitdiff
path: root/ftp
diff options
context:
space:
mode:
authorMichael Haro <mharo@FreeBSD.org>2000-07-31 23:53:11 +0000
committerMichael Haro <mharo@FreeBSD.org>2000-07-31 23:53:11 +0000
commitc6cf6527bfd9932bc72fff838a0a6f04acdd30b6 (patch)
treedada1417c71a26768b255abf4eec56883872b917 /ftp
parentMerge with Vladimir's latest version. (diff)
fix PASV bug introduced in rc2
Submitted by: Jeremy Chadwick <yoshi@parodius.com>
Diffstat (limited to 'ftp')
-rw-r--r--ftp/proftpd-devel/files/patch-ak12
-rw-r--r--ftp/proftpd/files/patch-ak12
2 files changed, 24 insertions, 0 deletions
diff --git a/ftp/proftpd-devel/files/patch-ak b/ftp/proftpd-devel/files/patch-ak
new file mode 100644
index 000000000000..0d8bb08fee5b
--- /dev/null
+++ b/ftp/proftpd-devel/files/patch-ak
@@ -0,0 +1,12 @@
+--- modules/mod_xfer.c.orig Mon Jul 31 16:49:19 2000
++++ modules/mod_xfer.c Mon Jul 31 16:50:02 2000
+@@ -268,7 +268,8 @@
+
+ /* No PORT command has been issued.
+ */
+- if(session.d != NULL || !(session.flags & SF_PORT)) {
++ if(!(session.flags & SF_PASSIVE) &&
++ (session.d != NULL || !(session.flags & SF_PORT))) {
+ add_response_err(R_503, "No PORT command issued first.");
+ return ERROR(cmd);
+ }
diff --git a/ftp/proftpd/files/patch-ak b/ftp/proftpd/files/patch-ak
new file mode 100644
index 000000000000..0d8bb08fee5b
--- /dev/null
+++ b/ftp/proftpd/files/patch-ak
@@ -0,0 +1,12 @@
+--- modules/mod_xfer.c.orig Mon Jul 31 16:49:19 2000
++++ modules/mod_xfer.c Mon Jul 31 16:50:02 2000
+@@ -268,7 +268,8 @@
+
+ /* No PORT command has been issued.
+ */
+- if(session.d != NULL || !(session.flags & SF_PORT)) {
++ if(!(session.flags & SF_PASSIVE) &&
++ (session.d != NULL || !(session.flags & SF_PORT))) {
+ add_response_err(R_503, "No PORT command issued first.");
+ return ERROR(cmd);
+ }