summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/os_modload.c11
-rw-r--r--src/core/os_modunload.c10
2 files changed, 4 insertions, 17 deletions
diff --git a/src/core/os_modload.c b/src/core/os_modload.c
index 732d629f4..c8541bb23 100644
--- a/src/core/os_modload.c
+++ b/src/core/os_modload.c
@@ -76,21 +76,14 @@ void myOperServHelp(User * u)
int do_modload(User * u)
{
char *name;
- Module *m;
name = strtok(NULL, "");
if (!name) {
syntax_error(s_OperServ, u, "MODLOAD", OPER_MODULE_LOAD_SYNTAX);
return MOD_CONT;
}
- m = findModule(name);
- if (!m) {
- m = createModule(name);
- mod_current_module = m;
- mod_current_user = u;
- mod_current_op = 1;
- } else {
+ if (!queueModuleLoad(name, u))
notice_lang(s_OperServ, u, OPER_MODULE_LOAD_FAIL, name);
- }
+
return MOD_CONT;
}
diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c
index 315c7a7c4..6bfb00595 100644
--- a/src/core/os_modunload.c
+++ b/src/core/os_modunload.c
@@ -75,7 +75,6 @@ void myOperServHelp(User * u)
int do_modunload(User * u)
{
char *name;
- Module *m;
name = strtok(NULL, "");
if (!name) {
@@ -83,13 +82,8 @@ int do_modunload(User * u)
OPER_MODULE_UNLOAD_SYNTAX);
return MOD_CONT;
}
- m = findModule(name);
- if (m) {
- mod_current_user = u;
- mod_current_module = m;
- mod_current_op = 2;
- } else {
+ if (!queueModuleUnload(name, u))
notice_lang(s_OperServ, u, OPER_MODULE_REMOVE_FAIL, name);
- }
+
return MOD_CONT;
}