albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't stop join handling on faulty channel, skip it (part #2) 

Commit 565523cb allowed processing of further channel names given to the
JOIN command when a single name was invalid.

After this patch, the JOIN command handler continues to process channel
name lists even after errors like "channel is full", "too many channels",
and the like and generates appropriate error messages for all the
channels given by the client.
This commit is contained in:
Alexander Barton 2012-01-13 10:43:05 +01:00
parent 77f68b4fd1
commit d4d8102fc9
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ngircd/irc-channel.c
View File

@ -364,7 +364,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
/* channel must be created, but forbidden by config */
IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG,
Client_ID(Client), channame);
break;
goto join_next;
}
/* Local client? */
@ -377,15 +377,19 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
/* Test if the user has reached the channel limit */
if ((Conf_MaxJoins > 0) &&
(Channel_CountForUser(Client) >= Conf_MaxJoins))
return IRC_WriteStrClient(Client,
(Channel_CountForUser(Client) >= Conf_MaxJoins)) {
if (!IRC_WriteStrClient(Client,
ERR_TOOMANYCHANNELS_MSG,
Client_ID(Client), channame);
Client_ID(Client), channame))
return DISCONNECTED;
goto join_next;
}
if (chan) {
/* Already existing channel: check if the
* client is allowed to join */
if (!join_allowed(Client, chan, channame, key))
break;
goto join_next;
} else {
/* New channel: first user will become channel
* operator unless this is a modeless channel */