diff options
author | Alex Deymo <deymo@google.com> | 2017-12-19 19:04:07 +0100 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2017-12-20 14:03:33 -0800 |
commit | 486467e11b5904b3e04adc2f5fdb96fcfe65da84 (patch) | |
tree | 492c1de56730f0b42bba1f651aa78c8cac13cfa7 /lib/curl_sasl.c | |
parent | 7d91b4f63bd1fd29c11c9ff1ba6e7c42622e0687 (diff) | |
download | external_curl-486467e11b5904b3e04adc2f5fdb96fcfe65da84.tar.gz external_curl-486467e11b5904b3e04adc2f5fdb96fcfe65da84.tar.bz2 external_curl-486467e11b5904b3e04adc2f5fdb96fcfe65da84.zip |
Update from 7.55.1 to 7.57.0
Update the local patch to match the new config. Removed the
packages/Android/Android.mk file added by upstream (outdated Android.mk
version which will confuse people). Updated Android.bp with the new files.
Bug: http://b/70741465
Test: builds, boots, `vendor/google/tools/fake-ota on streaming` works
Change-Id: Ib2411f5e64db4e11ffd916dc81cd23b46888b900
Diffstat (limited to 'lib/curl_sasl.c')
-rw-r--r-- | lib/curl_sasl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c index bd574b5e..550433d6 100644 --- a/lib/curl_sasl.c +++ b/lib/curl_sasl.c @@ -331,7 +331,8 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn, sasl->authused = SASL_MECH_NTLM; if(force_ir || data->set.sasl_ir) - result = Curl_auth_create_ntlm_type1_message(conn->user, conn->passwd, + result = Curl_auth_create_ntlm_type1_message(data, + conn->user, conn->passwd, &conn->ntlm, &resp, &len); } else @@ -493,7 +494,8 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn, #ifdef USE_NTLM case SASL_NTLM: /* Create the type-1 message */ - result = Curl_auth_create_ntlm_type1_message(conn->user, conn->passwd, + result = Curl_auth_create_ntlm_type1_message(data, + conn->user, conn->passwd, &conn->ntlm, &resp, &len); newstate = SASL_NTLM_TYPE2MSG; break; |