Remove an extern, partly because it's unused, partly because it then gets shadowed...

[user/henk/code/inspircd.git] / src / cmd_oper.cpp

diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index 0c002612182fac29153386706f483857809ccef5..718465e9fefcda89bc2d626e062823fe22939d22 100644 (file)
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -14,24 +14,13 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
 #include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
 #include <sstream>
 #include <vector>
-#include <deque>
+#include "inspircd_config.h"
+#include "configreader.h"
+#include "typedefs.h"
 #include "users.h"
-#include "ctables.h"
 #include "globals.h"
 #include "modules.h"
 #include "dynamic.h"
@@ -45,21 +34,15 @@ using namespace std;
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "socketengine.h"
-#include "typedefs.h"
+
 #include "command_parse.h"
 #include "cmd_oper.h"
 
 extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+extern ModuleList modules;
+extern FactoryList factory;
 extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
 bool OneOfMatches(const char* host, const char* hostlist)
 {
@@ -90,23 +73,24 @@ void cmd_oper::Handle (char **parameters, int pcnt, userrec *user)
 
        snprintf(TheHost,MAXBUF,"%s@%s",user->ident,user->host);
 
-       for (int i = 0; i < Config->ConfValueEnum("oper",&Config->config_f); i++)
+       for (int i = 0; i < Config->ConfValueEnum(Config->config_data, "oper"); i++)
        {
-               Config->ConfValue("oper","name",i,LoginName,&Config->config_f);
-               Config->ConfValue("oper","password",i,Password,&Config->config_f);
-               Config->ConfValue("oper","type",i,OperType,&Config->config_f);
-               Config->ConfValue("oper","host",i,HostName,&Config->config_f);
+               Config->ConfValue(Config->config_data, "oper", "name", i, LoginName, MAXBUF);
+               Config->ConfValue(Config->config_data, "oper", "password", i, Password, MAXBUF);
+               Config->ConfValue(Config->config_data, "oper", "type", i, OperType, MAXBUF);
+               Config->ConfValue(Config->config_data, "oper", "host", i, HostName, MAXBUF);
+
                if ((!strcmp(LoginName,parameters[0])) && (!operstrcmp(Password,parameters[1])) && (OneOfMatches(TheHost,HostName)))
                {
                        fail2 = true;
-                       for (j =0; j < Config->ConfValueEnum("type",&Config->config_f); j++)
+                       for (j =0; j < Config->ConfValueEnum(Config->config_data, "type"); j++)
                        {
-                               Config->ConfValue("type","name",j,TypeName,&Config->config_f);
+                               Config->ConfValue(Config->config_data, "type","name", j, TypeName, MAXBUF);
 
                                if (!strcmp(TypeName,OperType))
                                {
                                        /* found this oper's opertype */
-                                       Config->ConfValue("type","host",j,HostName,&Config->config_f);
+                                       Config->ConfValue(Config->config_data, "type","host", j, HostName, MAXBUF);
                                        if (*HostName)
                                                ChangeDisplayedHost(user,HostName);
                                        if (!isnick(TypeName))
@@ -128,9 +112,9 @@ void cmd_oper::Handle (char **parameters, int pcnt, userrec *user)
        }
        if (found)
        {
-                /* correct oper credentials */
-                WriteOpers("*** %s (%s@%s) is now an IRC operator of type %s",user->nick,user->ident,user->host,OperType);
-                WriteServ(user->fd,"381 %s :You are now an IRC operator of type %s",user->nick,OperType);
+               /* correct oper credentials */
+               WriteOpers("*** %s (%s@%s) is now an IRC operator of type %s",user->nick,user->ident,user->host,OperType);
+               WriteServ(user->fd,"381 %s :You are now an IRC operator of type %s",user->nick,OperType);
                if (!strchr(user->modes,'o'))
                {
                        strcat(user->modes,"o");
@@ -153,10 +137,8 @@ void cmd_oper::Handle (char **parameters, int pcnt, userrec *user)
                {
                        WriteServ(user->fd,"491 %s :Your oper block does not have a valid opertype associated with it",user->nick);
                        WriteOpers("*** CONFIGURATION ERROR! Oper block mismatch for OperType %s",OperType);
-                        log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but oper type nonexistent.",user->nick,user->ident,user->host);
+                       log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but oper type nonexistent.",user->nick,user->ident,user->host);
                }
        }
        return;
 }
-
-