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

Revert "sasl: remove checks for impossible conditions".

Browse source 
This check is not impossible and can be triggered by
sending a PASS command like a server would send first.

This backs out changeset 8cba4464feec.
This commit is contained in:
Jilles Tjoelker 2011-03-31 23:26:26 +02:00
parent 27126f911d
commit 1b19fe8b5e
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/m_sasl.c
View file

@ -81,6 +81,12 @@ mr_authenticate(struct Client *client_p, struct Client *source_p,
if(!IsCapable(source_p, CLICAP_SASL)) if(!IsCapable(source_p, CLICAP_SASL))
return 0; return 0;
if (strlen(client_p->id) == 3)
{
exit_client(client_p, client_p, client_p, "Mixing client and server protocol");
return 0;
}
if(source_p->preClient->sasl_complete) if(source_p->preClient->sasl_complete)
{ {
sendto_one(source_p, form_str(ERR_SASLALREADY), me.name, EmptyString(source_p->name) ? "*" : source_p->name); sendto_one(source_p, form_str(ERR_SASLALREADY), me.name, EmptyString(source_p->name) ? "*" : source_p->name);
@ -117,7 +123,6 @@ mr_authenticate(struct Client *client_p, struct Client *source_p,
else else
sendto_one(agent_p, ":%s ENCAP %s SASL %s %s C %s", me.id, agent_p->servptr->name, sendto_one(agent_p, ":%s ENCAP %s SASL %s %s C %s", me.id, agent_p->servptr->name,
source_p->id, agent_p->id, parv[1]); source_p->id, agent_p->id, parv[1]);
source_p->preClient->sasl_out++; source_p->preClient->sasl_out++;
return 0; return 0;