Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/gss_sec_ctx.c
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ uint32_t gssntlm_accept_sec_context(uint32_t *minor_status,
uint32_t *time_rec,
gss_cred_id_t *delegated_cred_handle)
{
struct gssntlm_ctx *ctx;
struct gssntlm_ctx *ctx = NULL;
struct gssntlm_cred *cred = NULL;
int lm_compat_lvl = -1;
struct ntlm_buffer challenge = { 0 };
Expand Down Expand Up @@ -1039,13 +1039,15 @@ uint32_t gssntlm_accept_sec_context(uint32_t *minor_status,

if ((retmaj != GSS_S_COMPLETE) &&
(retmaj != GSS_S_CONTINUE_NEEDED)) {
gssntlm_delete_sec_context(&tmpmin, (gss_ctx_id_t *)&ctx, NULL);
if (ctx != (struct gssntlm_ctx *)(*context_handle)) {
gssntlm_delete_sec_context(&tmpmin, (gss_ctx_id_t *)&ctx, NULL);
ctx = NULL;
}
} else {
if (mech_type) *mech_type = discard_const(&gssntlm_oid);
if (ret_flags) *ret_flags = ctx->gss_flags;
if (time_rec) *time_rec = GSS_C_INDEFINITE;
}
*context_handle = (gss_ctx_id_t)ctx;
gssntlm_release_name(&tmpmin, (gss_name_t *)&server_name);
gssntlm_release_name(&tmpmin, (gss_name_t *)&gss_usrname);
gssntlm_release_cred(&tmpmin, (gss_cred_id_t *)&usr_cred);
Expand All @@ -1059,6 +1061,10 @@ uint32_t gssntlm_accept_sec_context(uint32_t *minor_status,
ntlm_free_buffer_data(&enc_sess_key);
ntlm_free_buffer_data(&target_info);

if (ctx != NULL) {
*context_handle = (gss_ctx_id_t)ctx;
}

return GSSERR();
}

Expand Down