summaryrefslogtreecommitdiff
path: root/lib/http_ntlm.c
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2019-05-11 12:57:42 +0100
committerSteve Holme <steve_holme@hotmail.com>2019-05-12 18:37:00 +0100
commit52dfab65d6822d1281bb62ebc5c46cd2b7501487 (patch)
tree7af042b2ee44ac4912a16f031364cd9908dbed27 /lib/http_ntlm.c
parent4d8461ae8aef6140d7b3222dda6c3e078ad076be (diff)
downloadcurl-52dfab65d6822d1281bb62ebc5c46cd2b7501487.tar.gz
auth: Rename the various authentication clean up functions
For consistency and to a avoid confusion. Closes #3869
Diffstat (limited to 'lib/http_ntlm.c')
-rw-r--r--lib/http_ntlm.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/http_ntlm.c b/lib/http_ntlm.c
index aaf8a3deb..afc7f75d3 100644
--- a/lib/http_ntlm.c
+++ b/lib/http_ntlm.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -88,11 +88,11 @@ CURLcode Curl_input_ntlm(struct connectdata *conn,
else {
if(ntlm->state == NTLMSTATE_LAST) {
infof(conn->data, "NTLM auth restarted\n");
- Curl_http_ntlm_cleanup(conn);
+ Curl_http_auth_cleanup_ntlm(conn);
}
else if(ntlm->state == NTLMSTATE_TYPE3) {
infof(conn->data, "NTLM handshake rejected\n");
- Curl_http_ntlm_cleanup(conn);
+ Curl_http_auth_cleanup_ntlm(conn);
ntlm->state = NTLMSTATE_NONE;
return CURLE_REMOTE_ACCESS_DENIED;
}
@@ -241,13 +241,13 @@ CURLcode Curl_output_ntlm(struct connectdata *conn, bool proxy)
return CURLE_OK;
}
-void Curl_http_ntlm_cleanup(struct connectdata *conn)
+void Curl_http_auth_cleanup_ntlm(struct connectdata *conn)
{
- Curl_auth_ntlm_cleanup(&conn->ntlm);
- Curl_auth_ntlm_cleanup(&conn->proxyntlm);
+ Curl_auth_cleanup_ntlm(&conn->ntlm);
+ Curl_auth_cleanup_ntlm(&conn->proxyntlm);
#if defined(NTLM_WB_ENABLED)
- Curl_ntlm_wb_cleanup(conn);
+ Curl_http_auth_cleanup_ntlm_wb(conn);
#endif
}