mirror of
https://github.com/unrealircd/unrealircd.git
synced 2026-07-01 07:16:38 +02:00
Newlog: Use _DENIED instead of _REJECTED everywhere to be consistent,
eg LINK_REJECTED_SID_COLLISION -> LINK_DENIED_SID_COLLISION since 15+ other ones also start with LINK_DENIED... Expand it to other areas as well eg antirandom.
This commit is contained in:
@@ -862,14 +862,14 @@ int antirandom_preconnect(Client *client)
|
||||
{
|
||||
if (cfg.ban_action == BAN_ACT_WARN)
|
||||
{
|
||||
unreal_log(ULOG_INFO, "antirandom", "ANTIRANDOM_REJECTED_USER", client,
|
||||
unreal_log(ULOG_INFO, "antirandom", "ANTIRANDOM_DENIED_USER", client,
|
||||
"[antirandom] would have denied access to user with score $score: $client:$client.info",
|
||||
log_data_integer("score", score));
|
||||
return HOOK_CONTINUE;
|
||||
}
|
||||
if (cfg.show_failedconnects)
|
||||
{
|
||||
unreal_log(ULOG_INFO, "antirandom", "ANTIRANDOM_REJECTED_USER", client,
|
||||
unreal_log(ULOG_INFO, "antirandom", "ANTIRANDOM_DENIED_USER", client,
|
||||
"[antirandom] denied access to user with score $score: $client:$client.info",
|
||||
log_data_integer("score", score));
|
||||
}
|
||||
|
||||
@@ -124,7 +124,7 @@ CMD_FUNC(cmd_protoctl)
|
||||
*/
|
||||
if (strstr(charsys_get_current_languages(), "utf8") && !strstr(value, "utf8"))
|
||||
{
|
||||
unreal_log(ULOG_ERROR, "link", "LINK_REJECTED_CHARSYS_INCOMPATIBLE", client,
|
||||
unreal_log(ULOG_ERROR, "link", "LINK_DENIED_CHARSYS_INCOMPATIBLE", client,
|
||||
"Server link $client rejected. Server $me_name has utf8 in set::allowed-nickchars but $client does not.",
|
||||
log_data_string("me_name", me.name));
|
||||
exit_client(client, NULL, "Incompatible set::allowed-nickchars setting");
|
||||
@@ -156,7 +156,7 @@ CMD_FUNC(cmd_protoctl)
|
||||
their_value = allowed_channelchars_strtoval(value);
|
||||
if (their_value != iConf.allowed_channelchars)
|
||||
{
|
||||
unreal_log(ULOG_ERROR, "link", "LINK_REJECTED_ALLOWED_CHANNELCHARS_INCOMPATIBLE", client,
|
||||
unreal_log(ULOG_ERROR, "link", "LINK_DENIED_ALLOWED_CHANNELCHARS_INCOMPATIBLE", client,
|
||||
"Server link $client rejected. Server has set::allowed-channelchars setting "
|
||||
"of $their_allowed_channelchars, while we have $our_allowed_channelchars.\n"
|
||||
"Please set set::allowed-channelchars to the same value on all servers.",
|
||||
@@ -197,7 +197,7 @@ CMD_FUNC(cmd_protoctl)
|
||||
|
||||
if ((aclient = hash_find_id(sid, NULL)) != NULL)
|
||||
{
|
||||
unreal_log(ULOG_ERROR, "link", "LINK_REJECTED_SID_COLLISION", client,
|
||||
unreal_log(ULOG_ERROR, "link", "LINK_DENIED_SID_COLLISION", client,
|
||||
"Server link $client rejected. Server with SID $sid already exist via uplink $exiting_client.uplink.",
|
||||
log_data_string("sid", sid),
|
||||
log_data_client("existing_client", aclient));
|
||||
|
||||
@@ -957,7 +957,7 @@ CMD_FUNC(cmd_server)
|
||||
hop = atol(parv[2]);
|
||||
if (hop != 1)
|
||||
{
|
||||
unreal_log(ULOG_ERROR, "link", "LINK_REJECTED_INVALID_HOPCOUNT", client,
|
||||
unreal_log(ULOG_ERROR, "link", "LINK_DENIED_INVALID_HOPCOUNT", client,
|
||||
"Server link $servername rejected. Directly linked server provided a hopcount of $hopcount, while 1 was expected.",
|
||||
log_data_string("servername", servername),
|
||||
log_data_integer("hopcount", hop));
|
||||
@@ -1005,7 +1005,7 @@ CMD_FUNC(cmd_server)
|
||||
if (deny->flag.type == CRULE_ALL && unreal_mask_match_string(servername, deny->mask)
|
||||
&& crule_eval(deny->rule))
|
||||
{
|
||||
unreal_log(ULOG_ERROR, "link", "LINK_REJECTED_DENY_LINK_BLOCK", client,
|
||||
unreal_log(ULOG_ERROR, "link", "LINK_DENIED_DENY_LINK_BLOCK", client,
|
||||
"Server link $servername rejected by deny link { } block.",
|
||||
log_data_string("servername", servername));
|
||||
exit_client(client, NULL, "Disallowed by connection rule");
|
||||
|
||||
Reference in New Issue
Block a user