summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-01-07 07:38:35 +0000
committerAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-01-07 07:38:35 +0000
commit707678298e1d72e5dde175c4346126ac899934d3 (patch)
treeb6d55b99d90e3c9309849e79686a29178f5d5b7f
parent3dc89867c370ad13c3155b6134bafcef4e1dfa48 (diff)
Make the -P option effective (rjmooney@mediaone.net)
-rw-r--r--libexec/ftpd/ftpd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index fbd00532a68..50a36f7fe1d 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftpd.c,v 1.86 2001/01/06 18:24:29 millert Exp $ */
+/* $OpenBSD: ftpd.c,v 1.87 2001/01/07 07:38:34 angelos Exp $ */
/* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */
/*
@@ -1369,7 +1369,7 @@ dataconn(name, size, mode)
pdata = -1;
return (NULL);
}
- if (memcmp(fa, ha, alen) != 0) {
+ if (portcheck && memcmp(fa, ha, alen) != 0) {
perror_reply(435, "Can't build data connection");
(void) close(pdata);
(void) close(s);
@@ -1434,7 +1434,7 @@ dataconn(name, size, mode)
data = -1;
return NULL;
}
- if (memcmp(fa, ha, alen) != 0) {
+ if (portcheck && memcmp(fa, ha, alen) != 0) {
perror_reply(435, "Can't build data connection");
(void) fclose(file);
data = -1;