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.

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 52ba0930caac5c9ab89f189dd684fe65e7976529..196b5477487cebdfa0c073277a1ff81115a7d798 100644 (file)
--- 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) {
 
                /* 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))
                        /* Test if the user has reached the channel limit */
                        if ((Conf_MaxJoins > 0) &&
                            (Channel_CountForUser(Client) >= Conf_MaxJoins))