From: Alexander Barton <alex@barton.de>
Date: Fri, 27 Dec 2002 13:17:04 +0000 (+0000)
Subject: - KILL can't kill server-links any more.
X-Git-Tag: rel-0-7-0-pre1~143
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=01bec0daa2c010f6b4c8bac230edd4565ee03894

- KILL can't kill server-links any more.
---

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 56070951..0f24ae6e 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.110 2002/12/26 18:41:00 alex Exp $";
+static char UNUSED id[] = "$Id: irc.c,v 1.111 2002/12/27 13:17:04 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -84,10 +84,16 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
 	c = Client_Search( Req->argv[0] );
 	if( c )
 	{
-		/* Ja, wir haben einen solchen Client */
-		conn = Client_Conn( c );
-		Client_Destroy( c, NULL, reason, FALSE );
-		if( conn != NONE ) Conn_Close( Client_Conn( c ), NULL, reason, TRUE );
+		/* Yes, there is such a client -- but is it a valid user? */
+		if( Client_Type( c ) == CLIENT_SERVER ) IRC_WriteStrClient( prefix, ERR_CANTKILLSERVER_MSG, Client_ID( prefix ));
+		else if( Client_Type( c ) != CLIENT_USER  )IRC_WriteStrClient( prefix, ERR_NOPRIVILEGES_MSG, Client_ID( prefix ));
+		else
+		{
+			/* Kill user NOW! */
+			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] );