When sending an error use the IRC_WriteErrClient() variant

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

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index d5e7bdd1b474a1882c0cca04048a624c17032ac3..0421d9170201b9d7d81f26d6b61feea4ee584c2d 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -129,7 +129,7 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame,
                return false;
        }
 
-       if (Channel_HasMode(chan, 'O') && !Client_OperByMe(Client)) {
+       if (Channel_HasMode(chan, 'O') && !Client_HasMode(Client, 'o')) {
                /* Only IRC operators are allowed! */
                IRC_WriteErrClient(Client, ERR_OPONLYCHANNEL_MSG,
                                   Client_ID(Client), channame);
@@ -323,11 +323,9 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
        channame = strtok_r(channame, ",", &lastchan);
 
        /* Make sure that "channame" is not the empty string ("JOIN :") */
-       if (!channame) {
-               IRC_SetPenalty(Client, 2);
+       if (!channame)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
-       }
 
        while (channame) {
                flags = NULL;
@@ -447,11 +445,9 @@ IRC_PART(CLIENT * Client, REQUEST * Req)
        chan = strtok(Req->argv[0], ",");
 
        /* Make sure that "chan" is not the empty string ("PART :") */
-       if (!chan) {
-               IRC_SetPenalty(Client, 2);
+       if (!chan)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
-       }
 
        while (chan) {
                Channel_Part(target, Client, chan,
@@ -619,7 +615,10 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
                                /* Gotcha! */
                                if (!Channel_HasMode(chan, 's')
                                    || Channel_IsMemberOf(chan, from)
-                                   || (!Conf_MorePrivacy && Client_OperByMe(Client))) {
+                                   || (!Conf_MorePrivacy
+                                       && Client_HasMode(Client, 'o')
+                                       && Client_Conn(Client) > NONE))
+                               {
                                        if ((Conf_MaxListSize > 0)
                                            && IRC_CheckListTooBig(from, count,
                                                                   Conf_MaxListSize,
@@ -666,11 +665,9 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
        assert( Req != NULL );
 
        /* Bad number of parameters? */
-       if (Req->argc < 2 || Req->argc == 4 || Req->argc > 5) {
-               IRC_SetPenalty(Client, 2);
+       if (Req->argc < 2 || Req->argc == 4 || Req->argc > 5)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
-       }
 
        /* Compatibility kludge */
        if (Req->argc == 5)