From 01b58a05823de3c63460a8e708913faa3f6680e9 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Tue, 31 Dec 2002 16:09:55 +0000 Subject: [PATCH] - Fixed test if we are still connected after a KILL command. --- src/ngircd/irc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index bd44f467..684cc639 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.113 2002/12/30 17:15:42 alex Exp $"; +static char UNUSED id[] = "$Id: irc.c,v 1.114 2002/12/31 16:09:55 alex Exp $"; #include "imp.h" #include @@ -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,6 +80,9 @@ 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 ) @@ -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 */