Make sure signal.h is #include'd when needed

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

diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c
index 17b604465843c6d4f9db12040e3a643f573155f2..a927b1951035aa5b34c0524c263cb6df2cda8c2c 100644 (file)
--- a/src/ngircd/irc-oper.c
+++ b/src/ngircd/irc-oper.c
@@ -21,10 +21,8 @@
 #include <string.h>
 
 #include "ngircd.h"
-#include "resolve.h"
 #include "conn-func.h"
 #include "conf.h"
-#include "client.h"
 #include "channel.h"
 #include "irc-write.h"
 #include "log.h"
@@ -55,25 +53,26 @@ Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg)
 GLOBAL bool
 IRC_OPER( CLIENT *Client, REQUEST *Req )
 {
-       unsigned int i;
+       struct Conf_Oper *op;
+       size_t len, i;
 
        assert( Client != NULL );
        assert( Req != NULL );
 
        if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-       for( i = 0; i < Conf_Oper_Count; i++)
-       {
-               if( Conf_Oper[i].name[0] && Conf_Oper[i].pwd[0] && ( strcmp( Conf_Oper[i].name, Req->argv[0] ) == 0 )) break;
-       }
-       if( i >= Conf_Oper_Count )
+       len = array_length(&Conf_Opers, sizeof(*op));
+       op = array_start(&Conf_Opers);
+       for (i = 0; i < len && strcmp(op[i].name, Req->argv[0]); i++)
+               ;
+       if (i >= len)
                return Bad_OperPass(Client, Req->argv[0], "not configured");
 
-       if( strcmp( Conf_Oper[i].pwd, Req->argv[1] ) != 0 )
-               return Bad_OperPass(Client, Conf_Oper[i].name, "bad password");
+       if (strcmp(op[i].pwd, Req->argv[1]) != 0)
+               return Bad_OperPass(Client, op[i].name, "bad password");
 
-       if( Conf_Oper[i].mask && (! Match( Conf_Oper[i].mask, Client_Mask( Client ) )))
-               return Bad_OperPass(Client, Conf_Oper[i].mask, "hostmask check failed" );
+       if (op[i].mask && (!Match(op[i].mask, Client_Mask(Client))))
+               return Bad_OperPass(Client, op[i].mask, "hostmask check failed");
 
        if( ! Client_HasMode( Client, 'o' ))
        {