diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2019-01-02 18:04:58 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-01-11 15:35:13 +0100 |
| commit | ba243235ec04af62aee2cfc31bf0f05488e59fe7 (patch) | |
| tree | 0f6584b31330f15dbbef48afefd00c1c51e686ea /lib/curl_sasl.c | |
| parent | 61faa0b420c236480bc9ef6fd52b4ecc1e0f8d17 (diff) | |
| download | curl-ba243235ec04af62aee2cfc31bf0f05488e59fe7.tar.gz | |
urldata: rename easy_conn to just conn
We use "conn" everywhere to be a pointer to the connection.
Introduces two functions that "attaches" and "detaches" the connection
to and from the transfer.
Going forward, we should favour using "data->conn" (since a transfer
always only has a single connection or none at all) to "conn->data"
(since a connection can have none, one or many transfers associated with
it and updating conn->data to be correct is error prone and a frequent
reason for internal issues).
Closes #3442
Diffstat (limited to 'lib/curl_sasl.c')
| -rw-r--r-- | lib/curl_sasl.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c index 354bc5448..9e1a72e5e 100644 --- a/lib/curl_sasl.c +++ b/lib/curl_sasl.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2012 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2012 - 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 @@ -300,8 +300,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn, result = Curl_auth_create_gssapi_user_message(data, conn->user, conn->passwd, service, - data->easy_conn-> - host.name, + data->conn->host.name, sasl->mutual_auth, NULL, &conn->krb5, &resp, &len); @@ -517,7 +516,7 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn, result = Curl_auth_create_gssapi_user_message(data, conn->user, conn->passwd, service, - data->easy_conn->host.name, + data->conn->host.name, sasl->mutual_auth, NULL, &conn->krb5, &resp, &len); |