merge

[irc/quakenet/newserv.git] / noperserv / noperserv_hooks.c

diff --git a/noperserv/noperserv_hooks.c b/noperserv/noperserv_hooks.c
index ef93ad905ad20e16c44a951030b14e5b9f5771ca..a5d8bd97c6b3e170566d7ba91bfba6af1378c8d8 100644 (file)
--- a/noperserv/noperserv_hooks.c
+++ b/noperserv/noperserv_hooks.c
@@ -187,10 +187,6 @@ int noperserv_specialmod(nick *np, char *command, ScheduleCallback reloadhandler
   }
 
   if(!strcmp(cargv[0], "noperserv")) {
-    if(noperserv_modules_loaded("noperserv_*")) {
-      controlreply(np, "NOT UNLOADING. Unload all dependencies first.");
-      return CMD_ERROR;
-    }
     if(special.schedule) {
       controlreply(np, "Previous attempt at un/reload still in progress.");
       return CMD_OK;
@@ -278,7 +274,8 @@ int noperserv_showcommands(void *sender, int cargc, char **cargv) {
   controlreply(np, "The following commands are registered at present:");
   
   for(i=0;i<n;i++)
-    controlreply(np, "%s (%s)", cmdlist[i]->command->content, printflags(cmdlist[i]->level, no_commandflags));
+    if(noperserv_policy_command_permitted(cmdlist[i]->level, np))
+      controlreply(np, "%s (%s)", cmdlist[i]->command->content, printflags(cmdlist[i]->level, no_commandflags));
 
   controlreply(np, "End of list.");
   return CMD_OK;
@@ -467,7 +464,7 @@ void noperserv_wall(flag_t permissionlevel, flag_t noticelevel, char *format, ..
   Error("noperserv", ERR_INFO, "$%s$ %s", flags, buf);
 
   for(;au;au=au->next) {
-    if(NOGetNoticeLevel(au) & noticelevel) {
+    if((NOGetNoticeLevel(au) & noticelevel) && !(NOGetAuthLevel(au) & __NO_RELAY)) {
       for(nl=au->nick;nl;nl=nl->next)
         if(noperserv_policy_command_permitted(permissionlevel, nl->nick))
           controlreply(nl->nick, "$%s$ %s", flags, buf);