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

kdc: remove unused label in _kdc_gss_mk_pa_reply()

Browse Source 
_kdc_gss_mk_pa_reply() out: label was unused. remove it.
This commit is contained in:
Luke Howard
2021-08-15 20:55:31 +10:00
parent 5fb3cc998e
commit 576ce5d663
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
kdc/gss_preauth.c
View File

@@ -579,7 +579,7 @@ _kdc_gss_mk_pa_reply(astgs_request_t r,
ret = _kdc_find_etype(r, kfe, req->req_body.etype.val, ret = _kdc_find_etype(r, kfe, req->req_body.etype.val,
req->req_body.etype.len, &enctype, NULL, NULL); req->req_body.etype.len, &enctype, NULL, NULL);
if (ret) if (ret)
goto out; return ret;
ret = _krb5_gss_pa_derive_key(r->context, gcp->context_handle, ret = _krb5_gss_pa_derive_key(r->context, gcp->context_handle,
req->req_body.nonce, req->req_body.nonce,
@@ -587,7 +587,7 @@ _kdc_gss_mk_pa_reply(astgs_request_t r,
if (ret) { if (ret) {
kdc_log(r->context, r->config, 10, kdc_log(r->context, r->config, 10,
"Failed to derive GSS reply key: %d", ret); "Failed to derive GSS reply key: %d", ret);
goto out; return ret;
} }
krb5_free_keyblock_contents(r->context, &r->reply_key); krb5_free_keyblock_contents(r->context, &r->reply_key);
@@ -596,27 +596,26 @@ _kdc_gss_mk_pa_reply(astgs_request_t r,
} else if (gcp->major == GSS_S_CONTINUE_NEEDED) { } else if (gcp->major == GSS_S_CONTINUE_NEEDED) {
ret = pa_gss_set_context_state(r, gcp); ret = pa_gss_set_context_state(r, gcp);
if (ret) if (ret)
goto out; return ret;
} }
/* only return padata in error case if we have an error token */ /* only return padata in error case if we have an error token */
if (!GSS_ERROR(gcp->major) || gcp->output_token.length) { if (!GSS_ERROR(gcp->major) || gcp->output_token.length) {
ret = krb5_padata_add(r->context, &r->outpadata, KRB5_PADATA_GSS, ret = krb5_padata_add(r->context, &r->outpadata, KRB5_PADATA_GSS,
gcp->output_token.value, gcp->output_token.length); gcp->output_token.value, gcp->output_token.length);
if (ret) if (ret)
goto out; return ret;
/* token is now owned by outpadata */ /* token is now owned by outpadata */
gcp->output_token.length = 0; gcp->output_token.length = 0;
gcp->output_token.value = NULL; gcp->output_token.value = NULL;
} }
if (gcp->major == GSS_S_CONTINUE_NEEDED) if (gcp->major == GSS_S_CONTINUE_NEEDED)
ret = KRB5_KDC_ERR_MORE_PREAUTH_DATA_REQUIRED; ret = KRB5_KDC_ERR_MORE_PREAUTH_DATA_REQUIRED;
else else
ret = _krb5_gss_map_error(gcp->major, gcp->minor); ret = _krb5_gss_map_error(gcp->major, gcp->minor);
out:
return ret; return ret;
} }