From 234f9472c2f7e2d2d87edc55360d1b7c34993969 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Sat, 1 Jun 2002 14:39:34 +0000 Subject: [PATCH] - IRC_KICK() implementiert. --- src/ngircd/irc-op.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c index e5e66d81..2590f916 100644 --- a/src/ngircd/irc-op.c +++ b/src/ngircd/irc-op.c @@ -9,7 +9,7 @@ * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. * - * $Id: irc-op.c,v 1.1 2002/05/27 11:22:07 alex Exp $ + * $Id: irc-op.c,v 1.2 2002/06/01 14:39:34 alex Exp $ * * irc-op.c: Befehle zur Channel-Verwaltung */ @@ -20,6 +20,7 @@ #include "imp.h" #include #include +#include #include "conn.h" #include "client.h" @@ -37,15 +38,26 @@ GLOBAL BOOLEAN IRC_KICK( CLIENT *Client, REQUEST *Req ) { + CLIENT *target, *from; + assert( Client != NULL ); assert( Req != NULL ); /* Valider Client? */ if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); - /* Keine Parameter? */ - if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + /* Falsche Anzahl Parameter? */ + if(( Req->argc < 2) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + + if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix ); + else from = Client; + if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); + + /* Ziel-User suchen */ + target = Client_Search( Req->argv[1] ); + if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( from ), Req->argv[1] ); + Channel_Kick( target, from, Req->argv[0], Req->argc == 3 ? Req->argv[2] : Client_ID( from )); return CONNECTED; } /* IRC_KICK */ -- 2.39.2