]> granicus.if.org Git - curl/commitdiff
ntlm: We prefer 'CURLcode result'
authorSteve Holme <steve_holme@hotmail.com>
Fri, 14 Nov 2014 20:43:15 +0000 (20:43 +0000)
committerSteve Holme <steve_holme@hotmail.com>
Fri, 14 Nov 2014 22:00:04 +0000 (22:00 +0000)
lib/curl_ntlm_msgs.c

index 5112b5369cb5b3b2656f064d8ceddfe1ea4685b8..f23a306a81836fb9790f8e50e04aa049553442b8 100644 (file)
@@ -276,17 +276,17 @@ CURLcode Curl_ntlm_decode_type2_message(struct SessionHandle *data,
                                         (*) -> Optional
   */
 
+  CURLcode result = CURLE_OK;
   size_t size = 0;
   unsigned char *buffer = NULL;
-  CURLcode error;
 
 #if defined(CURL_DISABLE_VERBOSE_STRINGS) || defined(USE_WINDOWS_SSPI)
   (void)data;
 #endif
 
-  error = Curl_base64_decode(header, &buffer, &size);
-  if(error)
-    return error;
+  result = Curl_base64_decode(header, &buffer, &size);
+  if(result)
+    return result;
 
   if(!buffer) {
     infof(data, "NTLM handshake failure (empty type-2 message)\n");
@@ -312,11 +312,11 @@ CURLcode Curl_ntlm_decode_type2_message(struct SessionHandle *data,
   memcpy(ntlm->nonce, &buffer[24], 8);
 
   if(ntlm->flags & NTLMFLAG_NEGOTIATE_TARGET_INFO) {
-    error = Curl_ntlm_decode_type2_target(data, buffer, size, ntlm);
-    if(error) {
+    result = Curl_ntlm_decode_type2_target(data, buffer, size, ntlm);
+    if(result) {
       free(buffer);
       infof(data, "NTLM handshake failure (bad type-2 message)\n");
-      return error;
+      return result;
     }
   }
 
@@ -332,7 +332,7 @@ CURLcode Curl_ntlm_decode_type2_message(struct SessionHandle *data,
   free(buffer);
 #endif
 
-  return CURLE_OK;
+  return result;
 }
 
 #ifndef USE_WINDOWS_SSPI