Forward port of delayed-join.patch from Quakenet's "Asuka" patch set

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

diff --git a/ircd/m_kick.c b/ircd/m_kick.c
index 97b59e4d1b18f77d76555d5164b454175dbc28db..2096bf5f04274ab8bc9b5a6347161a25b57d0465 100644 (file)
--- a/ircd/m_kick.c
+++ b/ircd/m_kick.c
@@ -154,8 +154,16 @@ int m_kick(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
     sendcmdto_serv_butone(sptr, CMD_KICK, cptr, "%H %C :%s", chptr, who,
                          comment);
 
-  sendcmdto_channel_butserv_butone(sptr, CMD_KICK, chptr, NULL, "%H %C :%s", chptr, who,
-                           comment);
+  if (IsDelayedJoin(member)) {
+    /* If it's a delayed join, only send the KICK to the person doing
+     * the kicking and the victim */
+    if (MyUser(who))
+      sendcmdto_one(sptr, CMD_KICK, who, "%H %C :%s", chptr, who, comment);
+    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,
+                                     comment);
 
   make_zombie(member, who, cptr, sptr, chptr);