X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=0f24ae6e2bfa8cdf6aff8337f4e7064dd9f15014;hp=415c55fbabc823a334eeb079189745852aaf121f;hb=01bec0daa2c010f6b4c8bac230edd4565ee03894;hpb=695631b2984111a825346396dc56635a2fe3a7c4

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 415c55fb..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.108 2002/12/26 17:04:54 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>
@@ -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,33 @@ 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 */
-	if( Client_Type( Client ) == CLIENT_USER ) sprintf( reason, "KILLed by %s: %s", Client_ID( Client ), Req->argv[1] );
+	/* Build reason string */
+	if( Client_Type( Client ) == CLIENT_USER ) snprintf( reason, sizeof( reason ), "KILLed by %s: %s", Client_ID( Client ), Req->argv[1] );
 	else strlcpy( reason, Req->argv[1], sizeof( reason ));
 
-	/* 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, 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] );
 
-	return CONNECTED;
+	/* Are we still connected or were we killed, too? */
+	if( Client_Search( Req->argv[0] )) return CONNECTED;
+	else return DISCONNECTED;
 } /* IRC_KILL */