]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Renamed factory into loader.
authorZhanna Tsitkov <tsitkova@mit.edu>
Wed, 30 Jun 2010 21:52:07 +0000 (21:52 +0000)
committerZhanna Tsitkov <tsitkova@mit.edu>
Wed, 30 Jun 2010 21:52:07 +0000 (21:52 +0000)
Example of plugin section in krb5.conf after renaming:
        PQ_DYN = {
                plugin_api = plugin_pwd_qlty
                plugin_loader_name = plugin_dyn_loader
                plugin_loader_type = dynamic
                plugin_name = plugin_pwd_qlty_DYN
                plugin_loader_path = /var/tsitkova/Sources/pl/src/plugin_dynamic/libplugin_dynamic.so
                plugin_type = service
                plugin_id = 33
        }

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/plugins@24155 dc483132-0cff-0310-8789-dd5450dbe970

30 files changed:
src/config-files/krb5.conf
src/include/k5-int.h
src/lib/crypto/krb/yarrow/deps
src/lib/krb5/os/Makefile.in
src/plugin_core/Makefile.in
src/plugin_core/deps
src/plugin_core/impl/Makefile.in
src/plugin_core/impl/deps
src/plugin_core/impl/plugin_default_factory.h [deleted file]
src/plugin_core/impl/plugin_default_loader.c [moved from src/plugin_core/impl/plugin_default_factory.c with 53% similarity]
src/plugin_core/impl/plugin_default_loader.h [new file with mode: 0644]
src/plugin_core/impl/plugin_default_manager.c
src/plugin_core/impl/plugin_impl.exports
src/plugin_core/libplugin_core.exports
src/plugin_core/plugin_factory.c [deleted file]
src/plugin_core/plugin_factory.h [deleted file]
src/plugin_core/plugin_loader.c [new file with mode: 0644]
src/plugin_core/plugin_loader.h [new file with mode: 0644]
src/plugin_dynamic/Makefile.in
src/plugin_dynamic/deps
src/plugin_dynamic/libplugin_dynamic.exports
src/plugin_dynamic/plugin_dyn_factory.c [deleted file]
src/plugin_dynamic/plugin_dyn_factory.h [deleted file]
src/plugin_dynamic/plugin_dyn_loader.c [new file with mode: 0644]
src/plugin_dynamic/plugin_dyn_loader.h [new file with mode: 0644]
src/plugins/pa/deps
src/plugins/pa/encrypted_challenge/deps
src/plugins/pwd_qlty/deps
src/plugins/pwd_qlty/plugin_pwd_qlty_X/deps
src/plugins/pwd_qlty/plugin_pwd_qlty_krb/deps

index dfd2cd9d498cadbf9e7505e6908cfa4b3a8b269d..5de625020d559e50d257c265ee21d5e73965d00a 100644 (file)
@@ -31,8 +31,8 @@
 
         PQ1 = {
                 plugin_api = plugin_pwd_qlty
-                plugin_factory_name = plugin_default_factory
-                plugin_factory_type = static
+                plugin_loader_name = plugin_default_loader
+                plugin_loader_type = static
                 plugin_name = plugin_pwd_qlty_X
                 plugin_type = service
                 plugin_id = 1
@@ -40,8 +40,8 @@
 
         PQ2 = {
                 plugin_api = plugin_pwd_qlty
-                plugin_factory_name = plugin_default_factory
-                plugin_factory_type = static
+                plugin_loader_name = plugin_default_loader
+                plugin_loader_type = static
                 plugin_name = plugin_pwd_qlty_krb
                 plugin_type = service
                 plugin_id = 0
index 54c36a0f7f0bf495bde586769c1437ee822d7806..e8b3e2efcfdb06fa0ce4f303e7cf9c342f4fc8b3 100644 (file)
 #    endif
 #endif
 
-/* Plugin manager */
-//#include <plugin_manager.h>
-//#include <plugin_factory.h>
-//#include "plugin_default_manager.h"
-//#include "plugin_default_factory.h"
-
 /*
  * Begin "k5-config.h"
  */
index 440ca1441b31ff195da1a3b7335d4d084031cfe1..fb835b6dc87113d627a72c39c9dfc30d02c24009 100644 (file)
@@ -28,7 +28,7 @@ ycipher.so ycipher.po $(OUTPRE)ycipher.$(OBJEXT): $(BUILDTOP)/include/autoconf.h
 plugin_prng_impl.so plugin_prng_impl.po $(OUTPRE)plugin_prng_impl.$(OBJEXT): \
   $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/plugins/prng/plugin_yarrow/plugin_prng_impl.h \
   $(top_srcdir)/plugin_core/plugin_manager.h \
-  $(top_srcdir)/plugin_core/plugin_factory.h \
+  $(top_srcdir)/plugin_core/plugin_loader.h \
   $(srcdir)/../../../crypto/builtin/yhash.h \
   $(srcdir)/../../../crypto/builtin/enc_provider/enc_provider.h \
   plugin_prng_impl.c
index 7ee7a6a7bf9bc4973dabbac0a02eeffebc3f37f2..47a57b7ee0d1842415627b0c665f802c4d6b9b9b 100644 (file)
@@ -226,14 +226,14 @@ check-unix::
        echo '}' >> ./t_an.conf
        echo '[plugins]' >> ./t_an.conf
        echo 'plugin_prng = {' >> ./t_an.conf
-       echo 'plugin_factory_name = plugin_default_factory' >> ./t_an.conf
-       echo 'plugin_factory_type = static' >> ./t_an.conf
+       echo 'plugin_loader_name = plugin_default_loader' >> ./t_an.conf
+       echo 'plugin_loader_type = static' >> ./t_an.conf
        echo 'plugin_name =  plugin_yarrow_prng' >> ./t_an.conf
        echo 'plugin_type = service' >> ./t_an.conf
        echo ' }' >> ./t_an.conf
        echo 'plugin_pa = {' >> ./t_an.conf
-       echo 'plugin_factory_name = plugin_default_factory' >> ./t_an.conf
-       echo 'plugin_factory_type = static' >> ./t_an.conf
+       echo 'plugin_loader_name = plugin_default_loader' >> ./t_an.conf
+       echo 'plugin_loader_type = static' >> ./t_an.conf
        echo 'plugin_name = plugin_encrypted_challenge_pa' >> ./t_an.conf
        echo 'plugin_type = service' >> ./t_an.conf
        echo '}' >> ./t_an.conf
index d523f4e5b7928587a599b6e68aa3191742b417b5..c2716502c7974f8656981a45050fe4d8e0ad8c69 100644 (file)
@@ -22,9 +22,9 @@ STOBJLISTS=OBJS.ST
 
 SHLIB_EXPLIBS=  $(LIBS_UTILS)
  
-STLIBOBJS= plugin_manager.o plugin_factory.o krb5_parser.o     
+STLIBOBJS= plugin_manager.o plugin_loader.o krb5_parser.o      
 
-SRCS= plugin_manager.c plugin_factory.c krb5_parser.c
+SRCS= plugin_manager.c plugin_loader.c krb5_parser.c
 
 all-unix:: all-liblinks
 install-unix:: install-libs
index 0e60a313ed3a647734be819f4919d91a427fb6dd..758344bc911bebb9e7bad2768582d431b162cfbb 100644 (file)
@@ -1,7 +1,7 @@
 plugin_manager.so plugin_manager.po $(OUTPRE)plugin_manager.$(OBJEXT): \
   $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/plugin_core/plugin_manager.h \
   plugin_manager.c
-plugin_factory.so plugin_factory.po $(OUTPRE)plugin_factory.$(OBJEXT): \
-  $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/plugin_core/plugin_factory.h \
+plugin_loader.so plugin_loader.po $(OUTPRE)plugin_loader.$(OBJEXT): \
+  $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/plugin_core/plugin_loader.h \
   $(top_srcdir)/plugin_core/plugin_manager.h \
-  plugin_factory.c
+  plugin_loader.c
index bc9e630c04b03ac2edd0f107bfc766b89379fcb4..8582fc4fd6a9e19bb1d7c4c6131a7ca8bd3806e1 100644 (file)
@@ -14,9 +14,9 @@ LOCALINCLUDES = -I$(srcdir)/../../include/krb5  -I$(srcdir)/.         \
 
 LIBBASE=plugin_impl
 
-STLIBOBJS= plugin_default_factory.o plugin_default_manager.o
+STLIBOBJS= plugin_default_loader.o plugin_default_manager.o
 
-SRCS= plugin_default_factory.c plugin_default_manager.c
+SRCS= plugin_default_loader.c plugin_default_manager.c
 
 STOBJLISTS=OBJS.ST
 
index 1dd0f9f783dbc3ff26a400bb4c7998ccccf36669..52a8e4c8321842cb9c61c9c0e51c18f991747d65 100644 (file)
@@ -3,12 +3,12 @@ plugin_default_manager.so plugin_default_manager.po $(OUTPRE)plugin_default_mana
   $(top_srcdir)/plugin_core/plugin_manager.h \
   $(top_srcdir)/plugin_core/krb5_parser.h \
   $(top_srcdir)/plugin_core/impl/plugin_default_manager.h \
-  $(top_srcdir)/plugin_core/impl/plugin_default_factory.h \
+  $(top_srcdir)/plugin_core/impl/plugin_default_loader.h \
   plugin_default_manager.c
-plugin_default_factory.so plugin_default_factory.po $(OUTPRE)plugin_default_factory.$(OBJEXT): \
-  $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/plugin_core/plugin_factory.h \
+plugin_default_loader.so plugin_default_loader.po $(OUTPRE)plugin_default_loader.$(OBJEXT): \
+  $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/plugin_core/plugin_loader.h \
   $(top_srcdir)/plugin_core/plugin_manager.h \
   $(top_srcdir)/plugins/pa/encrypted_challenge/plugin_pa_impl.h \
   $(top_srcdir)/plugin_core/impl/plugin_default_manager.h \
-  $(top_srcdir)/plugin_core/impl/plugin_default_factory.h \
-  plugin_default_factory.c
+  $(top_srcdir)/plugin_core/impl/plugin_default_loader.h \
+  plugin_default_loader.c
diff --git a/src/plugin_core/impl/plugin_default_factory.h b/src/plugin_core/impl/plugin_default_factory.h
deleted file mode 100644 (file)
index 5373ac5..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * plugin_default_factory.h
- *
- */
-
-#ifndef PLUGIN_DEFAULT_FACTORY_H_
-#define PLUGIN_DEFAULT_FACTORY_H_
-
-#include <plugin_factory.h>
-#include "plugin_pwd_qlty_krb_impl.h"
-#include "plugin_pwd_qlty_X_impl.h"
-
-
-factory_handle plugin_factory_get_instance(void);
-
-
-#endif /* PLUGIN_DEFAULT_FACTORY_H_ */
similarity index 53%
rename from src/plugin_core/impl/plugin_default_factory.c
rename to src/plugin_core/impl/plugin_default_loader.c
index 40fa6ecbf00a78abfe00946b1101484f0c2a8e16..721fb2a40c38d8b1f0cae0b25ed07c54a477522f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * plugin_default_factory.c
+ * plugin_default_loader.c
  *
  */
 #include <string.h>
@@ -7,14 +7,14 @@
 #include <stdlib.h>
 
 #include "plugin_manager.h"
-#include "plugin_factory.h"
+#include "plugin_loader.h"
 #include "plugin_pa_impl.h"
-#include "plugin_default_factory.h"
+#include "plugin_default_loader.h"
 
-static plugin_factory* _default_factory_instance = NULL;
+static plugin_loader* _default_loader_instance = NULL;
 
 /* built-in plugins */
-static plugin_descr  plugin_default_factory_table[] = {
+static plugin_descr  plugin_default_loader_table[] = {
         {"plugin_pwd_qlty_X",   plugin_pwd_qlty_X_create},
         {"plugin_pwd_qlty_krb", plugin_pwd_qlty_krb_create},
         {"plugin_encrypted_challenge_pa", plugin_encrypted_challenge_pa_create},
@@ -22,12 +22,12 @@ static plugin_descr  plugin_default_factory_table[] = {
         {NULL,NULL}
 };
 
-/* Factory API implementation */
+/* Loader API implementation */
 static void
-_get_factory_content (const char* container[]) {
+_get_loader_content (const char* container[]) {
     plugin_descr *ptr = NULL;
     int i = 0;
-    for( ptr = plugin_default_factory_table; ptr->plugin_name != NULL; ptr++,i++) {
+    for( ptr = plugin_default_loader_table; ptr->plugin_name != NULL; ptr++,i++) {
         container[i] = ptr->plugin_name;
     }
 }
@@ -41,7 +41,7 @@ _create_api (const char* plugin_name)
     memset(&handle, 0, sizeof(handle));
     if(plugin_name){
         handle.api = NULL;
-        for( ptr = plugin_default_factory_table; ptr->plugin_name != NULL; ptr++) {
+        for( ptr = plugin_default_loader_table; ptr->plugin_name != NULL; ptr++) {
             if (strcmp(ptr->plugin_name, plugin_name) == 0) {
                 handle = ptr->plugin_creator();
                 break;
@@ -52,18 +52,18 @@ _create_api (const char* plugin_name)
 }
 
 
-factory_handle
-plugin_factory_get_instance()
+loader_handle
+plugin_loader_get_instance()
 {
-    plugin_factory* instance = _default_factory_instance;
-    factory_handle handle;
+    plugin_loader* instance = _default_loader_instance;
+    loader_handle handle;
 
-    if(_default_factory_instance == NULL) {
-        instance = (plugin_factory*) malloc(sizeof(plugin_factory));
-        memset(instance, 0, sizeof(plugin_factory));
-        instance->get_factory_content = _get_factory_content;
+    if(_default_loader_instance == NULL) {
+        instance = (plugin_loader*) malloc(sizeof(plugin_loader));
+        memset(instance, 0, sizeof(plugin_loader));
+        instance->get_loader_content = _get_loader_content;
         instance->create_api = _create_api;
-        _default_factory_instance = instance;
+        _default_loader_instance = instance;
     }
     handle.api = instance;
     return (handle);
diff --git a/src/plugin_core/impl/plugin_default_loader.h b/src/plugin_core/impl/plugin_default_loader.h
new file mode 100644 (file)
index 0000000..715431f
--- /dev/null
@@ -0,0 +1,17 @@
+/*
+ * plugin_default_loader.h
+ *
+ */
+
+#ifndef PLUGIN_DEFAULT_LOADER_H_
+#define PLUGIN_DEFAULT_LOADER_H_
+
+#include <plugin_loader.h>
+#include "plugin_pwd_qlty_krb_impl.h"
+#include "plugin_pwd_qlty_X_impl.h"
+
+
+loader_handle plugin_loader_get_instance(void);
+
+
+#endif /* PLUGIN_DEFAULT_LOADER_H_ */
index 05702955d3092fbe7206eae7c24433212c6a8594..b43b5cc600697143c051073c41320c8c4469a9e9 100644 (file)
@@ -7,50 +7,50 @@
 #include <stdio.h>
 #include <dlfcn.h>
 #include <plugin_manager.h>
-#include <plugin_factory.h>
+#include <plugin_loader.h>
 #include "plugin_default_manager.h"
-#include "plugin_default_factory.h"
+#include "plugin_default_loader.h"
 #ifdef CONFIG_IN_YAML
 #include "yaml_parser.h"
 #else
 #include "krb5_parser.h"
 #endif
 
-static plugin_factory_descr _table[] = {
-        {"plugin_default_factory", plugin_factory_get_instance},
+static plugin_loader_descr _table[] = {
+        {"plugin_default_loader", plugin_loader_get_instance},
         {NULL, NULL}
 };
 
-static factory_handle
-_load_dynamic_factory (const char* factory_name, const char* path)
+static loader_handle
+_load_dynamic_loader (const char* loader_name, const char* path)
 {
-    factory_handle handle;
+    loader_handle handle;
     void *h_dl = dlopen(path, RTLD_LAZY);
-    factory_handle (*plugin_d_factory_get_instance)() = NULL;
+    loader_handle (*plugin_d_loader_get_instance)() = NULL;
 #ifdef DEBUG_PLUGINS
-    printf("plugins:  _load_dynamic_factory %s\n", factory_name);
+    printf("plugins:  _load_dynamic_loader %s\n", loader_name);
 #endif
     if(h_dl){
-        plugin_d_factory_get_instance = dlsym(h_dl, "plugin_factory_get_instance");
-        handle = plugin_d_factory_get_instance();
+        plugin_d_loader_get_instance = dlsym(h_dl, "plugin_loader_get_instance");
+        handle = plugin_d_loader_get_instance();
     }
 
     return handle;
 }
 
-static factory_handle
-_load_static_factory (const char* factory_name)
+static loader_handle
+_load_static_loader (const char* loader_name)
 {
-    factory_handle handle;
-    plugin_factory_descr *ptr = NULL;
+    loader_handle handle;
+    plugin_loader_descr *ptr = NULL;
 #ifdef DEBUG_PLUGINS
-    printf("plugins:  _load_static_factory %s\n", factory_name);
+    printf("plugins:  _load_static_loader %s\n", loader_name);
 #endif
 
     handle.api = NULL;
-    for( ptr = _table; ptr->factory_name != NULL; ptr++) {
-        if (strcmp(ptr->factory_name, factory_name) == 0) {
-            handle = ptr->factory_creator();
+    for( ptr = _table; ptr->loader_name != NULL; ptr++) {
+        if (strcmp(ptr->loader_name, loader_name) == 0) {
+            handle = ptr->loader_creator();
             break;
         }
     }
@@ -60,20 +60,20 @@ _load_static_factory (const char* factory_name)
 #define DYNAMIC_TYPE "dynamic"
 #define EMPTY_STR ""
 
-static factory_handle
-_load_factory(const char* factory_name, const char* factory_type, const char* factory_path)
+static loader_handle
+_load_loader(const char* loader_name, const char* loader_type, const char* loader_path)
 {
-    factory_handle handle;
-    if(strncmp(factory_type, BUILTIN_TYPE, strlen(BUILTIN_TYPE)) == 0){
-        handle = _load_static_factory(factory_name);
-    } else if(strncmp(factory_type, DYNAMIC_TYPE, strlen(DYNAMIC_TYPE)) == 0){
-        handle = _load_dynamic_factory(factory_name, factory_path);
+    loader_handle handle;
+    if(strncmp(loader_type, BUILTIN_TYPE, strlen(BUILTIN_TYPE)) == 0){
+        handle = _load_static_loader(loader_name);
+    } else if(strncmp(loader_type, DYNAMIC_TYPE, strlen(DYNAMIC_TYPE)) == 0){
+        handle = _load_dynamic_loader(loader_name, loader_path);
     } else {
-        if (factory_type)
-            printf("plugins: unknown factory_type %s\n", factory_type);
+        if (loader_type)
+            printf("plugins: unknown loader_type %s\n", loader_type);
         else {
-            printf("plugins: no factory_type found. Defaulting to built-in\n");
-            handle = _load_static_factory(factory_name);
+            printf("plugins: no loader_type found. Defaulting to built-in\n");
+            handle = _load_static_loader(loader_name);
         }
     }
     return handle;
@@ -123,11 +123,11 @@ _search_registry (registry_data* data, const char* api_name)
 
 static plhandle
 _create_api(const char* plugin_name, const char* plugin_id,
-            const char* factory_name, const char* factory_type, const char* factory_path
+            const char* loader_name, const char* loader_type, const char* loader_path
             /*, config_node* properties*/)
 {
     plhandle p_handle;
-    factory_handle f_handle = _load_factory(factory_name, factory_type, factory_path);
+    loader_handle f_handle = _load_loader(loader_name, loader_type, loader_path);
 #ifdef DEBUG_PLUGINS
     printf("plugins:  _create_api\n");
 #endif
@@ -202,9 +202,9 @@ _configure_plugin_yaml(manager_data* mdata, config_node* plugin_node)
     config_node* p = NULL;
     config_node* properties = NULL;
     const char* plugin_api = NULL;
-    const char* factory_name = NULL;
-    const char* factory_type = NULL;
-    const char* factory_path = NULL;
+    const char* loader_name = NULL;
+    const char* loader_type = NULL;
+    const char* loader_path = NULL;
     const char* plugin_name = NULL;
     const char* plugin_type = NULL;
     const char* plugin_id = NULL;
@@ -219,12 +219,12 @@ _configure_plugin_yaml(manager_data* mdata, config_node* plugin_node)
         } else if(strcmp(p->node_name, "constructor") == 0) {
             config_node* q = NULL;
             for(q = p->node_value.seq_value.start; q != NULL; q = q->next) {
-                if(strcmp(q->node_name, "factory_name") == 0) {
-                    factory_name = q->node_value.str_value;
-                } else if(strcmp(q->node_name, "factory_type") == 0) {
-                    factory_type = q->node_value.str_value;
-                } else if(strcmp(q->node_name, "factory_path") == 0) {
-                    factory_path = q->node_value.str_value;
+                if(strcmp(q->node_name, "loader_name") == 0) {
+                    loader_name = q->node_value.str_value;
+                } else if(strcmp(q->node_name, "loader_type") == 0) {
+                    loader_type = q->node_value.str_value;
+                } else if(strcmp(q->node_name, "loader_path") == 0) {
+                    loader_path = q->node_value.str_value;
                 } else if(strcmp(q->node_name, "plugin_name") == 0) {
                     plugin_name = q->node_value.str_value;
                 } else if(strcmp(q->node_name, "plugin_id") == 0) {
@@ -239,8 +239,8 @@ _configure_plugin_yaml(manager_data* mdata, config_node* plugin_node)
 #ifdef DEBUG_PLUGINS
     printf("**Start**\n");
     printf("api=%s\n", plugin_api);
-    printf("factory=%s\n", factory_name);
-    printf("factory_type=%s\n", factory_type);
+    printf("loader=%s\n", loader_name);
+    printf("loader_type=%s\n", loader_type);
     printf("plugin_name=%s\n", plugin_name);
     printf("plugin_type=%s\n", plugin_type);
     printf("plugin_path=%s\n", plugin_path);
@@ -249,22 +249,22 @@ _configure_plugin_yaml(manager_data* mdata, config_node* plugin_node)
 #endif
 
     handle = _create_api(plugin_name, plugin_id,
-                         factory_name, factory_type, factory_path /*, properties*/);
+                         loader_name, loader_type, loader_path /*, properties*/);
     if(handle.api != NULL) {
         ret = _register_api(mdata->registry,plugin_api, plugin_type, handle);
         if (ret != API_REGISTER_OK) {
 #ifdef DEBUG_PLUGINS
-            printf("Failed to register %s for %s(factory=%s,plugin_type=%s)\n",
-                    plugin_name, plugin_api, factory_name, plugin_type);
+            printf("Failed to register %s for %s(loader=%s,plugin_type=%s)\n",
+                    plugin_name, plugin_api, loader_name, plugin_type);
 #endif
         }
         else
-            printf("SUCCESS to register %s for %s(factory=%s,plugin_type=%s)\n",
-                    plugin_name, plugin_api, factory_name, plugin_type);
+            printf("SUCCESS to register %s for %s(loader=%s,plugin_type=%s)\n",
+                    plugin_name, plugin_api, loader_name, plugin_type);
     } else {
 #ifdef DEBUG_PLUGINS
-        printf("Failed to configure plugin: api=%s, plugin_name=%s,factory=%s\n",
-                plugin_api, plugin_name, factory_name);
+        printf("Failed to configure plugin: api=%s, plugin_name=%s,loader=%s\n",
+                plugin_api, plugin_name, loader_name);
 #endif
     }
     return ret;
@@ -308,7 +308,7 @@ _configure_krb5(manager_data* data, const char* path)
     profile_filespec_t *files = NULL;
     profile_t profile;
     const char  *hierarchy[4];
-    char **factory_name, **factory_type, **factory_path, **plugin_name, **plugin_type;
+    char **loader_name, **loader_type, **loader_path, **plugin_name, **plugin_type;
     char** plugin_id;
     char** plugin_api;
     char *f_path = NULL;
@@ -384,22 +384,22 @@ _configure_krb5(manager_data* data, const char* path)
         hierarchy[3] = 0;
         retval = profile_get_values(profile, hierarchy, &plugin_id);
 
-        /* factory_name */
-        hierarchy[2] = "plugin_factory_name";
+        /* loader_name */
+        hierarchy[2] = "plugin_loader_name";
         hierarchy[3] = 0;
-        retval = profile_get_values(profile, hierarchy, &factory_name);
+        retval = profile_get_values(profile, hierarchy, &loader_name);
 
-        /* factory_type */
-        hierarchy[2] = "plugin_factory_type";
+        /* loader_type */
+        hierarchy[2] = "plugin_loader_type";
         hierarchy[3] = 0;
-        retval = profile_get_values(profile, hierarchy, &factory_type);
+        retval = profile_get_values(profile, hierarchy, &loader_type);
 
-        /* factory_path */
-        hierarchy[2] = "plugin_factory_path";
+        /* loader_path */
+        hierarchy[2] = "plugin_loader_path";
         hierarchy[3] = 0;
-        retval = profile_get_values(profile, hierarchy, &factory_path);
+        retval = profile_get_values(profile, hierarchy, &loader_path);
         if(!retval)
-           f_path = *factory_path;
+           f_path = *loader_path;
         else
            f_path = NULL;
 
@@ -407,9 +407,9 @@ _configure_krb5(manager_data* data, const char* path)
 #ifdef DEBUG_PLUGINS
         printf("ZH plugins:  >>>\n");
         printf("api=%s\n", *plugin_api);
-        printf("factory=%s\n", *factory_name);
-        printf("factory_type=%s\n", *factory_type);
-        if (f_path) printf("factory_path=%s\n", f_path);
+        printf("loader=%s\n", *loader_name);
+        printf("loader_type=%s\n", *loader_type);
+        if (f_path) printf("loader_path=%s\n", f_path);
         printf("plugin_name=%s\n", *plugin_name);
         printf("plugin_type=%s\n",*plugin_type);
         printf("plugin_id=%s\n", *plugin_id);
@@ -417,13 +417,13 @@ _configure_krb5(manager_data* data, const char* path)
 #endif
 
         handle = _create_api(*plugin_name, *plugin_id,
-                             *factory_name, *factory_type, f_path /*, properties*/);
+                             *loader_name, *loader_type, f_path /*, properties*/);
         if(handle.api != NULL) {
             retval = _register_api(mdata->registry,*plugin_api, *plugin_type, handle);
             if(retval != API_REGISTER_OK) {
 #ifdef DEBUG_PLUGINS
-                printf("plugins: Failed to register %s for %s(factory=%s,plugin_type=%s) ret=%i\n",
-                       *plugin_name, *plugin_api, *factory_name, *plugin_type, retval);
+                printf("plugins: Failed to register %s for %s(loader=%s,plugin_type=%s) ret=%i\n",
+                       *plugin_name, *plugin_api, *loader_name, *plugin_type, retval);
 #endif
             } else {
 #ifdef DEBUG_PLUGINS
@@ -432,8 +432,8 @@ _configure_krb5(manager_data* data, const char* path)
             }
         } else {
 #ifdef DEBUG_PLUGINS
-            printf("plugins: Failed to configure plugin: api=%s, plugin_name=%s,factory=%s\n",
-                    *plugin_api, *plugin_name, *factory_name);
+            printf("plugins: Failed to configure plugin: api=%s, plugin_name=%s,loader=%s\n",
+                    *plugin_api, *plugin_name, *loader_name);
 #endif
         }
 
index e496f151b5dad709ddf9a82e1c3b8e11d1e68d8c..9d42d94e1dd70ccb8f5b74eff754f41371da9e97 100644 (file)
@@ -1,2 +1,2 @@
-plugin_default_factory_get_instance
+plugin_default_loader_get_instance
 plugin_default_manager_get_instance
index cf228df66fc9b9cb8f8dad0b038397f8804d30cd..a39a298d6ce98502faf5c488120e6dc5247e24cc 100644 (file)
@@ -1,4 +1,4 @@
-get_factory_content
+get_loader_content
 plugin_manager_configure
 plugin_manager_get_service
 plugin_manager_start
diff --git a/src/plugin_core/plugin_factory.c b/src/plugin_core/plugin_factory.c
deleted file mode 100644 (file)
index 6bbb9ec..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * plugin_factory.c
- *
- */
-
-#include <string.h>
-#include "plugin_factory.h"
-
-void
-get_factory_content (factory_handle handle, const char* container[])
-{
-    plugin_factory* factory = (plugin_factory*) handle.api;
-    if (factory != NULL) {
-        return factory->get_factory_content(container);
-    }
-    return;
-}
-
-plhandle
-create_api (factory_handle handle, const char* plugin_name)
-{
-    plugin_factory* factory = (plugin_factory*) handle.api;
-    if (factory != NULL) {
-        return factory->create_api(plugin_name);
-    }
-    return;
-}
diff --git a/src/plugin_core/plugin_factory.h b/src/plugin_core/plugin_factory.h
deleted file mode 100644 (file)
index c0597f4..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * plugin_factory.h
- *
- */
-#ifndef PLUGIN_FACTORY_H_
-#define PLUGIN_FACTORY_H_
-
-#include "plugin_manager.h"
-
-/* Plugin factory API */
-typedef struct {
-       void *api;
-} factory_handle;
-
-typedef struct {
-       const char* factory_name;
-       factory_handle (*factory_creator)();
-} plugin_factory_descr;
-
-typedef struct {
-       const char* plugin_name;
-       plhandle (*plugin_creator)();
-} plugin_descr;
-
-typedef struct {
-       void (*get_factory_content)(const char* []);
-       plhandle (*create_api)(const char*);
-} plugin_factory;
-
-/* Utility functions */
-void get_factory_content(factory_handle handle, const char* container[]);
-plhandle create_api(factory_handle handle, const char* plugin_name);
-
-#endif /* PLUGIN_FACTORY_H_ */
diff --git a/src/plugin_core/plugin_loader.c b/src/plugin_core/plugin_loader.c
new file mode 100644 (file)
index 0000000..3c0e2a0
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * plugin_loader.c
+ *
+ */
+
+#include <string.h>
+#include "plugin_loader.h"
+
+void
+get_loader_content (loader_handle handle, const char* container[])
+{
+    plugin_loader* loader = (plugin_loader*) handle.api;
+    if (loader != NULL) {
+        return loader->get_loader_content(container);
+    }
+    return;
+}
+
+plhandle
+create_api (loader_handle handle, const char* plugin_name)
+{
+    plugin_loader* loader = (plugin_loader*) handle.api;
+    if (loader != NULL) {
+        return loader->create_api(plugin_name);
+    }
+    return;
+}
diff --git a/src/plugin_core/plugin_loader.h b/src/plugin_core/plugin_loader.h
new file mode 100644 (file)
index 0000000..867d84e
--- /dev/null
@@ -0,0 +1,34 @@
+/*
+ * plugin_loader.h
+ *
+ */
+#ifndef PLUGIN_LOADER_H_
+#define PLUGIN_LOADER_H_
+
+#include "plugin_manager.h"
+
+/* Plugin loader API */
+typedef struct {
+       void *api;
+} loader_handle;
+
+typedef struct {
+       const char* loader_name;
+       loader_handle (*loader_creator)();
+} plugin_loader_descr;
+
+typedef struct {
+       const char* plugin_name;
+       plhandle (*plugin_creator)();
+} plugin_descr;
+
+typedef struct {
+       void (*get_loader_content)(const char* []);
+       plhandle (*create_api)(const char*);
+} plugin_loader;
+
+/* Utility functions */
+void get_loader_content(loader_handle handle, const char* container[]);
+plhandle create_api(loader_handle handle, const char* plugin_name);
+
+#endif /* PLUGIN_LOADER_H_ */
index 2aeed12e8c27f5f6a4b8ecc7ee2a97671cbce844..f9e78a9a71331a2b49c4b9e224994dcd8348ed95 100644 (file)
@@ -26,9 +26,9 @@ STOBJLISTS=OBJS.ST
 
 SHLIB_EXPLIBS=  $(LIBS_UTILS)
  
-STLIBOBJS= plugin_dyn_factory.o $(srcdir)/../plugins/pwd_qlty/plugin_pwd_qlty_DYN/plugin_pwd_qlty_DYN_impl.o   
+STLIBOBJS= plugin_dyn_loader.o $(srcdir)/../plugins/pwd_qlty/plugin_pwd_qlty_DYN/plugin_pwd_qlty_DYN_impl.o    
 
-SRCS= plugin_dyn_factory.c $(srcdir)/../plugins/pwd_qlty/plugin_pwd_qlty_DYN/plugin_pwd_qlty_DYN_impl.c
+SRCS= plugin_dyn_loader.c $(srcdir)/../plugins/pwd_qlty/plugin_pwd_qlty_DYN/plugin_pwd_qlty_DYN_impl.c
 
 all-unix:: all-liblinks
 install-unix:: install-libs
index bf5a74b32ba2eba2ef6685128cd61f9ff36a638c..b9d0cc981c7f2c137841a422af563414865f8292 100644 (file)
@@ -1,11 +1,11 @@
-plugin_dyn_factory.so plugin_dyn_factory.po $(OUTPRE)plugin_dyn_factory.$(OBJEXT): \
-  $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/plugin_core/plugin_factory.h \
+plugin_dyn_loader.so plugin_dyn_loader.po $(OUTPRE)plugin_dyn_loader.$(OBJEXT): \
+  $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/plugin_core/plugin_loader.h \
   $(top_srcdir)/plugin_core/plugin_manager.h \
-  $(top_srcdir)/plugin_dynamic/plugin_dyn_factory.h \
-  plugin_dyn_factory.c
+  $(top_srcdir)/plugin_dynamic/plugin_dyn_loader.h \
+  plugin_dyn_loader.c
 plugin_pwd_qlty_DYN_impl.so plugin_pwd_qlty_DYN_impl.po $(OUTPRE)plugin_pwd_qlty_DYN_impl.$(OBJEXT): \
   $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) \
   $(top_srcdir)/plugins/pwd_qlty/plugin_pwd_qlty_DYN/plugin_pwd_qlty_DYN_impl.h \
   $(top_srcdir)/plugin_core/plugin_manager.h \
-  $(top_srcdir)/plugin_core/plugin_factory.h \
+  $(top_srcdir)/plugin_core/plugin_loader.h \
   plugin_pwd_qlty_DYN_impl.c
index 00440c75e29dd3af641d5f17591364746f76b50a..b0b57fcd782eb1cc6cf1eea393cd9953a1e89718 100644 (file)
@@ -1,2 +1,2 @@
-plugin_factory_get_instance
+plugin_loader_get_instance
 plugin_pwd_qlty_DYN_create
diff --git a/src/plugin_dynamic/plugin_dyn_factory.c b/src/plugin_dynamic/plugin_dyn_factory.c
deleted file mode 100644 (file)
index 6342245..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * plugin_dyn_factory.c
- *
- */
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <plugin_manager.h>
-#include <plugin_factory.h>
-#include <plugin_dyn_factory.h>
-
-static plugin_factory* _dyn_factory_instance = NULL;
-
-/* dynamic  plugins */
-static plugin_descr  plugin_dyn_factory_table[] = {
-        {"plugin_pwd_qlty_DYN",   plugin_pwd_qlty_DYN_create},
-        {NULL,NULL}
-};
-
-/* Factory API implementation */
-static void
-_get_factory_content (const char* container[]) {
-    plugin_descr *ptr = NULL;
-    int i = 0;
-    for( ptr = plugin_dyn_factory_table; ptr->plugin_name != NULL; ptr++,i++) {
-        container[i] = ptr->plugin_name;
-    }
-}
-
-static plhandle
-_create_api (const char* plugin_name)
-{
-    plhandle handle;
-    plugin_descr *ptr = NULL;
-
-    memset(&handle, 0, sizeof(handle));
-    if(plugin_name){
-        handle.api = NULL;
-        for( ptr = plugin_dyn_factory_table; ptr->plugin_name != NULL; ptr++) {
-            if (strcmp(ptr->plugin_name, plugin_name) == 0) {
-                handle = ptr->plugin_creator();
-                break;
-            }
-        }
-    }
-    return handle;
-}
-
-
-factory_handle
-plugin_factory_get_instance()
-{
-    plugin_factory* instance = _dyn_factory_instance;
-    factory_handle handle;
-
-    if(_dyn_factory_instance == NULL) {
-        instance = (plugin_factory*) malloc(sizeof(plugin_factory));
-        memset(instance, 0, sizeof(plugin_factory));
-        instance->get_factory_content = _get_factory_content;
-        instance->create_api = _create_api;
-        _dyn_factory_instance = instance;
-    }
-    handle.api = instance;
-    return (handle);
-}
-
diff --git a/src/plugin_dynamic/plugin_dyn_factory.h b/src/plugin_dynamic/plugin_dyn_factory.h
deleted file mode 100644 (file)
index dc34258..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * plugin_dyn_factory.h
- *
- */
-
-#ifndef PLUGIN_DYN_FACTORY_H_
-#define PLUGIN_DYN_FACTORY_H_
-
-#include <plugin_factory.h>
-#include "plugin_pwd_qlty_DYN_impl.h"
-
-
-factory_handle plugin_factory_get_instance(void);
-
-
-#endif /* PLUGIN_DYN_FACTORY_H_ */
diff --git a/src/plugin_dynamic/plugin_dyn_loader.c b/src/plugin_dynamic/plugin_dyn_loader.c
new file mode 100644 (file)
index 0000000..627b349
--- /dev/null
@@ -0,0 +1,66 @@
+/*
+ * plugin_dyn_loader.c
+ *
+ */
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <plugin_manager.h>
+#include <plugin_loader.h>
+#include <plugin_dyn_loader.h>
+
+static plugin_loader* _dyn_loader_instance = NULL;
+
+/* dynamic  plugins */
+static plugin_descr  plugin_dyn_loader_table[] = {
+        {"plugin_pwd_qlty_DYN",   plugin_pwd_qlty_DYN_create},
+        {NULL,NULL}
+};
+
+static void
+_get_loader_content (const char* container[]) {
+    plugin_descr *ptr = NULL;
+    int i = 0;
+    for( ptr = plugin_dyn_loader_table; ptr->plugin_name != NULL; ptr++,i++) {
+        container[i] = ptr->plugin_name;
+    }
+}
+
+static plhandle
+_create_api (const char* plugin_name)
+{
+    plhandle handle;
+    plugin_descr *ptr = NULL;
+
+    memset(&handle, 0, sizeof(handle));
+    if(plugin_name){
+        handle.api = NULL;
+        for( ptr = plugin_dyn_loader_table; ptr->plugin_name != NULL; ptr++) {
+            if (strcmp(ptr->plugin_name, plugin_name) == 0) {
+                handle = ptr->plugin_creator();
+                break;
+            }
+        }
+    }
+    return handle;
+}
+
+
+loader_handle
+plugin_loader_get_instance()
+{
+    plugin_loader* instance = _dyn_loader_instance;
+    loader_handle handle;
+
+    if(_dyn_loader_instance == NULL) {
+        instance = (plugin_loader*) malloc(sizeof(plugin_loader));
+        memset(instance, 0, sizeof(plugin_loader));
+        instance->get_loader_content = _get_loader_content;
+        instance->create_api = _create_api;
+        _dyn_loader_instance = instance;
+    }
+    handle.api = instance;
+    return (handle);
+}
+
diff --git a/src/plugin_dynamic/plugin_dyn_loader.h b/src/plugin_dynamic/plugin_dyn_loader.h
new file mode 100644 (file)
index 0000000..76fbfda
--- /dev/null
@@ -0,0 +1,14 @@
+/*
+ * plugin_dyn_loader.h
+ *
+ */
+
+#ifndef PLUGIN_DYN_LOADER_H_
+#define PLUGIN_DYN_LOADER_H_
+
+#include <plugin_loader.h>
+#include "plugin_pwd_qlty_DYN_impl.h"
+
+loader_handle plugin_loader_get_instance(void);
+
+#endif /* PLUGIN_DYN_LOADER_H_ */
index 22b2661d9bbf08f3a547d8eba3e68ea69be167ee..ed53e6854d6941e83fabc67f3a10a297aac65d6f 100644 (file)
@@ -4,10 +4,10 @@
 plugin_pa.so plugin_pa.po $(OUTPRE)plugin_pa.$(OBJEXT): \
   $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/plugins/pa/plugin_pa.h \
   $(top_srcdir)/plugin_core/plugin_manager.h \
-  $(top_srcdir)/plugin_core/plugin_factory.h \
+  $(top_srcdir)/plugin_core/plugin_loader.h \
   plugin_pa.c
 plugin_pa_impl.so plugin_pa_impl.po $(OUTPRE)plugin_pa_impl.$(OBJEXT): \
   $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/plugins/pa/plugin_pa_impl.h \
   $(top_srcdir)/plugin_core/plugin_manager.h \
-  $(top_srcdir)/plugin_core/plugin_factory.h \
+  $(top_srcdir)/plugin_core/plugin_loader.h \
   plugin_pa_impl.c
index e8189b5b2048ef236878bbf7b981b0e9155eecaf..ce785ff90c97f99826249ba38c7db89b0ef93d02 100644 (file)
@@ -5,6 +5,6 @@ plugin_pa_impl.so plugin_pa_impl.po $(OUTPRE)plugin_pa_impl.$(OBJEXT): \
   $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/plugins/pa/encrypted_challenge/plugin_pa_impl.h \
   $(top_srcdir)/plugins/preauth/fast_factor.h \
   $(top_srcdir)/plugin_core/plugin_manager.h \
-  $(top_srcdir)/plugin_core/plugin_factory.h \
+  $(top_srcdir)/plugin_core/plugin_loader.h \
   plugin_pa_impl.c
 
index cada08652afeb5a5e94638c02e5e0ab9d3c7c212..2acf95d93ecc75261a282c77fb28ae8f36d9e69c 100644 (file)
@@ -4,6 +4,6 @@
 plugin_pwd_qlty.so plugin_pwd_qlty.po $(OUTPRE)plugin_pwd_qlty.$(OBJEXT): \
   $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/plugins/pwd_qlty/plugin_pwd_qlty.h \
   $(top_srcdir)/plugin_core/plugin_manager.h \
-  $(top_srcdir)/plugin_core/plugin_factory.h \
+  $(top_srcdir)/plugin_core/plugin_loader.h \
   $(top_srcdir)/lib/kadm5/admin.h \
   plugin_pwd_qlty.c
index 4690d7600e801adc2a5151dc2923e19ee1473f91..edb3d9364cf845df5e96801d379287408e3fbdea 100644 (file)
@@ -6,6 +6,6 @@ plugin_pwd_qlty_X_impl.so plugin_pwd_qlty_X_impl.po $(OUTPRE)plugin_pwd_qlty_X_i
   $(top_srcdir)/plugins/pwd_qlty/plugin_pwd_qlty_X/plugin_pwd_qlty_X_impl.h \
   $(top_srcdir)/lib/kadm5/admin.h \
   $(top_srcdir)/plugin_core/plugin_manager.h \
-  $(top_srcdir)/plugin_core/plugin_factory.h \
+  $(top_srcdir)/plugin_core/plugin_loader.h \
   plugin_pwd_qlty_X_impl.c
 
index 1359c2d98ef3607b9b5b9bad982732820f152a38..603752204fb074739493e879e3842e8b2f0e9294 100644 (file)
@@ -6,6 +6,6 @@ plugin_pwd_qlty_krb_impl.so plugin_pwd_qlty_krb_impl.po $(OUTPRE)plugin_pwd_qlty
   $(top_srcdir)/plugins/pwd_qlty/plugin_pwd_qlty_krb/plugin_pwd_qlty_krb_impl.h \
   $(top_srcdir)/lib/kadm5/admin.h \
   $(top_srcdir)/plugin_core/plugin_manager.h \
-  $(top_srcdir)/plugin_core/plugin_factory.h \
+  $(top_srcdir)/plugin_core/plugin_loader.h \
   plugin_pwd_qlty_krb_impl.c