From: Alexander Barton <alex@barton.de>
Date: Tue, 29 Apr 2003 12:20:14 +0000 (+0000)
Subject: The KILL comand verifies and logs more parameters. [from HEAD]
X-Git-Tag: rel-0-7-0~4
X-Git-Url: https://arthur.barton.de/gitweb/?a=commitdiff_plain;h=322d3ebaec0638d830d6ae3e55a6f7fcd4a3601d;p=ngircd-alex.git

The KILL comand verifies and logs more parameters. [from HEAD]
---

diff --git a/ChangeLog b/ChangeLog
index 0da3233d..f78fe7d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
 
 
 ngIRCd 0.7.0
+  - The KILL comand verifies and logs more parameters.
 
   ngIRCd 0.7.0-pre2 (2003-04-27)
   - CVS build system fixes (made autogen.sh more portable).
@@ -445,4 +446,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: ChangeLog,v 1.188.2.10 2003/04/27 18:33:26 alex Exp $
+$Id: ChangeLog,v 1.188.2.11 2003/04/29 12:20:14 alex Exp $
diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 6d977be4..2f2874a6 100644
--- 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.120 2003/03/31 15:54:21 alex Exp $";
+static char UNUSED id[] = "$Id: irc.c,v 1.120.2.1 2003/04/29 12:20:14 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -95,8 +95,30 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
 	if( c )
 	{
 		/* Yes, there is such a client -- but is it a valid user? */
-		if( Client_Type( c ) == CLIENT_SERVER ) IRC_WriteStrClient( Client, ERR_CANTKILLSERVER_MSG, Client_ID( Client ));
-		else if( Client_Type( c ) != CLIENT_USER  )IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
+		if( Client_Type( c ) == CLIENT_SERVER )
+		{
+			if( Client != Client_ThisServer( )) IRC_WriteStrClient( Client, ERR_CANTKILLSERVER_MSG, Client_ID( Client ));
+			else
+			{
+				/* Oops, I should kill another server!? */
+				Log( LOG_ERR, "Can't KILL server \"%s\"!", Req->argv[0] );
+				conn = Client_Conn( Client_NextHop( c ));
+				assert( conn > NONE );
+				Conn_Close( conn, NULL, "Nick collision for server!?", TRUE );
+			}
+		}
+		else if( Client_Type( c ) != CLIENT_USER  )
+		{
+			if( Client != Client_ThisServer( )) IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
+			else
+			{
+				/* Oops, what sould I close?? */
+				Log( LOG_ERR, "Can't KILL \"%s\": invalid client type!", Req->argv[0] );
+				conn = Client_Conn( Client_NextHop( c ));
+				assert( conn > NONE );
+				Conn_Close( conn, NULL, "Collision for invalid client type!?", TRUE );
+			}
+		}
 		else
 		{
 			/* Kill user NOW! */