[Parser]: Don't use Client_Type after command has been processed.

[ngircd.git] / src / ngircd / parse.c

diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c
index 5109169b72a068b8ff4655adda8bcb6637c093b1..f77d5b08d88ba062327825c28447145e60933156 100644 (file)
--- a/src/ngircd/parse.c
+++ b/src/ngircd/parse.c
@@ -12,7 +12,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: parse.c,v 1.69 2007/11/21 12:16:36 alex Exp $";
+static char UNUSED id[] = "$Id: parse.c,v 1.69.2.1 2008/02/05 13:11:20 fw Exp $";
 
 /**
  * @file
@@ -358,7 +358,7 @@ Handle_Request( CONN_ID Idx, REQUEST *Req )
        bool result;
        COMMAND *cmd;
        NUMERIC *num;
-       int i;
+       int i, client_type;
 
        assert( Idx >= 0 );
        assert( Req != NULL );
@@ -436,6 +436,7 @@ Handle_Request( CONN_ID Idx, REQUEST *Req )
        }
 
        cmd = My_Commands;
+       client_type = Client_Type(client);
        while( cmd->name )
        {
                /* Befehl suchen */
@@ -444,7 +445,7 @@ Handle_Request( CONN_ID Idx, REQUEST *Req )
                        cmd++; continue;
                }
 
-               if( Client_Type( client ) & cmd->type )
+               if( client_type & cmd->type )
                {
                        /* Command is allowed for this client: call it and count produced bytes */
                        Conn_ResetWCounter( );
@@ -452,7 +453,7 @@ Handle_Request( CONN_ID Idx, REQUEST *Req )
                        cmd->bytes += Conn_WCounter( );
 
                        /* Adjust counters */
-                       if( Client_Type( client ) != CLIENT_SERVER ) cmd->lcount++;
+                       if( client_type != CLIENT_SERVER ) cmd->lcount++;
                        else cmd->rcount++;
 
                        return result;