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

[ngircd-alex.git] / src / ngircd / irc-channel.c

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index c5eb369d269cb76fc676ac5e1c7bc6d4640f285a..77deed7abde03f455c33018d8e01cf33fba47e53 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -31,6 +31,7 @@
 #include "match.h"
 #include "messages.h"
 #include "parse.h"
+#include "irc.h"
 #include "irc-info.h"
 #include "irc-write.h"
 #include "conf.h"
@@ -363,22 +364,32 @@ 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? */
                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))
-                               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 */
@@ -602,6 +613,7 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
        char *pattern;
        CHANNEL *chan;
        CLIENT *from, *target;
+       int count = 0;
 
        assert(Client != NULL);
        assert(Req != NULL);
@@ -645,19 +657,26 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
 
        while (pattern) {
                /* Loop through all the channels */
+               if (Req->argc > 0)
+                       ngt_LowerStr(pattern);
                chan = Channel_First();
                while (chan) {
                        /* Check search pattern */
-                       if (Match(pattern, Channel_Name(chan))) {
+                       if (MatchCaseInsensitive(pattern, Channel_Name(chan))) {
                                /* Gotcha! */
                                if (!strchr(Channel_Modes(chan), 's')
                                    || Channel_IsMemberOf(chan, from)) {
+                                       if (IRC_CheckListTooBig(from, count,
+                                                                MAX_RPL_LIST,
+                                                                "LIST"))
+                                               break;
                                        if (!IRC_WriteStrClient(from,
                                             RPL_LIST_MSG, Client_ID(from),
                                             Channel_Name(chan),
                                             Channel_MemberCount(chan),
                                             Channel_Topic( chan )))
                                                return DISCONNECTED;
+                                       count++;
                                }
                        }
                        chan = Channel_Next(chan);
@@ -670,6 +689,7 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
                        pattern = NULL;
        }
 
+       IRC_SetPenalty(from, 2);
        return IRC_WriteStrClient(from, RPL_LISTEND_MSG, Client_ID(from));
 } /* IRC_LIST */