Author: Ghostwolf <foxxe@wtfs.net>

Log message:
LAst of the last of the bug fixes in do_kill. Must be more careful when forward porting by hand.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@674 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index d2c7544c5c21857769caff0ea8f09781d08be4ee..14a5324a9b7c7fcebf48186cdf6277ef7d1c3ab0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-13 Joseph Bongaarts <foxxe@wtfs.net>
+
+       * ircd/m_kill.c: Last of the last of the bug fixes (Thanks Spike).
+       Must be more careful when forward porting by hand...
+       
 2002-03-13  Carlo Wood  <run@alinoe.com>
 
        * include/channel.h: CHFL_CHANNEL_MANAGER, new local

diff --git a/ircd/m_kill.c b/ircd/m_kill.c
index 978119e169fed705f38510323b7d21c2d35bb863..c32c6ef138da1c4a91535c987ebf142cf2c70ab2 100644 (file)
--- a/ircd/m_kill.c
+++ b/ircd/m_kill.c
@@ -113,7 +113,11 @@ static int do_kill(struct Client* cptr, struct Client* sptr,
   assert(0 != sptr);
   assert(IsUser(victim));
 
-  if (!MyConnect || IsServer(sptr)) 
+  /* If we got this from a *local* oper, then path only contains the
+   * kill comment. Remote oper or server kills will at least have
+   * some kind of path preceding it.    -GW
+   */
+  if (IsServer(cptr)) 
   {
      if (!(comment = strchr(path, ' ')))
        comment = "No reason supplied";