diff options
| -rw-r--r-- | lib/imap.c | 18 | ||||
| -rw-r--r-- | lib/pop3.c | 18 | ||||
| -rw-r--r-- | lib/smtp.c | 14 |
3 files changed, 23 insertions, 27 deletions
diff --git a/lib/imap.c b/lib/imap.c index c257d76cc..547b7904f 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -557,15 +557,13 @@ static CURLcode imap_perform_login(struct connectdata *conn) /*********************************************************************** * - * imap_perform_authenticate() + * imap_perform_authentication() * - * Sends an AUTHENTICATE command allowing the client to login with the - * appropriate SASL authentication mechanism. - * - * Additionally, the function will perform fallback to the LOGIN command - * should a common mechanism not be available between the client and server. + * Initiates the authentication sequence, with the appropriate SASL + * authentication mechanism, falling back to clear text should a common + * mechanism not be available between the client and server. */ -static CURLcode imap_perform_authenticate(struct connectdata *conn) +static CURLcode imap_perform_authentication(struct connectdata *conn) { CURLcode result = CURLE_OK; struct SessionHandle *data = conn->data; @@ -949,14 +947,14 @@ static CURLcode imap_state_capability_resp(struct connectdata *conn, result = imap_perform_starttls(conn); else if(data->set.use_ssl == CURLUSESSL_TRY) /* Fallback and carry on with authentication */ - result = imap_perform_authenticate(conn); + result = imap_perform_authentication(conn); else { failf(data, "STARTTLS not supported."); result = CURLE_USE_SSL_FAILED; } } else - result = imap_perform_authenticate(conn); + result = imap_perform_authentication(conn); } else result = imap_perform_login(conn); @@ -980,7 +978,7 @@ static CURLcode imap_state_starttls_resp(struct connectdata *conn, result = CURLE_USE_SSL_FAILED; } else - result = imap_perform_authenticate(conn); + result = imap_perform_authentication(conn); } else result = imap_perform_upgrade_tls(conn); diff --git a/lib/pop3.c b/lib/pop3.c index d432f9d0f..c2c6bc734 100644 --- a/lib/pop3.c +++ b/lib/pop3.c @@ -574,15 +574,13 @@ static CURLcode pop3_perform_apop(struct connectdata *conn) /*********************************************************************** * - * pop3_perform_authenticate() + * pop3_perform_authentication() * - * Sends an AUTH command allowing the client to login with the appropriate - * SASL authentication mechanism. - * - * Additionally, the function will perform fallback to APOP and USER commands - * should a common mechanism not be available between the client and server. + * Initiates the authentication sequence, with the appropriate SASL + * authentication mechanism, falling back to APOP and clear text should a + * common mechanism not be available between the client and server. */ -static CURLcode pop3_perform_authenticate(struct connectdata *conn) +static CURLcode pop3_perform_authentication(struct connectdata *conn) { CURLcode result = CURLE_OK; struct SessionHandle *data = conn->data; @@ -809,14 +807,14 @@ static CURLcode pop3_state_capa_resp(struct connectdata *conn, int pop3code, result = pop3_perform_starttls(conn); else if(data->set.use_ssl == CURLUSESSL_TRY) /* Fallback and carry on with authentication */ - result = pop3_perform_authenticate(conn); + result = pop3_perform_authentication(conn); else { failf(data, "STLS not supported."); result = CURLE_USE_SSL_FAILED; } } else - result = pop3_perform_authenticate(conn); + result = pop3_perform_authentication(conn); return result; } @@ -837,7 +835,7 @@ static CURLcode pop3_state_starttls_resp(struct connectdata *conn, result = CURLE_USE_SSL_FAILED; } else - result = pop3_perform_authenticate(conn); + result = pop3_perform_authentication(conn); } else result = pop3_perform_upgrade_tls(conn); diff --git a/lib/smtp.c b/lib/smtp.c index 711d3e09f..d4097c567 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -430,12 +430,12 @@ static CURLcode smtp_perform_upgrade_tls(struct connectdata *conn) /*********************************************************************** * - * smtp_perform_authenticate() + * smtp_perform_authentication() * - * Sends an AUTH command allowing the client to login with the appropriate - * SASL authentication mechanism. + * Initiates the authentication sequence, with the appropriate SASL + * authentication mechanism. */ -static CURLcode smtp_perform_authenticate(struct connectdata *conn) +static CURLcode smtp_perform_authentication(struct connectdata *conn) { CURLcode result = CURLE_OK; struct SessionHandle *data = conn->data; @@ -738,7 +738,7 @@ static CURLcode smtp_state_starttls_resp(struct connectdata *conn, result = CURLE_USE_SSL_FAILED; } else - result = smtp_perform_authenticate(conn); + result = smtp_perform_authentication(conn); } else result = smtp_perform_upgrade_tls(conn); @@ -835,14 +835,14 @@ static CURLcode smtp_state_ehlo_resp(struct connectdata *conn, int smtpcode, result = smtp_perform_starttls(conn); else if(data->set.use_ssl == CURLUSESSL_TRY) /* Fallback and carry on with authentication */ - result = smtp_perform_authenticate(conn); + result = smtp_perform_authentication(conn); else { failf(data, "STARTTLS not supported."); result = CURLE_USE_SSL_FAILED; } } else - result = smtp_perform_authenticate(conn); + result = smtp_perform_authentication(conn); } } |