aboutsummaryrefslogtreecommitdiff
path: root/lib/imap.c
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2013-12-17 22:48:09 +0000
committerSteve Holme <steve_holme@hotmail.com>2013-12-17 23:08:32 +0000
commitc0245cc59180e9330f80a8043005f91795c73981 (patch)
tree6e6408e8080f98499ee5914e63f6da3b21afcc82 /lib/imap.c
parent13c696f37f7dc08567811069f7251d7774a43e93 (diff)
email: Renamed *_perform_authenticate() functions
In preparation for the upcoming SASL downgrade feature renamed the imap__perform_authenticate(), pop3__perform_authenticate() and smtp__perform_authenticate() functions.
Diffstat (limited to 'lib/imap.c')
-rw-r--r--lib/imap.c18
1 files changed, 8 insertions, 10 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);