#include "client.h"
#include "channel.h"
#include "common.h"
-#include "irc_string.h"
+#include "match.h"
#include "ircd.h"
-#include "s_gline.h"
#include "s_serv.h"
#include "numeric.h"
#include "res.h"
#include "s_conf.h"
#include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
#include "send.h"
#include "msg.h"
#include "parse.h"
"%s is forcing re-reading of MOTD file",
get_oper_name(source_p));
- free_cachefile(user_motd);
- user_motd = cache_file(MPATH, "ircd.motd", 0);
+ cache_user_motd();
}
static void
oper_motd = cache_file(OPATH, "opers.motd", 0);
}
-static void
-rehash_glines(struct Client *source_p)
-{
- struct ConfItem *aconf;
- rb_dlink_node *ptr, *next_ptr;
-
- sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing G-lines",
- get_oper_name(source_p));
-
- RB_DLINK_FOREACH_SAFE(ptr, next_ptr, glines.head)
- {
- aconf = ptr->data;
-
- delete_one_address_conf(aconf->host, aconf);
- rb_dlinkDestroy(ptr, &glines);
- }
-}
-
-static void
-rehash_pglines(struct Client *source_p)
-{
- struct gline_pending *glp_ptr;
- rb_dlink_node *ptr;
- rb_dlink_node *next_ptr;
-
- sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing pending glines",
- get_oper_name(source_p));
-
- RB_DLINK_FOREACH_SAFE(ptr, next_ptr, pending_glines.head)
- {
- glp_ptr = ptr->data;
-
- MyFree(glp_ptr->reason1);
- MyFree(glp_ptr->reason2);
- MyFree(glp_ptr);
- rb_dlinkDestroy(ptr, &pending_glines);
- }
-}
-
static void
rehash_tklines(struct Client *source_p)
{
{"DNS", rehash_dns },
{"MOTD", rehash_motd },
{"OMOTD", rehash_omotd },
- {"GLINES", rehash_glines },
- {"PGLINES", rehash_pglines },
{"TKLINES", rehash_tklines },
{"TDLINES", rehash_tdlines },
{"TXLINES", rehash_txlines },
for (x = 0; rehash_commands[x].cmd != NULL && rehash_commands[x].handler != NULL;
x++)
{
- strlcat(cmdbuf, " ", sizeof(cmdbuf));
- strlcat(cmdbuf, rehash_commands[x].cmd, sizeof(cmdbuf));
+ rb_strlcat(cmdbuf, " ", sizeof(cmdbuf));
+ rb_strlcat(cmdbuf, rehash_commands[x].cmd, sizeof(cmdbuf));
}
sendto_one_notice(source_p, ":rehash one of:%s", cmdbuf);
}
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;
}