From 3c053a2e094807af6e5f7c3338f09622098b809a Mon Sep 17 00:00:00 2001 From: Love Hornquist Astrand Date: Thu, 16 Jul 2009 22:21:59 -0700 Subject: [PATCH] fix up the paranoid code to make it work with ipv6. --- appl/ftp/ftpd/ftpcmd.y | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appl/ftp/ftpd/ftpcmd.y b/appl/ftp/ftpd/ftpcmd.y index 07da7a460..5fb8e8e2e 100644 --- a/appl/ftp/ftpd/ftpcmd.y +++ b/appl/ftp/ftpd/ftpcmd.y @@ -155,11 +155,11 @@ cmd { if ($5) { if (paranoid && - (data_dest->sa_family != AF_INET || - (ntohs(data_dest->sin_port) < IPPORT_RESERVED) || - memcmp(data_dest->sin_addr, - &his_addr->sin_addr, - sizeof(data_dest.sin_addr)) != 0)) { + (data_dest->sa_family != his_addr->sa_family || + (socket_get_port(data_dest) < IPPORT_RESERVED) || + memcmp(socket_get_address(data_dest), + socket_get_address(his_addr), + socket_addr_size(his_addr)) != 0)) { usedefault = 1; reply(500, "Illegal PORT range rejected."); } else {