X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_oper.cpp;h=3efafca5b96060ca95222d42703fb2e284d363ca;hb=91df762e93212958db487d8517addba1a63a4ddd;hp=a98db6ca42b593cf02545a795b8217ae6a740a13;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_oper.cpp b/src/commands/cmd_oper.cpp
index a98db6ca4..3efafca5b 100644
--- a/src/commands/cmd_oper.cpp
+++ b/src/commands/cmd_oper.cpp
@@ -12,7 +12,39 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_oper.h"
+
+#ifndef __CMD_OPER_H__
+#define __CMD_OPER_H__
+
+// include the common header files
+
+#include "users.h"
+#include "channels.h"
+
+bool OneOfMatches(const char* host, const char* ip, const char* hostlist);
+
+/** Handle /OPER. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandOper : public Command
+{
+ public:
+	/** Constructor for oper.
+	 */
+	CommandOper (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"OPER",0,2,false,2) { syntax = "<username> <password>"; }
+	/** Handle command.
+	 * @param parameters The parameters to the comamnd
+	 * @param pcnt The number of parameters passed to teh command
+	 * @param user The user issuing the command
+	 * @return A value from CmdResult to indicate command success or failure.
+	 */
+	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
+
+#endif
+
 #include "hashcomp.h"
 
 bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
@@ -29,11 +61,6 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
 	return false;
 }
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
-{
-	return new CommandOper(Instance);
-}
-
 CmdResult CommandOper::Handle (const std::vector<std::string>& parameters, User *user)
 {
 	char LoginName[MAXBUF];
@@ -56,13 +83,13 @@ CmdResult CommandOper::Handle (const std::vector<std::string>& parameters, User
 	snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(),user->host.c_str());
 	snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(),user->GetIPString());
 
-	for (int i = 0; i < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "oper"); i++)
+	for (int i = 0; i < ServerInstance->Config->ConfValueEnum("oper"); i++)
 	{
-		ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "name", i, LoginName, MAXBUF);
-		ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "password", i, Password, MAXBUF);
-		ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "type", i, OperType, MAXBUF);
-		ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "host", i, HostName, MAXBUF);
-		ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "oper", "hash", i, HashType, MAXBUF);
+		ServerInstance->Config->ConfValue("oper", "name", i, LoginName, MAXBUF);
+		ServerInstance->Config->ConfValue("oper", "password", i, Password, MAXBUF);
+		ServerInstance->Config->ConfValue("oper", "type", i, OperType, MAXBUF);
+		ServerInstance->Config->ConfValue("oper", "host", i, HostName, MAXBUF);
+		ServerInstance->Config->ConfValue("oper", "hash", i, HashType, MAXBUF);
 
 		match_login = (LoginName == parameters[0]);
 		match_pass = !ServerInstance->PassCompare(user, Password, parameters[1], HashType);
@@ -71,10 +98,10 @@ CmdResult CommandOper::Handle (const std::vector<std::string>& parameters, User
 		if (match_login && match_pass && match_hosts)
 		{
 			type_invalid = true;
-			for (j =0; j < ServerInstance->Config->ConfValueEnum(ServerInstance->Config->config_data, "type"); j++)
+			for (j =0; j < ServerInstance->Config->ConfValueEnum("type"); j++)
 			{
-				ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type", "name", j, TypeName, MAXBUF);
-				ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type", "class", j, ClassName, MAXBUF);
+				ServerInstance->Config->ConfValue("type", "name", j, TypeName, MAXBUF);
+				ServerInstance->Config->ConfValue("type", "class", j, ClassName, MAXBUF);
 
 				if (!strcmp(TypeName,OperType))
 				{
@@ -86,7 +113,7 @@ CmdResult CommandOper::Handle (const std::vector<std::string>& parameters, User
 						ServerInstance->Logs->Log("OPER",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but oper type erroneous.", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
 						return CMD_FAILURE;
 					}
-					ServerInstance->Config->ConfValue(ServerInstance->Config->config_data, "type","host", j, HostName, MAXBUF);
+					ServerInstance->Config->ConfValue("type","host", j, HostName, MAXBUF);
 					if (*HostName)
 						user->ChangeDisplayedHost(HostName);
 					if (*ClassName)
@@ -150,3 +177,5 @@ CmdResult CommandOper::Handle (const std::vector<std::string>& parameters, User
 	}
 	return CMD_SUCCESS;
 }
+
+COMMAND_INIT(CommandOper)