diff options
author | Daniel Stenberg <daniel@haxx.se> | 2011-11-03 09:54:12 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2011-11-03 09:54:12 +0100 |
commit | 93e57d0628aad62330dc62ff809752a0478824c4 (patch) | |
tree | a88c9f4bbedff4c059c6eb837f7abb8582428fbf /lib/ftp.c | |
parent | a873b95c21700e8e75db7e62b5ac5ef8fc8c9b03 (diff) |
rename ftp_ssl: the struct field is used for many protocols
Now called 'use_ssl' instead, which better matches the current CURLOPT
name and since the option is used for all pingpong protocols (at least)
it makes sense to not use 'ftp' in the name.
Diffstat (limited to 'lib/ftp.c')
-rw-r--r-- | lib/ftp.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -2493,7 +2493,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) } #endif - if(data->set.ftp_ssl && !conn->ssl[FIRSTSOCKET].use) { + if(data->set.use_ssl && !conn->ssl[FIRSTSOCKET].use) { /* We don't have a SSL/TLS connection yet, but FTPS is requested. Try a FTPS connection now */ @@ -2549,7 +2549,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) /* remain in this same state */ } else { - if(data->set.ftp_ssl > CURLUSESSL_TRY) + if(data->set.use_ssl > CURLUSESSL_TRY) /* we failed and CURLUSESSL_CONTROL or CURLUSESSL_ALL is set */ result = CURLE_USE_SSL_FAILED; else @@ -2572,7 +2572,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) case FTP_PBSZ: PPSENDF(&ftpc->pp, "PROT %c", - data->set.ftp_ssl == CURLUSESSL_CONTROL ? 'C' : 'P'); + data->set.use_ssl == CURLUSESSL_CONTROL ? 'C' : 'P'); state(conn, FTP_PROT); break; @@ -2581,10 +2581,10 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) if(ftpcode/100 == 2) /* We have enabled SSL for the data connection! */ conn->ssl[SECONDARYSOCKET].use = - (data->set.ftp_ssl != CURLUSESSL_CONTROL) ? TRUE : FALSE; + (data->set.use_ssl != CURLUSESSL_CONTROL) ? TRUE : FALSE; /* FTP servers typically responds with 500 if they decide to reject our 'P' request */ - else if(data->set.ftp_ssl > CURLUSESSL_CONTROL) + else if(data->set.use_ssl > CURLUSESSL_CONTROL) /* we failed and bails out */ return CURLE_USE_SSL_FAILED; |