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

send cookie on error and send right error message

Browse Source
This commit is contained in:
Love Hornquist Astrand
2010-01-19 22:04:20 +00:00
committed by Love Hörnquist Åstrand
parent 30cca73765
commit 1fac725de4
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
kdc/kerberos5.c
View File

@@ -2116,26 +2116,25 @@ out:
if (ret) if (ret)
goto out2; goto out2;
if (/* hide_principal */ 0) {
error_client = NULL;
error_server = NULL;
e_text = NULL;
ret = KRB5KDC_ERR_PREAUTH_REQUIRED;
}
ret = krb5_padata_add(context, &error_method, ret = krb5_padata_add(context, &error_method,
KRB5_PADATA_FX_FAST, KRB5_PADATA_FX_ERROR,
e_data.data, e_data.length); e_data.data, e_data.length);
if (ret) { if (ret) {
krb5_data_free(&e_data); krb5_data_free(&e_data);
goto out2; goto out2;
} }
krb5_data_zero(&e_data);
if (/* hide_principal */ 0) {
error_client = NULL;
error_server = NULL;
e_text = NULL;
}
ret = _kdc_fast_mk_response(context, armor_crypto, ret = _kdc_fast_mk_response(context, armor_crypto,
&error_method, NULL, NULL, &error_method, NULL, NULL,
req->req_body.nonce, &e_data); req->req_body.nonce, &e_data);
free_METHOD_DATA(&error_method); free_METHOD_DATA(&error_method);
krb5_data_free(&e_data);
if (ret) if (ret)
goto out2; goto out2;
@@ -2145,6 +2144,12 @@ out:
krb5_data_zero(&e_data); krb5_data_zero(&e_data);
if (ret) if (ret)
goto out2; goto out2;
ret = krb5_padata_add(context, &error_method,
KRB5_PADATA_FX_COOKIE,
NULL, 0);
if (ret)
goto out2;
} }
if (error_method.len) { if (error_method.len) {