Allow /ojoin !#channel/%#channel, if admin/halfop are enabled.

[irc/rqf/shadowircd.git] / modules / m_rehash.c

diff --git a/modules/m_rehash.c b/modules/m_rehash.c
index 22848a8c94fd289bc0659d3236a39185efff64bb..8557f8c7104bcf5b95892097f2d9f1f998e20c27 100644 (file)
--- a/modules/m_rehash.c
+++ b/modules/m_rehash.c
@@ -67,6 +67,8 @@ rehash_bans_loc(struct Client *source_p)
 {
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is rehashing bans",
                                get_oper_name(source_p));
+       if (!MyConnect(source_p))
+               remote_rehash_oper_p = source_p;
 
        rehash_bans(0);
 }
@@ -76,6 +78,8 @@ rehash_dns(struct Client *source_p)
 {
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is rehashing DNS", 
                             get_oper_name(source_p));
+       if (!MyConnect(source_p))
+               remote_rehash_oper_p = source_p;
 
        /* reread /etc/resolv.conf and reopen res socket */
        restart_resolver();
@@ -87,6 +91,8 @@ rehash_motd(struct Client *source_p)
        sendto_realops_snomask(SNO_GENERAL, L_ALL,
                             "%s is forcing re-reading of MOTD file",
                             get_oper_name(source_p));
+       if (!MyConnect(source_p))
+               remote_rehash_oper_p = source_p;
 
        cache_user_motd();
 }
@@ -97,6 +103,8 @@ rehash_omotd(struct Client *source_p)
        sendto_realops_snomask(SNO_GENERAL, L_ALL,
                             "%s is forcing re-reading of OPER MOTD file",
                             get_oper_name(source_p));
+       if (!MyConnect(source_p))
+               remote_rehash_oper_p = source_p;
 
        free_cachefile(oper_motd);
        oper_motd = cache_file(OPATH, "opers.motd", 0);
@@ -111,6 +119,8 @@ rehash_tklines(struct Client *source_p)
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp klines",
                                get_oper_name(source_p));
+       if (!MyConnect(source_p))
+               remote_rehash_oper_p = source_p;
 
        for(i = 0; i < LAST_TEMP_TYPE; i++)
        {
@@ -133,6 +143,8 @@ rehash_tdlines(struct Client *source_p)
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp dlines",
                                get_oper_name(source_p));
+       if (!MyConnect(source_p))
+               remote_rehash_oper_p = source_p;
 
        for(i = 0; i < LAST_TEMP_TYPE; i++)
        {
@@ -155,12 +167,14 @@ rehash_txlines(struct Client *source_p)
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp xlines",
                                get_oper_name(source_p));
+       if (!MyConnect(source_p))
+               remote_rehash_oper_p = source_p;
 
        RB_DLINK_FOREACH_SAFE(ptr, next_ptr, xline_conf_list.head)
        {
                aconf = ptr->data;
 
-               if(!aconf->hold)
+               if(!aconf->hold || aconf->lifetime)
                        continue;
 
                free_conf(aconf);
@@ -178,12 +192,14 @@ rehash_tresvs(struct Client *source_p)
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp resvs",
                                get_oper_name(source_p));
+       if (!MyConnect(source_p))
+               remote_rehash_oper_p = source_p;
 
        HASH_WALK_SAFE(i, R_MAX, ptr, next_ptr, resvTable)
        {
                aconf = ptr->data;
 
-               if(!aconf->hold)
+               if(!aconf->hold || aconf->lifetime)
                        continue;
 
                free_conf(aconf);
@@ -195,7 +211,7 @@ rehash_tresvs(struct Client *source_p)
        {
                aconf = ptr->data;
 
-               if(!aconf->hold)
+               if(!aconf->hold || aconf->lifetime)
                        continue;
 
                free_conf(aconf);
@@ -208,16 +224,31 @@ rehash_rejectcache(struct Client *source_p)
 {
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing reject cache",
                                get_oper_name(source_p));
+       if (!MyConnect(source_p))
+               remote_rehash_oper_p = source_p;
        flush_reject();
 
 }
 
+static void
+rehash_throttles(struct Client *source_p)
+{
+       sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing throttles",
+                               get_oper_name(source_p));
+       if (!MyConnect(source_p))
+               remote_rehash_oper_p = source_p;
+       flush_throttle();
+
+}
+
 static void
 rehash_help(struct Client *source_p)
 {
        sendto_realops_snomask(SNO_GENERAL, L_ALL,
                             "%s is forcing re-reading of HELP files", 
                             get_oper_name(source_p));
+       if (!MyConnect(source_p))
+               remote_rehash_oper_p = source_p;
        load_help();
 }
 
@@ -231,6 +262,8 @@ rehash_nickdelay(struct Client *source_p)
        sendto_realops_snomask(SNO_GENERAL, L_ALL,
                             "%s is clearing the nick delay table",
                             get_oper_name(source_p));
+       if (!MyConnect(source_p))
+               remote_rehash_oper_p = source_p;
 
        RB_DLINK_FOREACH_SAFE(ptr, safe_ptr, nd_list.head)
        {
@@ -252,6 +285,7 @@ static struct hash_commands rehash_commands[] =
        {"TXLINES",     rehash_txlines          },
        {"TRESVS",      rehash_tresvs           },
        {"REJECTCACHE", rehash_rejectcache      },
+       {"THROTTLES",   rehash_throttles        },
        {"HELP",        rehash_help             },
        {"NICKDELAY",   rehash_nickdelay        },
        {NULL,          NULL                    }
@@ -273,9 +307,10 @@ do_rehash(struct Client *source_p, const char *type)
                        {
                                sendto_one(source_p, form_str(RPL_REHASHING), me.name,
                                           source_p->name, rehash_commands[x].cmd);
-                               rehash_commands[x].handler(source_p);
                                ilog(L_MAIN, "REHASH %s From %s[%s]", type,
                                     get_oper_name(source_p), source_p->sockhost);
+                               rehash_commands[x].handler(source_p);
+                               remote_rehash_oper_p = NULL;
                                return;
                        }
                }
@@ -296,9 +331,12 @@ do_rehash(struct Client *source_p, const char *type)
                           ConfigFileEntry.configfile);
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "%s is rehashing server config file", get_oper_name(source_p));
+               if (!MyConnect(source_p))
+                       remote_rehash_oper_p = source_p;
                ilog(L_MAIN, "REHASH From %s[%s]", get_oper_name(source_p),
                     source_p->sockhost);
                rehash(0);
+               remote_rehash_oper_p = NULL;
        }
 }
 
@@ -361,9 +399,7 @@ me_rehash(struct Client *client_p, struct Client *source_p, int parc, const char
                                source_p->servptr->name, SHARED_REHASH))
                return 0;
 
-       remote_rehash_oper_p = source_p;
        do_rehash(source_p, parc > 1 ? parv[1] : NULL);
-       remote_rehash_oper_p = NULL;
 
        return 0;
 }