Fix desync when an oplevel deop is bounced (#1298140).

[ircu2.10.12-pk.git] / ircd / m_kick.c

diff --git a/ircd/m_kick.c b/ircd/m_kick.c
index 2096bf5f04274ab8bc9b5a6347161a25b57d0465..b21f770c78cfa5fa6a2843a6604adc64a2819cb8 100644 (file)
--- a/ircd/m_kick.c
+++ b/ircd/m_kick.c
@@ -85,6 +85,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -93,7 +94,7 @@
 #include "send.h"
 #include "ircd_features.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * m_kick - generic message handler
@@ -142,7 +143,7 @@ int m_kick(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
     return send_reply(sptr, ERR_USERNOTINCHANNEL, cli_name(who), chptr->chname);
 
   /* Don't allow to kick member with a higher or equal op-level */
-  if ((OpLevel(member) <= OpLevel(member2)) && feature_bool(FEAT_OPLEVELS))
+  if (chptr->mode.apass[0] && OpLevel(member) <= OpLevel(member2))
     return send_reply(sptr, ERR_NOTLOWEROPLEVEL, cli_name(who), chptr->chname,
        OpLevel(member2), OpLevel(member), "kick",
        OpLevel(member) == OpLevel(member2) ? "the same" : "a higher");
@@ -159,10 +160,11 @@ int m_kick(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
      * the kicking and the victim */
     if (MyUser(who))
       sendcmdto_one(sptr, CMD_KICK, who, "%H %C :%s", chptr, who, comment);
+    sendcmdto_one(who, CMD_JOIN, sptr, "%H", chptr);
     sendcmdto_one(sptr, CMD_KICK, sptr, "%H %C :%s", chptr, who, comment);
     CheckDelayedJoins(chptr);
   } else
-    sendcmdto_channel_butserv_butone(sptr, CMD_KICK, chptr, NULL, "%H %C :%s", chptr, who,
+    sendcmdto_channel_butserv_butone(sptr, CMD_KICK, chptr, NULL, 0, "%H %C :%s", chptr, who,
                                      comment);
 
   make_zombie(member, who, cptr, sptr, chptr);
@@ -232,9 +234,9 @@ int ms_kick(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
                    MODEBUF_DEST_BOUNCE)); /* And bounce the MODE */
 
       if (IsChanOp(member))
-       modebuf_mode_client(&mbuf, MODE_DEL | MODE_CHANOP, who);
+       modebuf_mode_client(&mbuf, MODE_DEL | MODE_CHANOP, who, MAXOPLEVEL + 1);
       if (HasVoice(member))
-       modebuf_mode_client(&mbuf, MODE_DEL | MODE_VOICE, who);
+       modebuf_mode_client(&mbuf, MODE_DEL | MODE_VOICE, who, MAXOPLEVEL + 1);
 
       modebuf_flush(&mbuf);
     }
@@ -244,8 +246,8 @@ int ms_kick(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
                          comment);
 
     if (member) { /* and tell the channel about it */
-      sendcmdto_channel_butserv_butone(IsServer(sptr) ? &me : sptr, CMD_KICK,
-                                      chptr, NULL, "%H %C :%s", chptr, who,
+      sendcmdto_channel_butserv_butone(IsServer(sptr) ? &his : sptr, CMD_KICK,
+                                      chptr, NULL, 0, "%H %C :%s", chptr, who,
                                       comment);
 
       make_zombie(member, who, cptr, sptr, chptr);