Fix +J not checking for local clients properly.

[irc/rqf/shadowircd.git] / modules / core / m_kick.c

diff --git a/modules/core/m_kick.c b/modules/core/m_kick.c
index 2dcdcc50fbdd1681c7acb8e237f173508f9c2ce7..a85b7a7f4a771465b3f86af89a954b2d4bfa4f9b 100644 (file)
--- a/modules/core/m_kick.c
+++ b/modules/core/m_kick.c
@@ -206,7 +206,7 @@ m_kick(struct Client *client_p, struct Client *source_p, int parc, const char *p
                if(is_override)
                        sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
                                        "%s is overriding KICK [%s] on [%s] [%s]",
-                                       get_oper_name(source_p), command, who->name, chptr->chname, comment);
+                                       get_oper_name(source_p), who->name, chptr->chname, comment);
 
                /* jdc
                 * - In the case of a server kicking a user (i.e. CLEARCHAN),
@@ -228,6 +228,10 @@ m_kick(struct Client *client_p, struct Client *source_p, int parc, const char *p
                              ":%s KICK %s %s :%s",
                              use_id(source_p), chptr->chname, use_id(who), comment);
                remove_user_from_channel(msptr);
+
+               /* we don't need to track NOREJOIN stuff unless it's our client being kicked */
+               if(MyClient(who) && chptr->mode.mode & MODE_NOREJOIN)
+                       channel_metadata_time_add(chptr, "KICKNOREJOIN", rb_current_time(), who->id);
        }
        else if (MyClient(source_p))
                sendto_one_numeric(source_p, ERR_USERNOTINCHANNEL,