Module: ngircd.git Branch: master Commit: 77f68b4fd140404848e203a6634ecd472294723f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=77f68...

Author: Alexander Barton alex@barton.de Date: Fri Jan 13 10:40:20 2012 +0100

JOIN command: don't check channel limit if already member

Don't check the channel limit and don't report "too many channels" when trying to join a channel that the client is already a member of.

---

src/ngircd/irc-channel.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 52ba093..196b547 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -369,6 +369,12 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )

/* Local client? */ if (Client_Type(Client) == CLIENT_USER) { + if (chan) { + /* Already existing channel: already member? */ + if (Channel_IsMemberOf(chan, Client)) + goto join_next; + } + /* Test if the user has reached the channel limit */ if ((Conf_MaxJoins > 0) && (Channel_CountForUser(Client) >= Conf_MaxJoins))