- Fixed KILL: you can't crash the server by killing yourself any more;

  and ngIRCd no longer sends a QUIT to other servers after the KILL. (HEAD)

diff --git a/ChangeLog b/ChangeLog
index 2036815c8812d3bc65217f6a7c6024bb430d9ee2..83da5eea53fda07a19e1761750da386d6447282b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,14 @@
                         -- ChangeLog / Aenderungen --
 
 
+ngIRCd 0.6.x-CVS
+
+  - Fixed KILL: you can't crash the server by killing yourself any more;
+    and ngIRCd no longer sends a QUIT to other servers after the KILL.
+
+
+Older changes (sorry, only available in german language):
+
 ngIRCd 0.6.0, 2002-12-24
 
   ngIRCd 0.6.0-pre2, 2002-12-23
@@ -369,4 +377,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: ChangeLog,v 1.147.2.3 2002/12/24 13:53:54 alex Exp $
+$Id: ChangeLog,v 1.147.2.4 2002/12/26 19:01:29 alex Exp $

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 5480efbde4647b7d8ad6bcf11fffc88205adb52a..99c0627125cc72eae6a8ecb65662a497abf0646f 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.107 2002/12/12 12:24:18 alex Exp $";
+static char UNUSED id[] = "$Id: irc.c,v 1.107.2.1 2002/12/26 19:01:29 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -52,14 +52,15 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *prefix, *c;
        CHAR reason[COMMAND_LEN];
+       CONN_ID conn;
 
        assert( Client != NULL );
        assert( Req != NULL );
 
-       /* is the user an IRC operator? */
+       /* Is the user an IRC operator? */
        if(( Client_Type( Client ) != CLIENT_SERVER ) && ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
 
-       /* Falsche Anzahl Parameter? */
+       /* Bad number of parameters? */
        if(( Req->argc != 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
        if( Req->prefix ) prefix = Client_Search( Req->prefix );
@@ -72,24 +73,27 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
 
        Log( LOG_NOTICE|LOG_snotice, "Got KILL command from \"%s\" for \"%s\": %s", Client_Mask( prefix ), Req->argv[0], Req->argv[1] );
 
-       /* build reason string */
+       /* Build reason string */
        if( Client_Type( Client ) == CLIENT_USER ) sprintf( reason, "KILLed by %s: %s", Client_ID( Client ), Req->argv[1] );
        else strcpy( reason, Req->argv[1] );
 
-       /* andere Server benachrichtigen */
+       /* Inform other servers */
        IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s", Req->argv[0], reason );
 
-       /* haben wir selber einen solchen Client? */
+       /* Do we host such a client? */
        c = Client_Search( Req->argv[0] );
        if( c )
        {
-               /* Ja, wir haben einen solchen Client */
-               if( Client_Conn( c ) != NONE ) Conn_Close( Client_Conn( c ), NULL, reason, TRUE );
-               else Client_Destroy( c, NULL, reason, TRUE );
+               /* Yes, I found it! */
+               conn = Client_Conn( c );
+               Client_Destroy( c, NULL, reason, FALSE );
+               if( conn != NONE ) Conn_Close( Client_Conn( c ), NULL, reason, TRUE );
        }
        else Log( LOG_NOTICE, "Client with nick \"%s\" is unknown here.", Req->argv[0] );
 
-       return CONNECTED;
+       /* Are we still connected or were we killed, too? */
+       if( Client_Search( Req->argv[0] )) return CONNECTED;
+       else return DISCONNECTED;
 } /* IRC_KILL */