mirror of
https://github.com/curl/curl.git
synced 2025-01-24 14:15:18 +08:00
parent
950b53da0d
commit
5ce7102cea
13
lib/ftp.c
13
lib/ftp.c
@ -773,9 +773,8 @@ static void _state(struct connectdata *conn,
|
||||
static CURLcode ftp_state_user(struct connectdata *conn)
|
||||
{
|
||||
CURLcode result;
|
||||
struct FTP *ftp = conn->data->req.protop;
|
||||
/* send USER */
|
||||
PPSENDF(&conn->proto.ftpc.pp, "USER %s", ftp->user?ftp->user:"");
|
||||
PPSENDF(&conn->proto.ftpc.pp, "USER %s", conn->user?conn->user:"");
|
||||
|
||||
state(conn, FTP_USER);
|
||||
conn->data->state.ftp_trying_alternative = FALSE;
|
||||
@ -2517,7 +2516,6 @@ static CURLcode ftp_state_user_resp(struct connectdata *conn,
|
||||
{
|
||||
CURLcode result = CURLE_OK;
|
||||
struct Curl_easy *data = conn->data;
|
||||
struct FTP *ftp = data->req.protop;
|
||||
struct ftp_conn *ftpc = &conn->proto.ftpc;
|
||||
(void)instate; /* no use for this yet */
|
||||
|
||||
@ -2525,7 +2523,7 @@ static CURLcode ftp_state_user_resp(struct connectdata *conn,
|
||||
if((ftpcode == 331) && (ftpc->state == FTP_USER)) {
|
||||
/* 331 Password required for ...
|
||||
(the server requires to send the user's password too) */
|
||||
PPSENDF(&ftpc->pp, "PASS %s", ftp->passwd?ftp->passwd:"");
|
||||
PPSENDF(&ftpc->pp, "PASS %s", conn->passwd?conn->passwd:"");
|
||||
state(conn, FTP_PASS);
|
||||
}
|
||||
else if(ftpcode/100 == 2) {
|
||||
@ -4358,13 +4356,6 @@ static CURLcode ftp_setup_connection(struct connectdata *conn)
|
||||
/* get some initial data into the ftp struct */
|
||||
ftp->transfer = FTPTRANSFER_BODY;
|
||||
ftp->downloadsize = 0;
|
||||
|
||||
/* No need to duplicate user+password, the connectdata struct won't change
|
||||
during a session, but we re-init them here since on subsequent inits
|
||||
since the conn struct may have changed or been replaced.
|
||||
*/
|
||||
ftp->user = conn->user;
|
||||
ftp->passwd = conn->passwd;
|
||||
conn->proto.ftpc.known_filesize = -1; /* unknown size for now */
|
||||
|
||||
return CURLE_OK;
|
||||
|
@ -7,7 +7,7 @@
|
||||
* | (__| |_| | _ <| |___
|
||||
* \___|\___/|_| \_\_____|
|
||||
*
|
||||
* Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
*
|
||||
* This software is licensed as described in the file COPYING, which
|
||||
* you should have received as part of this distribution. The terms
|
||||
@ -102,8 +102,6 @@ typedef enum {
|
||||
perhaps the Curl_easy is changed between the times the connection is
|
||||
used. */
|
||||
struct FTP {
|
||||
char *user; /* user name string */
|
||||
char *passwd; /* password string */
|
||||
char *path; /* points to the urlpieces struct field */
|
||||
char *pathalloc; /* if non-NULL a pointer to an allocated path */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user