#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.116 2003/01/08 22:27:13 alex Exp $";
#include "imp.h"
#include <assert.h>
{
CLIENT *prefix, *c;
CHAR reason[COMMAND_LEN];
- CONN_ID conn;
+ CONN_ID my_conn, conn;
assert( Client != NULL );
assert( Req != NULL );
prefix = Client_ThisServer( );
}
- Log( LOG_NOTICE|LOG_snotice, "Got KILL command from \"%s\" for \"%s\": %s", Client_Mask( prefix ), Req->argv[0], Req->argv[1] );
+ if( Client != Client_ThisServer( )) 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 ) snprintf( reason, sizeof( reason ), "KILLed by %s: %s", Client_ID( Client ), Req->argv[1] );
/* 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 )
/* Kill user NOW! */
conn = Client_Conn( c );
Client_Destroy( c, NULL, reason, FALSE );
- if( conn != NONE ) Conn_Close( Client_Conn( c ), NULL, reason, TRUE );
+ if( conn != NONE ) Conn_Close( conn, NULL, reason, TRUE );
}
}
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(( my_conn > NONE ) && ( Client_GetFromConn( my_conn ))) return CONNECTED;
else return DISCONNECTED;
} /* IRC_KILL */