Add Doxygen @file documentation to each source and header file

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

diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c
index 68b5eb6fb5f559fe47252a9e34949f01f125ff91..7887ef6075260dd670d907a5e86e8fe322e8b247 100644 (file)
--- a/src/ngircd/irc-oper.c
+++ b/src/ngircd/irc-oper.c
@@ -7,24 +7,26 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
- *
- * IRC operator commands
  */
 
 
 #include "portab.h"
 
+/**
+ * @file
+ * IRC operator commands
+ */
+
 #include "imp.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <signal.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 +57,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' ))
        {
@@ -147,8 +150,8 @@ IRC_REHASH( CLIENT *Client, REQUEST *Req )
        if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
        Log( LOG_NOTICE|LOG_snotice, "Got REHASH command from \"%s\" ...", Client_Mask( Client ));
-       NGIRCd_SignalRehash = true;
-       
+       raise(SIGHUP);
+
        return CONNECTED;
 } /* IRC_REHASH */
 
@@ -184,7 +187,8 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req)
        assert(Client != NULL);
        assert(Req != NULL);
 
-       if (!Op_Check(Client, Req))
+       if (Client_Type(Client) != CLIENT_SERVER
+           && !Client_HasMode(Client, 'o'))
                return Op_NoPrivileges(Client, Req);
 
        /* Bad number of parameters? */
@@ -203,7 +207,7 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req)
 
        if (Req->argc == 3 || Req->argc == 6) {
                /* This CONNECT has a target parameter */
-               if (Client_Type(Client) == CLIENT_SERVER)
+               if (Client_Type(Client) == CLIENT_SERVER && Req->prefix)
                        from = Client_Search(Req->prefix);
                if (! from)
                        return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
@@ -230,12 +234,8 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req)
                return CONNECTED;
        }
 
-       Log(LOG_NOTICE | LOG_snotice,
-           "Got CONNECT command from \"%s\" for \"%s\".", Client_Mask(from),
-           Req->argv[0]);
-       IRC_SendWallops(Client_ThisServer(), Client_ThisServer(),
-                       "Received CONNECT %s from %s",
-                       Req->argv[0], Client_ID(from));
+       if (!Op_Check(from, Req))
+               return Op_NoPrivileges(Client, Req);
 
        switch (Req->argc) {
        case 1:
@@ -263,6 +263,13 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req)
                                                  Req->argv[0]);
        }
 
+       Log(LOG_NOTICE | LOG_snotice,
+           "Got CONNECT command from \"%s\" for \"%s\".", Client_Mask(from),
+           Req->argv[0]);
+       IRC_SendWallops(Client_ThisServer(), Client_ThisServer(),
+                       "Received CONNECT %s from %s",
+                       Req->argv[0], Client_ID(from));
+
        return CONNECTED;
 } /* IRC_CONNECT */