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

Close the link that sends an invalid UID.

Browse source 
It does not make sense to send a kill using an invlid
identifier to an obviously broken server, as was
previously done.
This commit is contained in:
Jilles Tjoelker 2008-09-06 15:13:28 +02:00
parent 8c29ec4eeb
commit 4a5655b20d
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
modules/core/m_nick.c
View file

@ -404,6 +404,7 @@ ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *p
{ {
struct Client *target_p; struct Client *target_p;
time_t newts = 0; time_t newts = 0;
char squitreason[120];
newts = atol(parv[3]); newts = atol(parv[3]);
@ -425,6 +426,15 @@ ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *p
return 0; return 0;
} }
if(!clean_uid(parv[8]))
{
rb_snprintf(squitreason, sizeof squitreason,
"Invalid UID %s for nick %s on %s",
parv[8], parv[1], source_p->name);
exit_client(client_p, client_p, client_p, squitreason);
return 0;
}
if(!clean_username(parv[5]) || !clean_host(parv[6])) if(!clean_username(parv[5]) || !clean_host(parv[6]))
{ {
ServerStats.is_kill++; ServerStats.is_kill++;
@ -435,16 +445,6 @@ ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *p
return 0; return 0;
} }
if(!clean_uid(parv[8]))
{
ServerStats.is_kill++;
sendto_realops_snomask(SNO_DEBUG, L_ALL,
"Bad UID: %s From: %s(via %s)",
parv[8], source_p->name, client_p->name);
sendto_one(client_p, ":%s KILL %s :%s (Bad UID)", me.id, parv[8], me.name);
return 0;
}
/* check length of clients gecos */ /* check length of clients gecos */
if(strlen(parv[9]) > REALLEN) if(strlen(parv[9]) > REALLEN)
{ {
@ -492,6 +492,7 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
{ {
struct Client *target_p; struct Client *target_p;
time_t newts = 0; time_t newts = 0;
char squitreason[120];
newts = atol(parv[3]); newts = atol(parv[3]);
@ -513,6 +514,15 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
return 0; return 0;
} }
if(!clean_uid(parv[8]))
{
rb_snprintf(squitreason, sizeof squitreason,
"Invalid UID %s for nick %s on %s",
parv[8], parv[1], source_p->name);
exit_client(client_p, client_p, client_p, squitreason);
return 0;
}
if(!clean_username(parv[5]) || !clean_host(parv[6])) if(!clean_username(parv[5]) || !clean_host(parv[6]))
{ {
ServerStats.is_kill++; ServerStats.is_kill++;
@ -523,16 +533,6 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
return 0; return 0;
} }
if(!clean_uid(parv[8]))
{
ServerStats.is_kill++;
sendto_realops_snomask(SNO_DEBUG, L_ALL,
"Bad UID: %s From: %s(via %s)",
parv[8], source_p->name, client_p->name);
sendto_one(client_p, ":%s KILL %s :%s (Bad UID)", me.id, parv[8], me.name);
return 0;
}
if(strcmp(parv[9], "*") && !clean_host(parv[9])) if(strcmp(parv[9], "*") && !clean_host(parv[9]))
{ {
ServerStats.is_kill++; ServerStats.is_kill++;