From 40b2f581f3b57dd344d50557d9be65ea306e3d25 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Fri, 13 Oct 2006 19:15:17 +0000 Subject: [PATCH] * preauth_plugin.h: Don't use an enum in a public api * kdc_preauth.c (get_etype_info): Rename get_entry_data to avoid shadowing (get_etype_info2): likewise (return_etype_info): likewise (return_pw_salt): likewise (get_entry_data): Update prototype not to use enum in a API ticket: 4377 tatus: open git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18695 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/krb5/preauth_plugin.h | 2 +- src/kdc/kdc_preauth.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/include/krb5/preauth_plugin.h b/src/include/krb5/preauth_plugin.h index b2bca700e..63600fead 100644 --- a/src/include/krb5/preauth_plugin.h +++ b/src/include/krb5/preauth_plugin.h @@ -118,7 +118,7 @@ typedef krb5_error_code (*preauth_get_entry_data_proc)(krb5_context, krb5_kdc_req *, struct _krb5_db_entry_new *, - enum krb5plugin_preauth_entry_request_type, + krb5_int32 request_type, krb5_data **); /* diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c index 6306da381..6a7401552 100644 --- a/src/kdc/kdc_preauth.c +++ b/src/kdc/kdc_preauth.c @@ -560,7 +560,7 @@ get_entry_tl_data(krb5_context context, krb5_db_entry *entry, static krb5_error_code get_entry_data(krb5_context context, krb5_kdc_req *request, krb5_db_entry *entry, - enum krb5plugin_preauth_entry_request_type type, + krb5_int32 type, krb5_data **result) { int i, k; @@ -1109,7 +1109,7 @@ verify_enc_timestamp(krb5_context context, krb5_db_entry *client, krb5_data *req_pkt, krb5_kdc_req *request, krb5_enc_tkt_part *enc_tkt_reply, krb5_pa_data *pa, - preauth_get_entry_data_proc get_entry_data, + preauth_get_entry_data_proc ets_get_entry_data, void *pa_system_context, void **pa_request_context) { @@ -1351,7 +1351,7 @@ cleanup: static krb5_error_code get_etype_info(krb5_context context, krb5_kdc_req *request, krb5_db_entry *client, krb5_db_entry *server, - preauth_get_entry_data_proc get_entry_data, + preauth_get_entry_data_proc etype_get_entry_data, void *pa_system_context, krb5_pa_data *pa_data) { @@ -1368,7 +1368,7 @@ get_etype_info(krb5_context context, krb5_kdc_req *request, static krb5_error_code get_etype_info2(krb5_context context, krb5_kdc_req *request, krb5_db_entry *client, krb5_db_entry *server, - preauth_get_entry_data_proc get_entry_data, + preauth_get_entry_data_proc etype_get_entry_data, void *pa_system_context, krb5_pa_data *pa_data) { @@ -1460,7 +1460,7 @@ return_etype_info2(krb5_context context, krb5_pa_data * padata, krb5_key_data *client_key, krb5_keyblock *encrypting_key, krb5_pa_data **send_pa, - preauth_get_entry_data_proc get_entry_data, + preauth_get_entry_data_proc etype_get_entry_data, void *pa_system_context, void **pa_request_context) { @@ -1477,7 +1477,7 @@ return_etype_info(krb5_context context, krb5_pa_data * padata, krb5_key_data *client_key, krb5_keyblock *encrypting_key, krb5_pa_data **send_pa, - preauth_get_entry_data_proc get_entry_data, + preauth_get_entry_data_proc etypeget_entry_data, void *pa_system_context, void **pa_request_context) { @@ -1490,7 +1490,7 @@ return_pw_salt(krb5_context context, krb5_pa_data *in_padata, krb5_db_entry *client, krb5_data *req_pkt, krb5_kdc_req *request, krb5_kdc_rep *reply, krb5_key_data *client_key, krb5_keyblock *encrypting_key, krb5_pa_data **send_pa, - preauth_get_entry_data_proc get_entry_data, + preauth_get_entry_data_proc etype_get_entry_data, void *pa_system_context, void **pa_request_context) { @@ -1580,7 +1580,7 @@ return_sam_data(krb5_context context, krb5_pa_data *in_padata, krb5_db_entry *client, krb5_data *req_pkt, krb5_kdc_req *request, krb5_kdc_rep *reply, krb5_key_data *client_key, krb5_keyblock *encrypting_key, krb5_pa_data **send_pa, - preauth_get_entry_data_proc get_entry_data, + preauth_get_entry_data_proc sam_get_entry_data, void *pa_system_context, void **pa_request_context) { @@ -1721,7 +1721,7 @@ static struct { static krb5_error_code get_sam_edata(krb5_context context, krb5_kdc_req *request, krb5_db_entry *client, krb5_db_entry *server, - preauth_get_entry_data_proc get_entry_data, + preauth_get_entry_data_proc sam_get_entry_data, void *pa_system_context, krb5_pa_data *pa_data) { krb5_error_code retval; @@ -2096,7 +2096,7 @@ verify_sam_response(krb5_context context, krb5_db_entry *client, krb5_data *req_pkt, krb5_kdc_req *request, krb5_enc_tkt_part *enc_tkt_reply, krb5_pa_data *pa, - preauth_get_entry_data_proc get_entry_data, + preauth_get_entry_data_proc sam_get_entry_data, void *pa_system_context, void **pa_request_context) { -- 2.26.2