Make the maximum /list reply length a configurable limit.

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

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 77deed7abde03f455c33018d8e01cf33fba47e53..ed4839afdcef63782be0510b876915d3522c8e10 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -82,7 +82,7 @@ static bool
 join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame,
             const char *key)
 {
-       bool is_invited, is_banned;
+       bool is_invited, is_banned, is_exception;
        const char *channel_modes;
 
        /* Allow IRC operators to overwrite channel limits */
@@ -90,9 +90,10 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame,
                return true;
 
        is_banned = Lists_Check(Channel_GetListBans(chan), Client);
+       is_exception = Lists_Check(Channel_GetListExcepts(chan), Client);
        is_invited = Lists_Check(Channel_GetListInvites(chan), Client);
 
-       if (is_banned && !is_invited) {
+       if (is_banned && !is_invited && !is_exception) {
                /* Client is banned from channel (and not on invite list) */
                IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG,
                                   Client_ID(Client), channame);
@@ -166,8 +167,10 @@ join_set_channelmodes(CHANNEL *chan, CLIENT *target, const char *flags)
                }
        }
 
-       /* If channel persistent and client is ircop: make client chanop */
-       if (strchr(Channel_Modes(chan), 'P') && strchr(Client_Modes(target), 'o'))
+       /* If the channel is persistent (+P) and client is an IRC op:
+        * make client chanop, if not disabled in configuration. */
+       if (strchr(Channel_Modes(chan), 'P') && Conf_OperChanPAutoOp
+           && strchr(Client_Modes(target), 'o'))
                Channel_UserModeAdd(chan, target, 'o');
 } /* join_set_channelmodes */
 
@@ -509,7 +512,7 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
        CHANNEL *chan;
        CLIENT *from;
        char *topic;
-       bool onchannel, topicok, use_servermode, r;
+       bool r, topic_power;
 
        assert( Client != NULL );
        assert( Req != NULL );
@@ -532,12 +535,17 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
                return IRC_WriteStrClient(from, ERR_NOSUCHCHANNEL_MSG,
                                          Client_ID(from), Req->argv[0]);
 
-       Channel_CheckAdminRights(chan, Client, from,
-                                &onchannel, &topicok, &use_servermode);
-
-       if (!onchannel && !topicok)
-               return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG,
-                                         Client_ID(from), Req->argv[0]);
+       /* Only remote servers and channel members are allowed to change the
+        * channel topic, and IRC opreators when the Conf_OperCanMode option
+        * is set in the server configuration. */
+       if (Client_Type(Client) != CLIENT_SERVER) {
+               topic_power = Client_HasMode(from, 'o');
+               if (!Channel_IsMemberOf(chan, from)
+                   && !(Conf_OperCanMode && topic_power))
+                       return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG,
+                                                 Client_ID(from), Req->argv[0]);
+       } else
+               topic_power = true;
 
        if (Req->argc == 1) {
                /* Request actual topic */
@@ -564,8 +572,12 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
        }
 
        if (strchr(Channel_Modes(chan), 't')) {
-               /* Topic Lock. Is the user a channel or IRC operator? */
-               if (!topicok)
+               /* Topic Lock. Is the user a channel op or IRC operator? */
+               if(!topic_power &&
+                  !strchr(Channel_UserModes(chan, from), 'h') &&
+                  !strchr(Channel_UserModes(chan, from), 'o') &&
+                  !strchr(Channel_UserModes(chan, from), 'a') &&
+                  !strchr(Channel_UserModes(chan, from), 'q'))
                        return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG,
                                                  Client_ID(from),
                                                  Channel_Name(chan));
@@ -577,7 +589,7 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
                 Client_TypeText(from), Client_Mask(from), Channel_Name(chan),
                 Req->argv[1][0] ? Req->argv[1] : "<none>");
 
-       if (use_servermode)
+       if (Conf_OperServerMode)
                from = Client_ThisServer();
 
        /* Update channel and forward new topic to other servers */
@@ -650,7 +662,7 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
                        /* Target is indeed an other server, forward it! */
                        return IRC_WriteStrClientPrefix(target, from,
                                                        "LIST %s :%s",
-                                                       Client_ID(from),
+                                                       Req->argv[0],
                                                        Req->argv[1]);
                }
        }
@@ -665,10 +677,12 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
                        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"))
+                                   || Channel_IsMemberOf(chan, from)
+                                   || (!Conf_MorePrivacy && Client_OperByMe(Client))) {
+                                       if ((Conf_MaxListSize > 0)
+                                           && IRC_CheckListTooBig(from, count,
+                                                                  Conf_MaxListSize,
+                                                                  "LIST"))
                                                break;
                                        if (!IRC_WriteStrClient(from,
                                             RPL_LIST_MSG, Client_ID(from),