diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/k5-int.h | 5 | ||||
| -rw-r--r-- | src/include/krb5/preauth_plugin.h | 15 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 21519b096..514e2ea6d 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -1105,8 +1105,9 @@ krb5_do_preauth_tryagain(krb5_context context, krb5_kdc_req *request, krb5_data *encoded_request_body, krb5_data *encoded_previous_request, krb5_pa_data **in_padata, krb5_pa_data ***out_padata, - krb5_error *err_reply, krb5_prompter_fct prompter, - void *prompter_data, krb5_clpreauth_rock preauth_rock, + krb5_error *err_reply, krb5_pa_data **err_padata, + krb5_prompter_fct prompter, void *prompter_data, + krb5_clpreauth_rock preauth_rock, krb5_gic_opt_ext *opte); void KRB5_CALLCONV krb5_init_preauth_context(krb5_context); diff --git a/src/include/krb5/preauth_plugin.h b/src/include/krb5/preauth_plugin.h index a0b15a810..f732b947d 100644 --- a/src/include/krb5/preauth_plugin.h +++ b/src/include/krb5/preauth_plugin.h @@ -242,10 +242,14 @@ typedef krb5_error_code krb5_pa_data ***pa_data_out); /* - * Optional: Attempt to use e-data in the error response to try to recover from - * the given error. If this function is provided, and it stores data in - * pa_data_out which is different data from the contents of pa_data_in, then - * the client library will retransmit the request. + * Optional: Attempt to use error and error_padata to try to recover from the + * given error. To work with both FAST and non-FAST errors, an implementation + * should generally consult error_padata rather than decoding error->e_data. + * For non-FAST errors, it contains the e_data decoded as either pa-data or + * typed-data. + * + * If this function is provided, and it returns 0 and stores data in + * pa_data_out, then the client library will retransmit the request. */ typedef krb5_error_code (*krb5_clpreauth_tryagain_fn)(krb5_context context, @@ -257,8 +261,9 @@ typedef krb5_error_code krb5_kdc_req *request, krb5_data *encoded_request_body, krb5_data *encoded_previous_request, - krb5_pa_data *pa_data_in, + krb5_preauthtype pa_type, krb5_error *error, + krb5_pa_data **error_padata, krb5_prompter_fct prompter, void *prompter_data, krb5_pa_data ***pa_data_out); |