Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_12_branch
Commit time: 2005-10-01 21:10:44 UTC
Modified files:
Tag: u2_10_12_branch
ChangeLog ircd/m_kick.c
Log message:
Only send remote KICK to users if target is not join-delayed.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.710.2.3 ircu2.10/ChangeLog:1.710.2.4
--- ircu2.10/ChangeLog:1.710.2.3 Sat Oct 1 07:55:46 2005
+++ ircu2.10/ChangeLog Sat Oct 1 14:10:34 2005
@@ -1,5 +1,10 @@
2005-10-01 Michael Poole <[EMAIL PROTECTED]>
+ * ircd/m_kick.c (ms_kick): If the kick target is join-delayed,
+ only send the KICK to the kicker. Spotted by Cesar_.
+
+2005-10-01 Michael Poole <[EMAIL PROTECTED]>
+
* include/patchlevel.h (PATCHLEVEL): Update to pre1.
* ircd/class.c (init_class): Only set default class's ->next
Index: ircu2.10/ircd/m_kick.c
diff -u ircu2.10/ircd/m_kick.c:1.19 ircu2.10/ircd/m_kick.c:1.19.2.1
--- ircu2.10/ircd/m_kick.c:1.19 Wed Sep 28 16:08:14 2005
+++ ircu2.10/ircd/m_kick.c Sat Oct 1 14:10:34 2005
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: m_kick.c,v 1.19 2005/09/28 23:08:14 entrope Exp $
+ * $Id: m_kick.c,v 1.19.2.1 2005/10/01 21:10:34 entrope Exp $
*/
/*
@@ -246,9 +246,15 @@
comment);
if (member) { /* and tell the channel about it */
- sendcmdto_channel_butserv_butone(IsServer(sptr) ? &his : sptr, CMD_KICK,
- chptr, NULL, 0, "%H %C :%s", chptr, who,
- comment);
+ if (IsDelayedJoin(member)) {
+ if (MyUser(who))
+ sendcmdto_one(IsServer(sptr) ? &his : sptr, CMD_KICK,
+ who, "%h %C :%s", chptr, who, comment);
+ } else {
+ 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);
}
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
