Permalink
Browse files

negotiate sspi: fix sequential requests

  • Loading branch information...
1 parent 0c8e6f5 commit 48a40f04025ed4f8bc9818992862596af410e8a5 Marcel Roelofs committed with bagder May 16, 2011
Showing with 15 additions and 14 deletions.
  1. +15 −14 lib/http_negotiate_sspi.c
View
@@ -133,7 +133,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
(ret = get_gss_name(conn, proxy, neg_ctx->server_name)))
return ret;
- if(!neg_ctx->max_token_length) {
+ if(!neg_ctx->output_token) {
PSecPkgInfo SecurityPackage;
ret = s_pSecFn->QuerySecurityPackageInfo((SEC_CHAR *)"Negotiate",
&SecurityPackage);
@@ -153,19 +153,8 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
header++;
len = strlen(header);
- if(len > 0) {
- input_token = malloc(neg_ctx->max_token_length);
- if(!input_token)
- return -1;
-
- input_token_len = Curl_base64_decode(header,
- (unsigned char **)&input_token);
- if(input_token_len == 0)
- return -1;
- }
-
- if(!input_token) {
- /* first call in a new negotation, we have to require credentials,
+ if(!len) {
+ /* first call in a new negotation, we have to acquire credentials,
and allocate memory for the context */
neg_ctx->credentials = (CredHandle *)malloc(sizeof(CredHandle));
@@ -182,6 +171,16 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
if(neg_ctx->status != SEC_E_OK)
return -1;
}
+ else {
+ input_token = malloc(neg_ctx->max_token_length);
+ if(!input_token)
+ return -1;
+
+ input_token_len = Curl_base64_decode(header,
+ (unsigned char **)&input_token);
+ if(input_token_len == 0)
+ return -1;
+ }
/* prepare the output buffers, and input buffers if present */
out_buff_desc.ulVersion = 0;
@@ -280,6 +279,8 @@ static void cleanup(struct negotiatedata *neg_ctx)
free(neg_ctx->output_token);
neg_ctx->output_token = 0;
}
+
+ neg_ctx->max_token_length = 0;
}
void Curl_cleanup_negotiate(struct SessionHandle *data)

0 comments on commit 48a40f0

Please sign in to comment.