9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve server notices for servers introducing existing servers.

Browse source
This commit is contained in:
Jilles Tjoelker 2008-09-05 22:52:39 +02:00
parent 8e34ffc66e
commit 7d4287591f
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/core/m_server.c
View file

@ -268,6 +268,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
int hlined = 0; int hlined = 0;
int llined = 0; int llined = 0;
rb_dlink_node *ptr; rb_dlink_node *ptr;
char squitreason[160];
name = parv[1]; name = parv[1];
hop = atoi(parv[2]); hop = atoi(parv[2]);
@ -293,15 +294,13 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
* doesnt exist, although ircd can handle it, its not a realistic * doesnt exist, although ircd can handle it, its not a realistic
* solution.. --fl_ * solution.. --fl_
*/ */
sendto_one(client_p, "ERROR :Server %s already exists", name);
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Link %s cancelled, server %s already exists",
client_p->name, name);
ilog(L_SERVER, "Link %s cancelled, server %s already exists", ilog(L_SERVER, "Link %s cancelled, server %s already exists",
client_p->name, name); client_p->name, name);
exit_client(client_p, client_p, &me, "Server Exists"); snprintf(squitreason, sizeof squitreason,
"Server %s already exists",
name);
exit_client(client_p, client_p, &me, squitreason);
return 0; return 0;
} }
@ -475,14 +474,13 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
/* collision on the name? */ /* collision on the name? */
if((target_p = find_server(NULL, parv[1])) != NULL) if((target_p = find_server(NULL, parv[1])) != NULL)
{ {
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",
client_p->name, parv[1]);
ilog(L_SERVER, "Link %s cancelled, server %s already exists", ilog(L_SERVER, "Link %s cancelled, server %s already exists",
client_p->name, parv[1]); client_p->name, parv[1]);
exit_client(NULL, client_p, &me, "Server Exists"); snprintf(squitreason, sizeof squitreason,
"Server %s already exists",
parv[1]);
exit_client(NULL, client_p, &me, squitreason);
return 0; return 0;
} }