oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

spnego: Minor style cleanup

Browse Source
This commit is contained in:
Nicolas Williams
2021-11-11 22:41:05 -06:00
parent 7a19658c1f
commit 2f31063e97
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/gssapi/spnego/accept_sec_context.c
View File

@@ -456,11 +456,10 @@ select_mech(OM_uint32 *minor_status,
ret = acceptor_approved(minor_status, ctx, name, cred, selected_mech); ret = acceptor_approved(minor_status, ctx, name, cred, selected_mech);
gss_release_name(&junk, &name); gss_release_name(&junk, &name);
} } else {
/* Stash optimistic mech for use by _gss_spnego_require_mechlist_mic() */
/* Stash optimistic mech for use by _gss_spnego_require_mechlist_mic() */
if (ret == GSS_S_COMPLETE && !verify_p)
ret = gss_duplicate_oid(minor_status, &oid, &ctx->preferred_mech_type); ret = gss_duplicate_oid(minor_status, &oid, &ctx->preferred_mech_type);
}
if (ret == GSS_S_COMPLETE) { if (ret == GSS_S_COMPLETE) {
*minor_status = 0; *minor_status = 0;
@@ -767,7 +766,8 @@ acceptor_start
1, /* not optimistic token */ 1, /* not optimistic token */
&advertised_mech); &advertised_mech);
if (ret == GSS_S_COMPLETE) { if (ret == GSS_S_COMPLETE) {
_gss_spnego_log_mech("acceptor selected non-opportunistic mech", ctx->selected_mech_type); _gss_spnego_log_mech("acceptor selected non-opportunistic mech",
ctx->selected_mech_type);
break; break;
} }
} }
@@ -778,17 +778,14 @@ acceptor_start
goto out; goto out;
} }
/* /* The initial token always has a response */
* The initial token always have a response ret = send_accept(minor_status,
*/ ctx,
first_ok,
ret = send_accept (minor_status, &mech_output_token,
ctx, advertised_mech,
first_ok, get_mic ? &ctx->NegTokenInit_mech_types : NULL,
&mech_output_token, output_token);
advertised_mech,
get_mic ? &ctx->NegTokenInit_mech_types : NULL,
output_token);
if (ret) if (ret)
goto out; goto out;