The KILL command killed much more than desired (including server links!)

when the target user is connected to a remote server.

diff --git a/ChangeLog b/ChangeLog
index c18dd1b0efc76a6e83b14e2c33f2a493e292ac74..8e96ff6173f505830ecae37d18f32442a84ec56f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,12 @@
                                -- ChangeLog --
 
 
+ngIRCd 0.9.x
+
+  - The KILL command killed much more than desired (including server links!)
+    when the target user is connected to a remote server. Bug introduced in
+    ngIRCd 0.9.0 ...  Reported by <qssl@fastmail.fm>, Thanks!
+
 ngIRCd 0.9.0 (2005-07-24)
 
   ngIRCd 0.9.0-pre1 (2005-07-09)
@@ -612,4 +618,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: ChangeLog,v 1.276.2.5 2005/07/24 21:39:45 alex Exp $
+$Id: ChangeLog,v 1.276.2.6 2005/08/02 23:08:26 alex Exp $

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 139531266fef48f3d80c37acd66ec5131031ed0d..fc3d1ecab9f53fa78a2537b619f3402b8c610e3c 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc.c,v 1.126 2005/04/18 15:44:39 alex Exp $";
+static char UNUSED id[] = "$Id: irc.c,v 1.126.2.1 2005/08/02 23:08:27 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -151,7 +151,7 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
                }
 
                /* Kill client NOW! */
-               conn = Client_Conn( Client_NextHop( c ));
+               conn = Client_Conn( c );
                Client_Destroy( c, NULL, reason, false );
                if( conn > NONE )
                        Conn_Close( conn, NULL, reason, true );