- Fixed test if we are still connected after a KILL command.

[ngircd-alex.git] / src / ngircd / irc.c

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 56070951cec17bcc8beeb722fbb755a1f5ac064b..684cc639abe66888a3fbd865ee07ada74315f231 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -14,14 +14,14 @@
 
 #include "portab.h"
 
 
 #include "portab.h"
 

-static char UNUSED id[] = "$Id: irc.c,v 1.110 2002/12/26 18:41:00 alex Exp $";
+static char UNUSED id[] = "$Id: irc.c,v 1.114 2002/12/31 16:09:55 alex Exp $";

 
 #include "imp.h"
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 
 
 #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"
 #include "client.h"
 #include "channel.h"
 #include "defines.h"


@@ -52,7 +52,7 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *prefix, *c;
        CHAR reason[COMMAND_LEN];
 {
        CLIENT *prefix, *c;
        CHAR reason[COMMAND_LEN];

-       CONN_ID conn;
+       CONN_ID my_conn, conn;

 
        assert( Client != NULL );
        assert( Req != NULL );
 
        assert( Client != NULL );
        assert( Req != NULL );


@@ -80,19 +80,28 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
        /* Inform other servers */
        IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s", Req->argv[0], reason );
 
        /* 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 )
        {
        /* Do we host such a client? */
        c = Client_Search( Req->argv[0] );
        if( c )
        {

-               /* Ja, wir haben einen solchen Client */
-               conn = Client_Conn( c );
-               Client_Destroy( c, NULL, reason, FALSE );
-               if( conn != NONE ) Conn_Close( Client_Conn( c ), NULL, reason, 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] );
 
        /* Are we still connected or were we killed, too? */
        }
        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 */
 
        else return DISCONNECTED;
 } /* IRC_KILL */