vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Applied svn diff from ratbox3 r21458:21470

Browse source
This commit is contained in:
Valery V Yatsko 2008-06-28 14:13:50 +04:00
parent 405ae5ce44
commit b3ebc7ab9e
13 changed files with 61 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

38
modules/core/m_server.c
View file

@ -85,7 +85,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
{
sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
"Server %s has unexpected name %s",
get_server_name(client_p, HIDE_IP), name);
client_p->name, name);
ilog(L_SERVER, "Server %s has unexpected name %s",
log_client_name(client_p, SHOW_IP), name);
exit_client(client_p, client_p, client_p, "Server name mismatch");
@ -98,7 +98,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
if(!DoesTS(client_p))
{
sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s dropped, non-TS server",
get_server_name(client_p, HIDE_IP));
client_p->name);
exit_client(client_p, client_p, client_p, "Non-TS server");
return 0;
}
@ -119,7 +119,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Unauthorised server connection attempt from %s: "
"No entry for servername %s",
get_server_name(client_p, HIDE_IP), name);
client_p->name, name);
ilog(L_SERVER, "Access denied, no connect block for server %s%s",
EmptyString(client_p->name) ? name : "",
@ -135,7 +135,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
"Unauthorised server connection attempt from %s: "
"Bad password for server %s",
get_server_name(client_p, HIDE_IP), name);
client_p->name, name);
ilog(L_SERVER, "Access denied, invalid password for server %s%s",
EmptyString(client_p->name) ? name : "",
@ -150,7 +150,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Unauthorised server connection attempt from %s: "
"Invalid host for server %s",
get_server_name(client_p, HIDE_IP), name);
client_p->name, name);
ilog(L_SERVER, "Access denied, invalid host for server %s%s",
EmptyString(client_p->name) ? name : "",
@ -165,7 +165,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
case -4:
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Invalid servername %s from %s",
name, get_server_name(client_p, HIDE_IP));
name, client_p->name);
ilog(L_SERVER, "Access denied, invalid servername from %s",
log_client_name(client_p, SHOW_IP));
@ -208,7 +208,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
*/
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Attempt to re-introduce server %s from %s",
name, get_server_name(client_p, HIDE_IP));
name, client_p->name);
ilog(L_SERVER, "Attempt to re-introduce server %s from %s",
name, log_client_name(client_p, SHOW_IP));
@ -223,7 +223,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
"Attempt to re-introduce SID %s from %s%s",
client_p->id,
EmptyString(client_p->name) ? name : "",
get_server_name(client_p, HIDE_IP));
client_p->name);
ilog(L_SERVER, "Attempt to re-introduce SID %s from %s%s",
client_p->id,
EmptyString(client_p->name) ? name : "",
@ -302,7 +302,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Link %s cancelled, server %s already exists",
get_server_name(client_p, SHOW_IP), name);
client_p->name, name);
ilog(L_SERVER, "Link %s cancelled, server %s already exists",
client_p->name, name);
@ -324,7 +324,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
sendto_one(client_p, "ERROR :Nickname %s already exists!", name);
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Link %s cancelled: Server/nick collision on %s",
get_server_name(client_p, HIDE_IP), name);
client_p->name, name);
ilog(L_SERVER, "Link %s cancelled: Server/nick collision on %s",
client_p->name, name);
@ -390,7 +390,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
{
/* OOOPs nope can't HUB */
sendto_realops_snomask(SNO_GENERAL, L_ALL, "Non-Hub link %s introduced %s.",
get_server_name(client_p, HIDE_IP), name);
client_p->name, name);
ilog(L_SERVER, "Non-Hub link %s introduced %s.",
client_p->name, name);
@ -404,7 +404,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
/* OOOPs nope can't HUB this leaf */
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Link %s introduced leafed server %s.",
get_server_name(client_p, HIDE_IP), name);
client_p->name, name);
ilog(L_SERVER, "Link %s introduced leafed server %s.",
client_p->name, name);
@ -418,7 +418,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
{
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Link %s introduced server with invalid servername %s",
get_server_name(client_p, HIDE_IP), name);
client_p->name, name);
ilog(L_SERVER, "Link %s introduced server with invalid servername %s",
client_p->name, name);
@ -482,7 +482,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
sendto_one(client_p, "ERROR :Server %s already exists", parv[1]);
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Link %s cancelled, server %s already exists",
get_server_name(client_p, SHOW_IP), parv[1]);
client_p->name, parv[1]);
ilog(L_SERVER, "Link %s cancelled, server %s already exists",
client_p->name, parv[1]);
@ -496,7 +496,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
sendto_one(client_p, "ERROR :SID %s already exists", parv[3]);
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Link %s cancelled, SID %s already exists",
get_server_name(client_p, SHOW_IP), parv[3]);
client_p->name, parv[3]);
ilog(L_SERVER, "Link %s cancelled, SID %s already exists",
client_p->name, parv[3]);
@ -509,7 +509,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
sendto_one(client_p, "ERROR :Invalid servername");
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Link %s cancelled, servername %s invalid",
get_server_name(client_p, SHOW_IP), parv[1]);
client_p->name, parv[1]);
ilog(L_SERVER, "Link %s cancelled, servername %s invalid",
client_p->name, parv[1]);
@ -523,7 +523,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
sendto_one(client_p, "ERROR :Invalid SID");
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Link %s cancelled, SID %s invalid",
get_server_name(client_p, SHOW_IP), parv[3]);
client_p->name, parv[3]);
ilog(L_SERVER, "Link %s cancelled, SID %s invalid",
client_p->name, parv[3]);
@ -554,7 +554,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
sendto_one(client_p, "ERROR :No matching hub_mask");
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Non-Hub link %s introduced %s.",
get_server_name(client_p, SHOW_IP), parv[1]);
client_p->name, parv[1]);
ilog(L_SERVER, "Non-Hub link %s introduced %s.",
client_p->name, parv[1]);
exit_client(NULL, client_p, &me, "No matching hub_mask.");
@ -567,7 +567,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
sendto_one(client_p, "ERROR :Matching leaf_mask");
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Link %s introduced leafed server %s.",
get_server_name(client_p, SHOW_IP), parv[1]);
client_p->name, parv[1]);
ilog(L_SERVER, "Link %s introduced leafed server %s.",
client_p->name, parv[1]);
exit_client(NULL, client_p, &me, "Leafed Server.");