generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename ftp_ssl: the struct field is used for many protocols

Browse Source 
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.
This commit is contained in:
Daniel Stenberg
2011-11-03 09:54:12 +01:00
parent a873b95c21
commit 93e57d0628
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/smtp.c
View File

@@ -507,7 +507,7 @@ static CURLcode smtp_state_starttls_resp(struct connectdata *conn,
(void)instate; /* no use for this yet */
if(smtpcode != 220) {
if(data->set.ftp_ssl != CURLUSESSL_TRY) {
if(data->set.use_ssl != CURLUSESSL_TRY) {
failf(data, "STARTTLS denied. %c", smtpcode);
result = CURLE_LOGIN_DENIED;
}
@@ -557,7 +557,7 @@ static CURLcode smtp_state_ehlo_resp(struct connectdata *conn,
(void)instate; /* no use for this yet */
if(smtpcode/100 != 2) {
if((data->set.ftp_ssl <= CURLUSESSL_TRY || conn->ssl[FIRSTSOCKET].use) &&
if((data->set.use_ssl <= CURLUSESSL_TRY || conn->ssl[FIRSTSOCKET].use) &&
!conn->bits.user_passwd)
result = smtp_state_helo(conn);
else {
@@ -565,7 +565,7 @@ static CURLcode smtp_state_ehlo_resp(struct connectdata *conn,
result = CURLE_LOGIN_DENIED;
}
}
else if(data->set.ftp_ssl && !conn->ssl[FIRSTSOCKET].use) {
else if(data->set.use_ssl && !conn->ssl[FIRSTSOCKET].use) {
/* We don't have a SSL/TLS connection yet, but SSL is requested. Switch
to TLS connection now */
result = Curl_pp_sendf(&conn->proto.smtpc.pp, "STARTTLS");