reference.conf: add drain_reason

[solanum.git] / modules / m_rehash.c

diff --git a/modules/m_rehash.c b/modules/m_rehash.c
index ee98377255d2788682d932fb068c8aa5b0d18552..cb19d6d70673d2f0161f4485ed581604cef81b9f 100644 (file)
--- a/modules/m_rehash.c
+++ b/modules/m_rehash.c
@@ -25,7 +25,6 @@
 #include "stdinc.h"
 #include "client.h"
 #include "channel.h"
-#include "common.h"
 #include "match.h"
 #include "ircd.h"
 #include "s_serv.h"
@@ -73,7 +72,7 @@ rehash_bans_loc(struct Client *source_p)
        if (!MyConnect(source_p))
                remote_rehash_oper_p = source_p;
 
-       rehash_bans(0);
+       rehash_bans();
 }
 
 static void
@@ -84,13 +83,19 @@ rehash_dns(struct Client *source_p)
        if (!MyConnect(source_p))
                remote_rehash_oper_p = source_p;
 
-       /* reread /etc/resolv.conf and reopen res socket */
-       restart_authd();
+       reload_nameservers();
 }
 
 static void
 rehash_ssld(struct Client *source_p)
 {
+       if (!IsOperAdmin(source_p))
+       {
+               sendto_one(source_p, form_str(ERR_NOPRIVS),
+                          me.name, source_p->name, "admin");
+               return;
+       }
+
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is restarting ssld",
                                get_oper_name(source_p));
 
@@ -119,7 +124,7 @@ rehash_omotd(struct Client *source_p)
                remote_rehash_oper_p = source_p;
 
        free_cachefile(oper_motd);
-       oper_motd = cache_file(OPATH, "opers.motd", 0);
+       oper_motd = cache_file(ircd_paths[IRCD_PATH_IRCD_OMOTD], "opers.motd", 0);
 }
 
 static void
@@ -198,10 +203,9 @@ static void
 rehash_tresvs(struct Client *source_p)
 {
        struct ConfItem *aconf;
-       struct rb_radixtree_iteration_state iter;
+       rb_radixtree_iteration_state iter;
        rb_dlink_node *ptr;
        rb_dlink_node *next_ptr;
-       int i;
 
        sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp resvs",
                                get_oper_name(source_p));
@@ -346,7 +350,7 @@ do_rehash(struct Client *source_p, const char *type)
                        remote_rehash_oper_p = source_p;
                ilog(L_MAIN, "REHASH From %s[%s]", get_oper_name(source_p),
                     source_p->sockhost);
-               rehash(0);
+               rehash(false);
                remote_rehash_oper_p = NULL;
        }
 }
@@ -404,9 +408,5 @@ me_rehash(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
        if (!IsPerson(source_p))
                return;
 
-       if (!find_shared_conf(source_p->username, source_p->host,
-                               source_p->servptr->name, SHARED_REHASH))
-               return;
-
        do_rehash(source_p, parc > 1 ? parv[1] : NULL);
 }