mirror of
https://github.com/unrealircd/unrealircd.git
synced 2026-07-05 08:33:14 +02:00
Consistently use $existing_client instead of $other_client.
Fixes some expansion issues (too), as reported by delta.
This commit is contained in:
+2
-2
@@ -401,8 +401,8 @@ void remove_dcc_references(Client *client)
|
||||
{
|
||||
unreal_log(ULOG_WARNING, "main", "BUG_REMOVE_DCC_REFERENCES", acptr,
|
||||
"[BUG] remove_dcc_references: $client was in dccallowme "
|
||||
"list of $other_client but not in dccallowrem list!",
|
||||
log_data_client("other_client", client));
|
||||
"list of $existing_client but not in dccallowrem list!",
|
||||
log_data_client("existing_client", client));
|
||||
}
|
||||
|
||||
free_link(lp);
|
||||
|
||||
@@ -305,7 +305,7 @@ CMD_FUNC(cmd_protoctl)
|
||||
{
|
||||
unreal_log(ULOG_ERROR, "link", "LINK_DENIED_DUPLICATE_SID", client,
|
||||
"Denied server $client: Server with SID $existing_client.id ($existing_client) is already linked.",
|
||||
log_data_client("other_client", aclient));
|
||||
log_data_client("existing_client", aclient));
|
||||
exit_client(client, NULL, "Server Exists (or non-unique me::sid)");
|
||||
return;
|
||||
}
|
||||
@@ -318,7 +318,7 @@ CMD_FUNC(cmd_protoctl)
|
||||
"but we already have SID $sid linked ($existing_client via $existing_client.uplink)\n"
|
||||
"Possible race condition, just wait a moment for the network to synchronize...",
|
||||
log_data_string("sid", sid),
|
||||
log_data_client("other_client", aclient));
|
||||
log_data_client("existing_client", aclient));
|
||||
exit_client(client, NULL, "Server Exists (just wait a moment...)");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1169,9 +1169,9 @@ CMD_FUNC(cmd_sid)
|
||||
|
||||
unreal_log(ULOG_ERROR, "link", "REMOTE_LINK_DENIED_DUPLICATE_SERVER", client,
|
||||
"Denied remote server $servername which was introduced by $client: "
|
||||
"Already linked via $other_client.uplink.",
|
||||
"Already linked via $existing_client.uplink.",
|
||||
log_data_string("servername", servername),
|
||||
log_data_client("other_client", acptr));
|
||||
log_data_client("existing_client", acptr));
|
||||
// FIXME: oldest should die.
|
||||
// FIXME: code below looks wrong, it checks direction TS instead of anything else
|
||||
acptr = acptr->direction;
|
||||
|
||||
+2
-2
@@ -419,9 +419,9 @@ CMD_FUNC(cmd_sjoin)
|
||||
me.id, channel->name, acptr->name);
|
||||
unreal_log(ULOG_WARNING, "sjoin", "SJOIN_FAKE_DIRECTION", client,
|
||||
"Fake direction from server $client in SJOIN "
|
||||
"for user $other_client on $other_client.server "
|
||||
"for user $existing_client on $existing_client.server "
|
||||
"(item: $buf)",
|
||||
log_data_client("other_client", acptr),
|
||||
log_data_client("existing_client", acptr),
|
||||
log_data_string("buf", item));
|
||||
continue;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user