From 992fb27ec3de036c66ff7953e789d4318a85f3b6 Mon Sep 17 00:00:00 2001 From: Ricardo Ferreira Ribeiro Date: Mon, 8 Jun 2026 06:39:23 +0000 Subject: [PATCH] Remove unused Ftp::Gateway::proxy_host (#2440) The data member is effectively unused since inception in 1997 commit 3fdadc7 and is in the way of other FTP fixes. This is a Measurement Factory project. --- src/clients/FtpGateway.cc | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/clients/FtpGateway.cc b/src/clients/FtpGateway.cc index 71c3e8d1f6..e9031ce41a 100644 --- a/src/clients/FtpGateway.cc +++ b/src/clients/FtpGateway.cc @@ -115,7 +115,6 @@ public: char *filepath; char *dirpath; int64_t restart_offset; - char *proxy_host; size_t list_width; String cwd_message; char *old_filepath; @@ -341,7 +340,6 @@ Ftp::Gateway::Gateway(FwdState *fwdState): filepath(nullptr), dirpath(nullptr), restart_offset(0), - proxy_host(nullptr), list_width(0), old_filepath(nullptr), typecode('\0') @@ -1291,10 +1289,7 @@ ftpSendUser(Ftp::Gateway * ftpState) if (!ftpState || !ftpState->haveControlChannel("ftpSendUser")) return; - if (ftpState->proxy_host != nullptr) - snprintf(cbuf, CTRL_BUFLEN, "USER %s@%s\r\n", ftpState->user, ftpState->request->url.host()); - else - snprintf(cbuf, CTRL_BUFLEN, "USER %s\r\n", ftpState->user); + snprintf(cbuf, CTRL_BUFLEN, "USER %s\r\n", ftpState->user); ftpState->writeCommand(cbuf); -- 2.47.3