repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 01bec0daa2c010f6b4c8bac230edd4565ee03894:
path_to: 
revision_to: 

commit 01bec0daa2c010f6b4c8bac230edd4565ee03894
Author: Alexander Barton 
Date:   Fri Dec 27 13:17:04 2002 +0000

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

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c

--- 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 
@@ -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] );

-----END OF PAGE-----