m_nick/m_sasl/m_user: restore check for mixing of client and server protocol
This commit is contained in:
parent
d4b2529a61
commit
d5d52a994d
3 changed files with 3 additions and 3 deletions
|
@ -122,7 +122,7 @@ mr_nick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
|
||||||
struct Client *target_p;
|
struct Client *target_p;
|
||||||
char nick[NICKLEN];
|
char nick[NICKLEN];
|
||||||
|
|
||||||
if (strlen(client_p->id) == 3)
|
if (strlen(client_p->id) == 3 || (source_p->preClient && !EmptyString(source_p->preClient->id)))
|
||||||
{
|
{
|
||||||
exit_client(client_p, client_p, client_p, "Mixing client and server protocol");
|
exit_client(client_p, client_p, client_p, "Mixing client and server protocol");
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -146,7 +146,7 @@ m_authenticate(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(strlen(client_p->id) == 3)
|
if (strlen(client_p->id) == 3 || (source_p->preClient && !EmptyString(source_p->preClient->id)))
|
||||||
{
|
{
|
||||||
exit_client(client_p, client_p, client_p, "Mixing client and server protocol");
|
exit_client(client_p, client_p, client_p, "Mixing client and server protocol");
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -63,7 +63,7 @@ mr_user(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
|
||||||
static char buf[BUFSIZE];
|
static char buf[BUFSIZE];
|
||||||
char *p;
|
char *p;
|
||||||
|
|
||||||
if (strlen(client_p->id) == 3)
|
if (strlen(client_p->id) == 3 || (source_p->preClient && !EmptyString(source_p->preClient->id)))
|
||||||
{
|
{
|
||||||
exit_client(client_p, client_p, client_p, "Mixing client and server protocol");
|
exit_client(client_p, client_p, client_p, "Mixing client and server protocol");
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in a new issue