From: Zhanna Tsitkov Date: Wed, 30 Jun 2010 14:56:40 +0000 (+0000) Subject: Renamed pl_handle into pl_manager in krb5_context structure X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d20f49d0f7cc473cdbe27b9c7fc4937e83cecb60;p=thirdparty%2Fkrb5.git Renamed pl_handle into pl_manager in krb5_context structure git-svn-id: svn://anonsvn.mit.edu/krb5/branches/plugins@24150 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 6b320242ac..54c36a0f7f 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -1515,7 +1515,7 @@ struct _krb5_context { krb5_boolean allow_weak_crypto; /* PLUGIN manager HANDLE */ - plugin_manager *pl_handle; + plugin_manager *pl_manager; }; /* could be used in a table to find an etype and initialize a block */ diff --git a/src/kdc/enc_challenge.c b/src/kdc/enc_challenge.c index 8c6f409b53..950bfd1589 100644 --- a/src/kdc/enc_challenge.c +++ b/src/kdc/enc_challenge.c @@ -10,7 +10,7 @@ int preauth_flags(krb5_context context, krb5_preauthtype pa_type) { int flags = 0; - plhandle handle = plugin_manager_get_service(context->pl_handle, "plugin_pa", 0); + plhandle handle = plugin_manager_get_service(context->pl_manager, "plugin_pa", 0); flags = plugin_preauth_flags(handle, context, pa_type); return flags; @@ -30,7 +30,7 @@ process_preauth(krb5_context context, void *plugin_context, krb5_pa_data ***out_padata) { krb5_error_code ret = 0; - plhandle handle = plugin_manager_get_service(context->pl_handle, "plugin_pa", 0); + plhandle handle = plugin_manager_get_service(context->pl_manager, "plugin_pa", 0); ret = plugin_process_preauth(handle, context, plugin_context, request_context, opt, @@ -52,7 +52,7 @@ kdc_include_padata(krb5_context context, krb5_kdc_req *request, void *pa_module_context, krb5_pa_data *data) { krb5_error_code retval = 0; - plhandle handle = plugin_manager_get_service(context->pl_handle, "plugin_pa", 0); + plhandle handle = plugin_manager_get_service(context->pl_manager, "plugin_pa", 0); retval = plugin_kdc_include_padata(handle, context, request, client, server, @@ -69,7 +69,7 @@ kdc_verify_preauth(krb5_context context, struct _krb5_db_entry_new *client, krb5_data **e_data, krb5_authdata ***authz_data) { krb5_error_code retval = 0; - plhandle handle = plugin_manager_get_service(context->pl_handle, "plugin_pa", 0); + plhandle handle = plugin_manager_get_service(context->pl_manager, "plugin_pa", 0); retval = plugin_kdc_verify_preauth(handle, context, client, req_pkt, request, enc_tkt_reply, data, @@ -89,7 +89,7 @@ kdc_return_preauth(krb5_context context, krb5_pa_data *padata, void *pa_module_context, void **pa_request_context) { krb5_error_code retval = 0; - plhandle handle = plugin_manager_get_service(context->pl_handle, "plugin_pa", 0); + plhandle handle = plugin_manager_get_service(context->pl_manager, "plugin_pa", 0); retval = plugin_kdc_return_preauth(handle, context, padata, client, req_pkt, request, reply, @@ -106,7 +106,7 @@ server_free_reqctx(krb5_context kcontext, void **pa_request_context) { krb5_error_code retval = 0; - plhandle handle = plugin_manager_get_service(kcontext->pl_handle, "plugin_pa", 0); + plhandle handle = plugin_manager_get_service(kcontext->pl_manager, "plugin_pa", 0); retval = plugin_server_free_reqctx(handle, kcontext, pa_module_context, pa_request_context); @@ -116,14 +116,14 @@ krb5_error_code server_init(krb5_context kcontext, void **module_context, const char **realmnames) { krb5_error_code retval = 0; - plhandle handle = plugin_manager_get_service(kcontext->pl_handle, "plugin_pa", 0); + plhandle handle = plugin_manager_get_service(kcontext->pl_manager, "plugin_pa", 0); retval = plugin_server_init(handle, kcontext, module_context, realmnames); return retval; } void server_fini(krb5_context kcontext, void *module_context) { - plhandle handle = plugin_manager_get_service(kcontext->pl_handle, "plugin_pa", 0); + plhandle handle = plugin_manager_get_service(kcontext->pl_manager, "plugin_pa", 0); plugin_server_fini(handle, kcontext, module_context); return; } diff --git a/src/lib/crypto/crypto_tests/t_prng.c b/src/lib/crypto/crypto_tests/t_prng.c index a85e2c38fa..6c5e1ad03a 100644 --- a/src/lib/crypto/crypto_tests/t_prng.c +++ b/src/lib/crypto/crypto_tests/t_prng.c @@ -48,32 +48,7 @@ int main () { krb5_data input, output; unsigned int source_id, seed_length; unsigned int i; -//#if 0 - krb5_context ctx; - plugin_manager* default_manager; - static plugin_manager* plugin_mngr_instance = NULL; -// ret = krb5int_initialize_library(); - //if (ret) return ret; - - ctx = calloc(1, sizeof(struct _krb5_context)); - if (!ctx) return ENOMEM; - - /* Plugin initialization */ - plugin_default_manager_get_instance(&plugin_mngr_instance); - set_plugin_manager_instance(&ctx->pl_handle, plugin_mngr_instance); - plugin_manager_configure(ctx->pl_handle, ""); - plugin_manager_start(ctx->pl_handle); -/* - - default_manager = plugin_default_manager_get_instance(); - set_plugin_manager_instance(default_manager); - - plugin_manager_configure(""); - plugin_manager_start(); -*/ - -//#endif while (1) { /* Read source*/ if (scanf ("%u", &source_id ) == EOF ) diff --git a/src/lib/kadm5/srv/server_misc.c b/src/lib/kadm5/srv/server_misc.c index c748ee3a29..cc2a361437 100644 --- a/src/lib/kadm5/srv/server_misc.c +++ b/src/lib/kadm5/srv/server_misc.c @@ -52,21 +52,21 @@ passwd_check(kadm5_server_handle_t srv_handle, int ret = KADM5_OK; if (srv_handle != NULL && srv_handle->context != NULL && - srv_handle->context->pl_handle != NULL ){ + srv_handle->context->pl_manager != NULL ){ - plugin_handle = plugin_manager_get_service(srv_handle->context->pl_handle, + plugin_handle = plugin_manager_get_service(srv_handle->context->pl_manager, "plugin_pwd_qlty", PWD_QLTY_KRB); ret = plugin_pwd_qlty_check(plugin_handle, srv_handle, password, use_policy, pol, principal); - plugin_handle = plugin_manager_get_service(srv_handle->context->pl_handle, + plugin_handle = plugin_manager_get_service(srv_handle->context->pl_manager, "plugin_pwd_qlty", PWD_QLTY_X); ret = plugin_pwd_qlty_check(plugin_handle, srv_handle, password, use_policy, pol, principal); - plugin_handle = plugin_manager_get_service(srv_handle->context->pl_handle, + plugin_handle = plugin_manager_get_service(srv_handle->context->pl_manager, "plugin_pwd_qlty", PWD_QLTY_DYN); ret = plugin_pwd_qlty_check(plugin_handle, diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index 53ebada9e4..5a290d4ca0 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -1053,7 +1053,7 @@ krb5_init_creds_free(krb5_context context, krb5_free_data_contents(context, &ctx->s2kparams); krb5_free_keyblock_contents(context, &ctx->as_key); // TEMP Zh - context->pl_handle = NULL; + context->pl_manager = NULL; free(ctx); } diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index 91d17ea31a..3cbad3e3ad 100644 --- a/src/lib/krb5/krb/init_ctx.c +++ b/src/lib/krb5/krb/init_ctx.c @@ -179,9 +179,9 @@ init_common (krb5_context *context, krb5_boolean secure, krb5_boolean kdc) /* Plugin initialization */ plugin_default_manager_get_instance(&plugin_mngr_instance); - set_plugin_manager_instance(&ctx->pl_handle, plugin_mngr_instance); - plugin_manager_configure(ctx->pl_handle, conf_path); - plugin_manager_start(ctx->pl_handle); + set_plugin_manager_instance(&ctx->pl_manager, plugin_mngr_instance); + plugin_manager_configure(ctx->pl_manager, conf_path); + plugin_manager_start(ctx->pl_manager); /* initialize the prng (not well, but passable) */