* ngIRCd -- The Next Generation IRC Daemon
* Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
*
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
*
- * $Id: irc.c,v 1.104 2002/11/30 17:39:56 alex Exp $
- *
- * irc.c: IRC-Befehle
+ * IRC commands
*/
#include "portab.h"
+static char UNUSED id[] = "$Id: irc.c,v 1.113 2002/12/30 17:15:42 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"
IRC_KILL( CLIENT *Client, REQUEST *Req )
{
CLIENT *prefix, *c;
+ CHAR reason[COMMAND_LEN];
+ CONN_ID conn;
assert( Client != NULL );
assert( Req != NULL );
- /* Falsche Anzahl Parameter? */
+ /* 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 ));
+
+ /* Bad number of parameters? */
if(( Req->argc != 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
- prefix = Client_Search( Req->prefix );
+ if( Req->prefix ) prefix = Client_Search( Req->prefix );
+ else prefix = Client;
if( ! prefix )
{
Log( LOG_WARNING, "Got KILL with invalid prefix: \"%s\"!", Req->prefix );
prefix = Client_ThisServer( );
}
- Log( LOG_NOTICE, "Got KILL command from \"%s\" for \"%s\": %s", Client_Mask( prefix ), Req->argv[0], Req->argv[1] );
+ Log( LOG_NOTICE|LOG_snotice, "Got KILL command from \"%s\" for \"%s\": %s", Client_Mask( prefix ), Req->argv[0], Req->argv[1] );
- /* andere Server benachrichtigen */
- IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s", 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] );
+ else strlcpy( reason, Req->argv[1], sizeof( reason ));
- /* haben wir selber einen solchen Client? */
+ /* Inform other servers */
+ IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s", Req->argv[0], reason );
+
+ /* 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, Req->argv[1], TRUE );
- else Client_Destroy( c, NULL, Req->argv[1], TRUE );
+ /* Yes, there is such a client -- but is it a valid user? */
+ 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! */
+ 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 */