CVSROOT    : /cvsroot/undernet-ircu
Module     : ircu2.10
Branch tags: u2_10_11_03
Commit time: 2002-11-23 20:01:46 UTC

Modified files:
  Tag: u2_10_11_03
     ChangeLog ircd/m_kick.c

Log message:

Author: Kev <[EMAIL PROTECTED]>
Log message:

Kicks from users should appear to be from users.

---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.125.2.18 ircu2.10/ChangeLog:1.290.2.125.2.19
--- ircu2.10/ChangeLog:1.290.2.125.2.18 Sat Nov 23 11:45:49 2002
+++ ircu2.10/ChangeLog  Sat Nov 23 12:01:35 2002
@@ -1,5 +1,8 @@
 2002-11-23  Kevin L Mitchell  <[EMAIL PROTECTED]>
 
+       * ircd/m_kick.c (ms_kick): if a kick comes from a user, it should
+       *appear* to be from the user
+
        * ircd/s_bsd.c (deliver_it): this should have been a ClrFlag(),
        not a SetFlag()--caused crashes on /restart and probably other
        nastiness
Index: ircu2.10/ircd/m_kick.c
diff -u ircu2.10/ircd/m_kick.c:1.6.2.1.8.4 ircu2.10/ircd/m_kick.c:1.6.2.1.8.5
--- ircu2.10/ircd/m_kick.c:1.6.2.1.8.4  Sat Nov 23 11:05:08 2002
+++ ircu2.10/ircd/m_kick.c      Sat Nov 23 12:01:36 2002
@@ -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.6.2.1.8.4 2002/11/23 19:05:08 klmitch Exp $
+ * $Id: m_kick.c,v 1.6.2.1.8.5 2002/11/23 20:01:36 klmitch Exp $
  */
 
 /*
@@ -145,8 +145,8 @@
     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);
+  sendcmdto_channel_butserv_butone(sptr, CMD_KICK, chptr, NULL, "%H %C :%s",
+                                  chptr, who, comment);
 
   make_zombie(member, who, cptr, sptr, chptr);
 
@@ -227,8 +227,9 @@
                          comment);
 
     if (member) { /* and tell the channel about it */
-      sendcmdto_channel_butserv_butone(&me, CMD_KICK, chptr, NULL, "%H %C :%s", 
chptr, who,
-                               comment);
+      sendcmdto_channel_butserv_butone(IsServer(sptr) ? &me : sptr, CMD_KICK,
+                                      chptr, NULL, "%H %C :%s", chptr, who,
+                                      comment);
 
       make_zombie(member, who, cptr, sptr, chptr);
     }
----------------------- End of diff -----------------------

Reply via email to