generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

http_negotiate_sspi: Use 'CURLcode result' for CURL result code

Browse Source
This commit is contained in:
Steve Holme 2015-01-17 11:20:35 +00:00
parent a2f8887b79
commit 30eb6bbdc9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/http_negotiate_sspi.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -56,7 +56,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
TimeStamp expiry; TimeStamp expiry;
int ret; int ret;
size_t len = 0, input_token_len = 0; size_t len = 0, input_token_len = 0;
CURLcode error; CURLcode result;
/* Point to the username and password */ /* Point to the username and password */
const char *userp; const char *userp;
@ -141,8 +141,8 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
if(userp && *userp) { if(userp && *userp) {
/* Populate our identity structure */ /* Populate our identity structure */
error = Curl_create_sspi_identity(userp, passwdp, &neg_ctx->identity); result = Curl_create_sspi_identity(userp, passwdp, &neg_ctx->identity);
if(error) if(result)
return -1; return -1;
/* Allow proper cleanup of the identity structure */ /* Allow proper cleanup of the identity structure */
@ -163,10 +163,10 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
return -1; return -1;
} }
else { else {
error = Curl_base64_decode(header, result = Curl_base64_decode(header,
(unsigned char **)&input_token, (unsigned char **)&input_token,
&input_token_len); &input_token_len);
if(error || !input_token_len) if(result || !input_token_len)
return -1; return -1;
} }