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

bx509: Don't clobber error in get_tgt()

Browse Source
This commit is contained in:
Nicolas Williams
2021-04-21 10:58:20 -05:00
parent 407f12cc0b
commit 76d6ee4abc
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kdc/bx509d.c
View File

@@ -280,6 +280,8 @@ validate_token(struct bx509_request_desc *r)
"from token"); "from token");
ret = krb5_unparse_name(r->context, cprinc, &r->cname); ret = krb5_unparse_name(r->context, cprinc, &r->cname);
krb5_free_principal(r->context, cprinc); krb5_free_principal(r->context, cprinc);
if (ret)
return bad_503(r, ret, "Could not parse principal name");
return ret; return ret;
} }
@@ -1641,6 +1643,8 @@ bnegotiate(struct bx509_request_desc *r)
* bit. * bit.
*/ */
ret = k5_get_creds(r, K5_CREDS_CACHED); ret = k5_get_creds(r, K5_CREDS_CACHED);
if (ret)
return ret;
/* Acquire the Negotiate token and output it */ /* Acquire the Negotiate token and output it */
if (ret == 0 && r->ccname != NULL) if (ret == 0 && r->ccname != NULL)
@@ -1754,9 +1758,10 @@ get_tgt(struct bx509_request_desc *r)
get_tgt_param_cb, r); get_tgt_param_cb, r);
ret = r->ret; ret = r->ret;
/* k5_get_creds() calls bad_req() */
ret = k5_get_creds(r, K5_CREDS_EPHEMERAL); ret = k5_get_creds(r, K5_CREDS_EPHEMERAL);
if (ret) if (ret)
return bad_503(r, ret, "Could not get TGT"); return ret;
fn = strchr(r->ccname, ':'); fn = strchr(r->ccname, ':');
if (fn == NULL) if (fn == NULL)