Commits

Anonymous committed 5c65bc1

Do not send "<blah> is rehashing <blah>" notices to the remote oper.

  • Participants
  • Parent commits e2d542b

Comments (0)

Files changed (1)

File modules/m_rehash.c

 {
 	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);
 }
 {
 	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();
 	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();
 }
 	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);
 
 	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++)
 	{
 
 	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++)
 	{
 
 	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)
 	{
 
 	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)
 	{
 {
 	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();
 
 }
 {
 	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();
 
 }
 	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();
 }
 
 	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)
 	{
 			{
 				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;
 			}
 		}
 			   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;
 	}
 }
 
 				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;
 }