]> granicus.if.org Git - curl/commitdiff
http_negotiate_sspi: Use correct return type for QuerySecurityPackageInfo()
authorSteve Holme <steve_holme@hotmail.com>
Sat, 17 Jan 2015 11:24:06 +0000 (11:24 +0000)
committerSteve Holme <steve_holme@hotmail.com>
Sat, 17 Jan 2015 13:28:03 +0000 (13:28 +0000)
Use the SECURITY_STATUS typedef rather than a unsigned long for the
QuerySecurityPackageInfo() return and rename the variable as per other
areas of SSPI code.

lib/http_negotiate_sspi.c

index 9aa1dfd45829a38138d62f4319d82af5b1b431fe..207dc49c8d496e0d9bc923500b2a4a5b35420054 100644 (file)
@@ -52,9 +52,9 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
   SecBuffer         out_sec_buff;
   SecBufferDesc     in_buff_desc;
   SecBuffer         in_sec_buff;
+  SECURITY_STATUS   status;
   unsigned long     context_attributes;
   TimeStamp         expiry;
-  int ret;
   size_t len = 0, input_token_len = 0;
   CURLcode result;
 
@@ -106,9 +106,10 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
 
   if(!neg_ctx->output_token) {
     PSecPkgInfo SecurityPackage;
-    ret = s_pSecFn->QuerySecurityPackageInfo((TCHAR *) TEXT(SP_NAME_NEGOTIATE),
-                                             &SecurityPackage);
-    if(ret != SEC_E_OK)
+    status = s_pSecFn->QuerySecurityPackageInfo((TCHAR *)
+                                                TEXT(SP_NAME_NEGOTIATE),
+                                                &SecurityPackage);
+    if(status != SEC_E_OK)
       return -1;
 
     /* Allocate input and output buffers according to the max token size