Remove ModulesDelayedAutoLoad.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1603 5417fbe8-f217-4b02-8779-1006273d7864

5 files changed, 2 insertions, 49 deletions

diff --git a/data/example.conf b/data/example.conf
index 0ef511d15..856dc6851 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -1462,21 +1462,13 @@ OSOpersOnly
 #
 # ModuleAutoload [OPTIONAL]
 #
-# When compiled with module support, this contains a space separated list
-# of modules to automatically load as soon as possible, e.g. IRCD support modules.
+# This contains a space separated list of modules to automatically load
 #
-#ModuleAutoload "hs_moo ircd_defizzer os_ignore_db"
-
-# ModuleDelayedAutoload [OPTIONAL]
-#
-# When compiled with module support, this contains a space separated list
-# of modules to automaticaly load when services are ready for new clients.
-# e.g. new pesudo clients such as CatServ :-) *meow*
 # By default a number of modules that we found worth adding by default are
 # loaded. Feel free to change this if you want to add more, or remove some
 # from the list.
 #
-ModuleDelayedAutoload "cs_appendtopic cs_enforce ns_maxemail os_info hs_request"
+ModuleAutoload "hs_moo ircd_defizzer os_ignore_db cs_appendtopic cs_enforce ns_maxemail os_info hs_request"
 
 ###########################################################################
 #
diff --git a/include/modules.h b/include/modules.h
index 8accb3828..ad505e0e5 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -352,7 +352,6 @@ int protocol_module_init(void);	/* Load the IRCD Protocol Module up*/
 int unloadModule(Module *m, User *u);	/* Unload the given module from the pro */
 int prepForUnload(Module *m);		/* Prepare the module for unload */
 void modules_init(void);
-void modules_delayed_init(void);
 void moduleCallBackPrepForUnload(const char *mod_name);
 MDE void moduleCallBackDeleteEntry(ModuleCallBack * prev);
 MDE char *moduleGetLastBuffer(void);
diff --git a/src/config.c b/src/config.c
index 6c51fd343..553287637 100644
--- a/src/config.c
+++ b/src/config.c
@@ -229,11 +229,8 @@ char *SessionLimitDetailsLoc;
 bool OSOpersOnly;
 
 char *Modules;
-char *ModulesDelayed;
 char **ModulesAutoload;
 int ModulesNumber;
-int ModulesDelayedNumber;
-char **ModulesDelayedAutoload;
 
 /**
  * Core Module Stuff
@@ -1326,8 +1323,6 @@ Directive directives[] = {
     {"MysqlRetries", {{PARAM_POSINT, PARAM_RELOAD, &MysqlRetries}}},
     {"MysqlRetryGap", {{PARAM_POSINT, PARAM_RELOAD, &MysqlRetryGap}}},
     {"ModuleAutoload", {{PARAM_STRING, PARAM_RELOAD, &Modules}}},
-    {"ModuleDelayedAutoload",
-     {{PARAM_STRING, PARAM_RELOAD, &ModulesDelayed}}},
     {"NetworkName", {{PARAM_STRING, PARAM_RELOAD, &NetworkName}}},
     {"NewsCount", {{PARAM_POSINT, PARAM_RELOAD, &NewsCount}}},
     {"NickLen", {{PARAM_POSINT, 0, &NickLen}}},
@@ -1859,8 +1854,6 @@ int read_config(int reload)
 
     /* Modules Autoload building... :P */
     ModulesAutoload = buildStringList(Modules, &ModulesNumber);
-    ModulesDelayedAutoload =
-        buildStringList(ModulesDelayed, &ModulesDelayedNumber);
     HostServCoreModules =
         buildStringList(HostCoreModules, &HostServCoreNumber);
     MemoServCoreModules =
diff --git a/src/init.c b/src/init.c
index 162758a6f..47e7cf51c 100644
--- a/src/init.c
+++ b/src/init.c
@@ -667,12 +667,6 @@ int init_secondary(int ac, char **av)
 
     ircdproto->SendEOB();
 
-    /**
-      * Load our delayed modeles - modules that are planing on making clients need to wait till now
-      * where as modules wanting to modify our ircd connection messages need to load eariler :|
-      **/
-    modules_delayed_init();
-
     /* Success! */
     return 0;
 }
diff --git a/src/modules.c b/src/modules.c
index a6cad9be7..e1794d3f9 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -273,31 +273,6 @@ int protocol_module_init(void)
 }
 
 /**
- * Automaticaly load modules at startup, delayed.
- * This function waits until the IRCD link has been made, and then attempts
- * to load the specified modules.
- */
-void modules_delayed_init(void)
-{
-    int idx;
-	int ret;
-    Module *m;
-
-    if(nothird) {
-        return;
-    }
-
-    for (idx = 0; idx < ModulesDelayedNumber; idx++) {
-        m = findModule(ModulesDelayedAutoload[idx]);
-        if (!m) {
-			ret = loadModule(ModulesDelayedAutoload[idx], NULL);
-            mod_current_module = NULL;
-            mod_current_user = NULL;
-        }
-    }
-}
-
-/**
  * Unload ALL loaded modules, no matter what kind of module it is.
  * Do NEVER EVER, and i mean NEVER (and if that isn't clear enough
  * yet, i mean: NEVER AT ALL) call this unless we're shutting down,