Fixed building issues\

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

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 6d8dde3e1e2004d96b580e51ca210f4eb3bfe2fa..02eb235754217588b7767d9d2a13e49a9f0a6201 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -359,6 +359,11 @@ Channel_Kick(CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name,
                    !Channel_UserHasMode(chan, Target, 'a') &&
                    !Channel_UserHasMode(chan, Target, 'o'))
                        can_kick = true;
+               
+               /* IRC operators & IRCd with OperCanMode enabled
+                * can kick anyways regardless of privilege */  
+               else if(Client_HasMode(Origin, 'o') && Conf_OperCanMode)
+                   can_kick = true;
 
                if(!can_kick) {
                        IRC_WriteErrClient(Origin, ERR_CHANOPPRIVTOOLOW_MSG,
@@ -1093,29 +1098,29 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch
 
 
 GLOBAL bool
-Channel_AddBan(CHANNEL *c, const char *mask )
+Channel_AddBan(CHANNEL *c, const char *mask, const char *who )
 {
        struct list_head *h = Channel_GetListBans(c);
        LogDebug("Adding \"%s\" to \"%s\" ban list", mask, Channel_Name(c));
-       return Lists_Add(h, mask, false, NULL);
+       return Lists_Add(h, mask, time(NULL), who, false);
 }
 
 
 GLOBAL bool
-Channel_AddExcept(CHANNEL *c, const char *mask )
+Channel_AddExcept(CHANNEL *c, const char *mask, const char *who )
 {
        struct list_head *h = Channel_GetListExcepts(c);
        LogDebug("Adding \"%s\" to \"%s\" exception list", mask, Channel_Name(c));
-       return Lists_Add(h, mask, false, NULL);
+       return Lists_Add(h, mask, time(NULL), who, false);
 }
 
 
 GLOBAL bool
-Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce)
+Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce, const char *who )
 {
        struct list_head *h = Channel_GetListInvites(c);
        LogDebug("Adding \"%s\" to \"%s\" invite list", mask, Channel_Name(c));
-       return Lists_Add(h, mask, onlyonce, NULL);
+       return Lists_Add(h, mask, time(NULL), who, onlyonce);
 }
 
 
@@ -1132,7 +1137,9 @@ ShowChannelList(struct list_head *head, CLIENT *Client, CHANNEL *Channel,
        while (e) {
                if (!IRC_WriteStrClient(Client, msg, Client_ID(Client),
                                        Channel_Name(Channel),
-                                       Lists_GetMask(e)))
+                                       Lists_GetMask(e),
+                                       Lists_GetReason(e),
+                                       Lists_GetValidity(e)))
                        return DISCONNECTED;
                e = Lists_GetNext(e);
        }