From 466548cd7dcf48effba7e9839ac967e4c5b16448 Mon Sep 17 00:00:00 2001 From: Zhanna Tsitkov Date: Wed, 30 Jun 2010 21:05:43 +0000 Subject: [PATCH] Remove set_plugin_manager_instance API. Minor cleaning around plugin_id git-svn-id: svn://anonsvn.mit.edu/krb5/branches/plugins@24154 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/kadm5/srv/server_misc.c | 5 ++++ src/lib/krb5/krb/init_ctx.c | 3 +- src/plugin_core/libplugin_core.exports | 1 - src/plugin_core/plugin_manager.c | 30 ++++++++----------- src/plugin_core/plugin_manager.h | 11 +++---- src/plugins/pwd_qlty/plugin_pwd_qlty.h | 5 ---- .../plugin_pwd_qlty_DYN_impl.c | 5 ++-- .../plugin_pwd_qlty_X_impl.c | 1 - .../plugin_pwd_qlty_krb_impl.c | 1 - 9 files changed, 24 insertions(+), 38 deletions(-) diff --git a/src/lib/kadm5/srv/server_misc.c b/src/lib/kadm5/srv/server_misc.c index cc2a361437..bccb685583 100644 --- a/src/lib/kadm5/srv/server_misc.c +++ b/src/lib/kadm5/srv/server_misc.c @@ -43,6 +43,11 @@ adb_policy_close(kadm5_server_handle_t handle) /* some of this is stolen from gatekeeper ... */ /* passwd_check - returns KADM5_OK if password passes the validation.*/ + +#define PWD_QLTY_KRB 0 +#define PWD_QLTY_X 1 +#define PWD_QLTY_DYN 33 + kadm5_ret_t passwd_check(kadm5_server_handle_t srv_handle, char *password, int use_policy, kadm5_policy_ent_t pol, diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index 3cbad3e3ad..dcddcf50cf 100644 --- a/src/lib/krb5/krb/init_ctx.c +++ b/src/lib/krb5/krb/init_ctx.c @@ -178,8 +178,7 @@ 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_manager, plugin_mngr_instance); + plugin_default_manager_get_instance(&ctx->pl_manager); plugin_manager_configure(ctx->pl_manager, conf_path); plugin_manager_start(ctx->pl_manager); diff --git a/src/plugin_core/libplugin_core.exports b/src/plugin_core/libplugin_core.exports index 54072372c2..cf228df66f 100644 --- a/src/plugin_core/libplugin_core.exports +++ b/src/plugin_core/libplugin_core.exports @@ -1,7 +1,6 @@ get_factory_content plugin_manager_configure plugin_manager_get_service -set_plugin_manager_instance plugin_manager_start plugin_manager_stop create_api diff --git a/src/plugin_core/plugin_manager.c b/src/plugin_core/plugin_manager.c index 647044d173..1e8480b047 100644 --- a/src/plugin_core/plugin_manager.c +++ b/src/plugin_core/plugin_manager.c @@ -5,41 +5,35 @@ #include "plugin_manager.h" #include -void -set_plugin_manager_instance(plugin_manager **_instance, plugin_manager* manager) -{ - *_instance = manager; -} - int -plugin_manager_configure(plugin_manager* _instance,const char* path) +plugin_manager_configure(plugin_manager* instance,const char* path) { - if (_instance != NULL) { - _instance->configure(_instance->data, path); + if (instance != NULL) { + instance->configure(instance->data, path); } return 0; } -void plugin_manager_start(plugin_manager* _instance) +void plugin_manager_start(plugin_manager* instance) { - if (_instance != NULL) { - _instance->start(_instance->data); + if (instance != NULL) { + instance->start(instance->data); } } -void plugin_manager_stop(plugin_manager* _instance) +void plugin_manager_stop(plugin_manager* instance) { - if (_instance != NULL) { - _instance->stop(_instance->data); + if (instance != NULL) { + instance->stop(instance->data); } } plhandle -plugin_manager_get_service(plugin_manager* _instance, const char* service_name, const int pl_id) +plugin_manager_get_service(plugin_manager* instance, const char* service_name, const int pl_id) { plhandle handle; - if (_instance != NULL) { - handle = _instance->getService(_instance->data, service_name, pl_id); + if (instance != NULL) { + handle = instance->getService(instance->data, service_name, pl_id); } else { handle.api = NULL; } diff --git a/src/plugin_core/plugin_manager.h b/src/plugin_core/plugin_manager.h index b2311864b0..c386586e09 100644 --- a/src/plugin_core/plugin_manager.h +++ b/src/plugin_core/plugin_manager.h @@ -8,12 +8,9 @@ #include -void set_plugin_manager_instance(plugin_manager** _instance,plugin_manager*); - -/* Utility functions */ -int plugin_manager_configure(plugin_manager* _instance,const char*); -void plugin_manager_start(plugin_manager* _instance); -void plugin_manager_stop(plugin_manager* _instance); -plhandle plugin_manager_get_service(plugin_manager* _instance,const char*, const int); +plhandle plugin_manager_get_service(plugin_manager* instance,const char*, const int); +int plugin_manager_configure(plugin_manager* instance,const char*); +void plugin_manager_start(plugin_manager* instance); +void plugin_manager_stop(plugin_manager* instance); #endif /* PLUGIN_MANAGER_H_ */ diff --git a/src/plugins/pwd_qlty/plugin_pwd_qlty.h b/src/plugins/pwd_qlty/plugin_pwd_qlty.h index 51c79c7018..4921be8161 100644 --- a/src/plugins/pwd_qlty/plugin_pwd_qlty.h +++ b/src/plugins/pwd_qlty/plugin_pwd_qlty.h @@ -11,14 +11,9 @@ #include #include -#define PWD_QLTY_KRB 0 -#define PWD_QLTY_X 1 -#define PWD_QLTY_DYN 33 - /* PWD_QLTY API */ typedef struct { int version; - int plugin_id; kadm5_ret_t (*pwd_qlty_init)(kadm5_server_handle_t); void (*pwd_qlty_cleanup)(); kadm5_ret_t (*pwd_qlty_check)(kadm5_server_handle_t, char*, diff --git a/src/plugins/pwd_qlty/plugin_pwd_qlty_DYN/plugin_pwd_qlty_DYN_impl.c b/src/plugins/pwd_qlty/plugin_pwd_qlty_DYN/plugin_pwd_qlty_DYN_impl.c index 632693df0c..4f443ee6c1 100644 --- a/src/plugins/pwd_qlty/plugin_pwd_qlty_DYN/plugin_pwd_qlty_DYN_impl.c +++ b/src/plugins/pwd_qlty/plugin_pwd_qlty_DYN/plugin_pwd_qlty_DYN_impl.c @@ -16,9 +16,9 @@ _plugin_pwd_qlty_check(kadm5_server_handle_t srv_handle, { -#ifdef DEBUG_PLUGINS +//#ifdef DEBUG_PLUGINS printf("Plugin pwd qlty DYNAMIC >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"); -#endif +// #endif return 0; } @@ -43,7 +43,6 @@ plugin_pwd_qlty_DYN_create() memset(api, 0, sizeof(plugin_pwd_qlty)); api->version = 1; - api->plugin_id = PWD_QLTY_DYN; api->pwd_qlty_init = _plugin_pwd_qlty_init; api->pwd_qlty_check = _plugin_pwd_qlty_check; api->pwd_qlty_cleanup = _plugin_pwd_qlty_clean; diff --git a/src/plugins/pwd_qlty/plugin_pwd_qlty_X/plugin_pwd_qlty_X_impl.c b/src/plugins/pwd_qlty/plugin_pwd_qlty_X/plugin_pwd_qlty_X_impl.c index cd99926f54..eaf0871e24 100644 --- a/src/plugins/pwd_qlty/plugin_pwd_qlty_X/plugin_pwd_qlty_X_impl.c +++ b/src/plugins/pwd_qlty/plugin_pwd_qlty_X/plugin_pwd_qlty_X_impl.c @@ -162,7 +162,6 @@ plugin_pwd_qlty_X_create() memset(api, 0, sizeof(plugin_pwd_qlty)); api->version = 1; - api->plugin_id = PWD_QLTY_X; api->pwd_qlty_init = _plugin_pwd_qlty_init; api->pwd_qlty_check = _plugin_pwd_qlty_check; api->pwd_qlty_cleanup = _plugin_pwd_qlty_clean; diff --git a/src/plugins/pwd_qlty/plugin_pwd_qlty_krb/plugin_pwd_qlty_krb_impl.c b/src/plugins/pwd_qlty/plugin_pwd_qlty_krb/plugin_pwd_qlty_krb_impl.c index f75e33783f..83f7a41520 100644 --- a/src/plugins/pwd_qlty/plugin_pwd_qlty_krb/plugin_pwd_qlty_krb_impl.c +++ b/src/plugins/pwd_qlty/plugin_pwd_qlty_krb/plugin_pwd_qlty_krb_impl.c @@ -162,7 +162,6 @@ plugin_pwd_qlty_krb_create() memset(api, 0, sizeof(plugin_pwd_qlty)); api->version = 1; - api->plugin_id = PWD_QLTY_KRB; api->pwd_qlty_init = _plugin_pwd_qlty_init; api->pwd_qlty_check = _plugin_pwd_qlty_check; api->pwd_qlty_cleanup = _plugin_pwd_qlty_clean; -- 2.47.2