svn rev #24150: branches/plugins/src/ include/ kdc/ lib/crypto/crypto_tests/ ...
tsitkova@MIT.EDU
tsitkova at MIT.EDU
Wed Jun 30 10:56:41 EDT 2010
http://src.mit.edu/fisheye/changelog/krb5/?cs=24150
Commit By: tsitkova
Log Message:
Renamed pl_handle into pl_manager in krb5_context structure.
Changed Files:
U branches/plugins/src/include/k5-int.h
U branches/plugins/src/kdc/enc_challenge.c
U branches/plugins/src/lib/crypto/crypto_tests/t_prng.c
U branches/plugins/src/lib/kadm5/srv/server_misc.c
U branches/plugins/src/lib/krb5/krb/get_in_tkt.c
U branches/plugins/src/lib/krb5/krb/init_ctx.c
Modified: branches/plugins/src/include/k5-int.h
===================================================================
--- branches/plugins/src/include/k5-int.h 2010-06-28 21:32:54 UTC (rev 24149)
+++ branches/plugins/src/include/k5-int.h 2010-06-30 14:56:40 UTC (rev 24150)
@@ -1515,7 +1515,7 @@
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 */
Modified: branches/plugins/src/kdc/enc_challenge.c
===================================================================
--- branches/plugins/src/kdc/enc_challenge.c 2010-06-28 21:32:54 UTC (rev 24149)
+++ branches/plugins/src/kdc/enc_challenge.c 2010-06-30 14:56:40 UTC (rev 24150)
@@ -10,7 +10,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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;
}
Modified: branches/plugins/src/lib/crypto/crypto_tests/t_prng.c
===================================================================
--- branches/plugins/src/lib/crypto/crypto_tests/t_prng.c 2010-06-28 21:32:54 UTC (rev 24149)
+++ branches/plugins/src/lib/crypto/crypto_tests/t_prng.c 2010-06-30 14:56:40 UTC (rev 24150)
@@ -48,32 +48,7 @@
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 )
Modified: branches/plugins/src/lib/kadm5/srv/server_misc.c
===================================================================
--- branches/plugins/src/lib/kadm5/srv/server_misc.c 2010-06-28 21:32:54 UTC (rev 24149)
+++ branches/plugins/src/lib/kadm5/srv/server_misc.c 2010-06-30 14:56:40 UTC (rev 24150)
@@ -52,21 +52,21 @@
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,
Modified: branches/plugins/src/lib/krb5/krb/get_in_tkt.c
===================================================================
--- branches/plugins/src/lib/krb5/krb/get_in_tkt.c 2010-06-28 21:32:54 UTC (rev 24149)
+++ branches/plugins/src/lib/krb5/krb/get_in_tkt.c 2010-06-30 14:56:40 UTC (rev 24150)
@@ -1053,7 +1053,7 @@
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);
}
Modified: branches/plugins/src/lib/krb5/krb/init_ctx.c
===================================================================
--- branches/plugins/src/lib/krb5/krb/init_ctx.c 2010-06-28 21:32:54 UTC (rev 24149)
+++ branches/plugins/src/lib/krb5/krb/init_ctx.c 2010-06-30 14:56:40 UTC (rev 24150)
@@ -179,9 +179,9 @@
/* 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) */
More information about the cvs-krb5
mailing list