Remove some more builtin plugin code that was left behind

diff --git a/TODO b/TODO
index 7ab99281311418550380b4da3f1e65a488eff88a..f8687706be50f08c4443bd328ccabe63397dfd9f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -9,6 +9,7 @@ current release (3.0.0):
 - fix issue with loading state from linestack_file
 - better handling of log_network_state()
 - merge noticelog into admin
+- load all plugins
 - new config file format (yacc!)
  - finish upgrade script
  - make editing config file optional

diff --git a/configure.ac b/configure.ac
index 93b5890f4637c8d2f1b657e9e7f15bda7d98c859..7d6e05486a1572bef2ae1efeb379bde716ddd749 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -133,11 +133,7 @@ DEFMODULE(socks)
 DEFMODULE(listener)
 DEFMODULE(autosend)
 
-AC_DEFINE_UNQUOTED(STATIC_MODULES,[$STATIC_MODULES_LIST],[List of statically built modules])
-AC_DEFINE_UNQUOTED(STATIC_MODULE_DECLARES,[$STATIC_MODULE_DECLARES],[Declarations for the static modules])
-
 AC_SUBST(BINS)
-AC_SUBST(MODS_STATIC)
 AC_SUBST(MODS_SHARED)
 DESTINCLUDEDIR="$includedir/ctrlproxy-2"
 AC_SUBST(DESTINCLUDEDIR)

diff --git a/plugins.c b/plugins.c
index 8b000d910d8a3bcc084c83ce786d11cf363054bd..14e427606f04ba9956e495563fe343ae2cfee3a5 100644 (file)
--- a/plugins.c
+++ b/plugins.c
@@ -26,9 +26,6 @@
 struct plugin *current_plugin = NULL;
 GList *plugins = NULL;
 
-STATIC_MODULE_DECLARES
-static struct plugin_ops *builtin_modules[] = { STATIC_MODULES NULL };
-
 struct plugin *plugin_by_config(struct plugin_config *pc)
 {
        GList *gl;
@@ -89,14 +86,6 @@ struct plugin *load_plugin(const char *dir, struct plugin_config *pc)
 
        p->config = pc;
 
-       /* See if this plugin is built-in */
-       for (i = 0; builtin_modules[i]; i++) {
-               if (!strcmp(builtin_modules[i]->name, pc->path)) {
-                       ops = builtin_modules[i];       
-                       break;
-               }
-       }
-
        /* Try to load from .so file */
        if (!ops) {
                /* Determine correct modules directory */