commit - a2119a660a4fada1a9f4da9fe0cdba8ee58c3318
commit + 234f9472c2f7e2d2d87edc55360d1b7c34993969
blob - e5e66d81a7cebf15518e6632ab3cd5374a7daf33
blob + 2590f9164bb682ad41656170c9456318a3bb80f8
--- src/ngircd/irc-op.c
+++ 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 <assert.h>
 #include <string.h>
+#include <stdio.h>
 
 #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 */