Commit 93e57d06 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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.
parent a873b95c

lib/ftp.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -2493,7 +2493,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) 
      }

      }

#endif

#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

        /* We don't have a SSL/TLS connection yet, but FTPS is

           requested. Try a FTPS connection now */

           requested. Try a FTPS connection now */
@@ -2549,7 +2549,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) 
        /* remain in this same state */

        /* remain in this same state */

      }

      }

      else {

      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 */

          /* we failed and CURLUSESSL_CONTROL or CURLUSESSL_ALL is set */

          result = CURLE_USE_SSL_FAILED;

          result = CURLE_USE_SSL_FAILED;

        else

        else
@@ -2572,7 +2572,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) 




    case FTP_PBSZ:

    case FTP_PBSZ:

      PPSENDF(&ftpc->pp, "PROT %c",

      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);

      state(conn, FTP_PROT);





      break;

      break;
@@ -2581,10 +2581,10 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) 
      if(ftpcode/100 == 2)

      if(ftpcode/100 == 2)

        /* We have enabled SSL for the data connection! */

        /* We have enabled SSL for the data connection! */

        conn->ssl[SECONDARYSOCKET].use =

        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

      /* FTP servers typically responds with 500 if they decide to reject

         our 'P' request */

         our 'P' request */

      else if(data->set.ftp_ssl > CURLUSESSL_CONTROL)

      else if(data->set.use_ssl > CURLUSESSL_CONTROL)

        /* we failed and bails out */

        /* we failed and bails out */

        return CURLE_USE_SSL_FAILED;

        return CURLE_USE_SSL_FAILED;

lib/imap.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -580,7 +580,7 @@ static CURLcode imap_statemach_act(struct connectdata *conn) 
      return CURLE_FTP_WEIRD_SERVER_REPLY;

      return CURLE_FTP_WEIRD_SERVER_REPLY;

    }

    }





    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 SSL is requested. Switch

      /* We don't have a SSL/TLS connection yet, but SSL is requested. Switch

         to TLS connection now */

         to TLS connection now */

      const char *str;

      const char *str;

lib/pop3.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -521,7 +521,7 @@ static CURLcode pop3_statemach_act(struct connectdata *conn) 
        return CURLE_FTP_WEIRD_SERVER_REPLY;

        return CURLE_FTP_WEIRD_SERVER_REPLY;

      }

      }





      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 SSL is requested. Switch

        /* We don't have a SSL/TLS connection yet, but SSL is requested. Switch

           to TLS connection now */

           to TLS connection now */

        result = Curl_pp_sendf(&pop3c->pp, "STLS");

        result = Curl_pp_sendf(&pop3c->pp, "STLS");

lib/smtp.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -507,7 +507,7 @@ static CURLcode smtp_state_starttls_resp(struct connectdata *conn, 
  (void)instate; /* no use for this yet */

  (void)instate; /* no use for this yet */





  if(smtpcode != 220) {

  if(smtpcode != 220) {

    if(data->set.ftp_ssl != CURLUSESSL_TRY) {

    if(data->set.use_ssl != CURLUSESSL_TRY) {

      failf(data, "STARTTLS denied. %c", smtpcode);

      failf(data, "STARTTLS denied. %c", smtpcode);

      result = CURLE_LOGIN_DENIED;

      result = CURLE_LOGIN_DENIED;

    }

    }
@@ -557,7 +557,7 @@ static CURLcode smtp_state_ehlo_resp(struct connectdata *conn, 
  (void)instate; /* no use for this yet */

  (void)instate; /* no use for this yet */





  if(smtpcode/100 != 2) {

  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)

     !conn->bits.user_passwd)

      result = smtp_state_helo(conn);

      result = smtp_state_helo(conn);

    else {

    else {
@@ -565,7 +565,7 @@ static CURLcode smtp_state_ehlo_resp(struct connectdata *conn, 
      result = CURLE_LOGIN_DENIED;

      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

    /* We don't have a SSL/TLS connection yet, but SSL is requested. Switch

       to TLS connection now */

       to TLS connection now */

    result = Curl_pp_sendf(&conn->proto.smtpc.pp, "STARTTLS");

    result = Curl_pp_sendf(&conn->proto.smtpc.pp, "STARTTLS");

lib/url.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2169,7 +2169,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 
    /*

    /*

     * Make transfers attempt to use SSL/TLS.

     * Make transfers attempt to use SSL/TLS.

     */

     */

    data->set.ftp_ssl = (curl_usessl)va_arg(param, long);

    data->set.use_ssl = (curl_usessl)va_arg(param, long);

    break;

    break;

#endif

#endif

  case CURLOPT_FTPSSLAUTH:

  case CURLOPT_FTPSSLAUTH: