Check k/dlines against underlying IPv4 as well.

[solanum.git] / src / modules.c

diff --git a/src/modules.c b/src/modules.c
index 2a46244c08c574b5d066cbd2eee6b03c7ed66284..8165b2c41d35ccb6d7668534d5bb1eaee6a4693e 100644 (file)
--- a/src/modules.c
+++ b/src/modules.c
@@ -57,6 +57,7 @@
 struct module **modlist = NULL;
 
 static const char *core_module_table[] = {
+       "m_ban",
        "m_die",
        "m_error",
        "m_join",
@@ -257,7 +258,7 @@ load_all_modules(int warn)
 void
 load_core_modules(int warn)
 {
-       char module_name[MAXPATHLEN];
+       char module_name[PATH_MAX];
        int i;
 
 
@@ -285,7 +286,7 @@ load_core_modules(int warn)
 int
 load_one_module(const char *path, int coremodule)
 {
-       char modpath[MAXPATHLEN];
+       char modpath[PATH_MAX];
        rb_dlink_node *pathst;
        struct module_path *mpath;
 
@@ -423,11 +424,11 @@ mo_modreload(struct Client *client_p, struct Client *source_p, int parc, const c
                return 0;
        }
 
-       if((load_one_module(parv[1], check_core) == -1) && check_core)
+       if((load_one_module(m_bn, check_core) == -1) && check_core)
        {
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                    "Error reloading core module: %s: terminating ircd", parv[1]);
-               ilog(L_MAIN, "Error loading core module %s: terminating ircd", parv[1]);
+                                    "Error reloading core module: %s: terminating ircd", m_bn);
+               ilog(L_MAIN, "Error loading core module %s: terminating ircd", m_bn);
                exit(0);
        }
 
@@ -737,7 +738,7 @@ unload_one_module(const char *name, int warn)
        dlclose(modlist[modindex]->address);
 
        rb_free(modlist[modindex]->name);
-       memcpy(&modlist[modindex], &modlist[modindex + 1],
+       memmove(&modlist[modindex], &modlist[modindex + 1],
               sizeof(struct module) * ((num_mods - 1) - modindex));
 
        if(num_mods != 0)