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

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 0f24ae6e..684cc639 100644
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -14,14 +14,14 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc.c,v 1.111 2002/12/27 13:17:04 alex Exp $";
+static char UNUSED id[] = "$Id: irc.c,v 1.114 2002/12/31 16:09:55 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "conn.h"
+#include "conn-func.h"
 #include "client.h"
 #include "channel.h"
 #include "defines.h"
@@ -52,7 +52,7 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
 {
 	CLIENT *prefix, *c;
 	CHAR reason[COMMAND_LEN];
-	CONN_ID conn;
+	CONN_ID my_conn, conn;
 
 	assert( Client != NULL );
 	assert( Req != NULL );
@@ -80,13 +80,16 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
 	/* Inform other servers */
 	IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s", Req->argv[0], reason );
 
+	/* Save ID of this connection */
+	my_conn = Client_Conn( Client );
+	
 	/* Do we host such a client? */
 	c = Client_Search( Req->argv[0] );
 	if( c )
 	{
 		/* 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 ));
+		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 ));
 		else
 		{
 			/* Kill user NOW! */
@@ -98,7 +101,7 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
 	else Log( LOG_NOTICE, "Client with nick \"%s\" is unknown here.", Req->argv[0] );
 
 	/* Are we still connected or were we killed, too? */
-	if( Client_Search( Req->argv[0] )) return CONNECTED;
+	if( Client_GetFromConn( my_conn )) return CONNECTED;
 	else return DISCONNECTED;
 } /* IRC_KILL */