From e47baea5daef5f7e24fff16db33bad09682b583e Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Wed, 3 Mar 2010 13:56:28 +0000 Subject: [PATCH] - Made '/REHASH -motd' really rehash *all* MOTD, OPERMOTD, BOTMOTD and RULES files. Reported by bitmaster (#0003894). --- Changes | 2 ++ src/s_serv.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Changes b/Changes index 1b3fc2aeb..4dcacc538 100644 --- a/Changes +++ b/Changes @@ -1942,3 +1942,5 @@ error when running './unreal start'. - Fixed 'unreal' script to give a better error if it cannot find the IRCd binary. +- Made '/REHASH -motd' really rehash *all* MOTD, OPERMOTD, BOTMOTD and RULES + files. Reported by bitmaster (#0003894). diff --git a/src/s_serv.c b/src/s_serv.c index 0aab315e2..42a2a1193 100644 --- a/src/s_serv.c +++ b/src/s_serv.c @@ -74,6 +74,7 @@ extern aMotd *Find_file(char *, short); #ifdef USE_SSL extern void reinit_ssl(aClient *); #endif +void reread_motdsandrules(); /* @@ -587,9 +588,7 @@ void rehash_motdrules() { ConfigItem_tld *tlds; - motd = (aMotd *) read_file_ex(conf_files->motd_file, &motd, &motd_tm); - rules = (aMotd *) read_file(conf_files->rules_file, &rules); - smotd = (aMotd *) read_file_ex(conf_files->smotd_file, &smotd, &smotd_tm); + reread_motdsandrules(); for (tlds = conf_tld; tlds; tlds = (ConfigItem_tld *) tlds->next) { tlds->motd = read_file_ex(tlds->motd_file, &tlds->motd, &tlds->motd_tm);