Merge commands and modules in source, since they are already merged in install

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11734 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 0 insertions, 170 deletions

diff --git a/src/commands/cmd_oper.cpp b/src/commands/cmd_oper.cpp
deleted file mode 100644
index da53d2b1a..000000000
--- a/src/commands/cmd_oper.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
- *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
- *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
- *
- * ---------------------------------------------------
- */
-
-#include "inspircd.h"
-#include "hashcomp.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 ( Module* parent) : Command(parent,"OPER",2,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);
-};
-
-bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
-{
-	std::stringstream hl(hostlist);
-	std::string xhost;
-	while (hl >> xhost)
-	{
-		if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map))
-		{
-			return true;
-		}
-	}
-	return false;
-}
-
-CmdResult CommandOper::Handle (const std::vector<std::string>& parameters, User *user)
-{
-	char LoginName[MAXBUF];
-	char Password[MAXBUF];
-	char OperType[MAXBUF];
-	char TypeName[MAXBUF];
-	char HostName[MAXBUF];
-	char ClassName[MAXBUF];
-	char TheHost[MAXBUF];
-	char TheIP[MAXBUF];
-	char HashType[MAXBUF];
-	int j;
-	bool found = false;
-	bool type_invalid = false;
-
-	bool match_login = false;
-	bool match_pass = false;
-	bool match_hosts = false;
-
-	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("oper"); i++)
-	{
-		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);
-		match_hosts = OneOfMatches(TheHost,TheIP,HostName);
-
-		if (match_login && match_pass && match_hosts)
-		{
-			type_invalid = true;
-			for (j =0; j < ServerInstance->Config->ConfValueEnum("type"); j++)
-			{
-				ServerInstance->Config->ConfValue("type", "name", j, TypeName, MAXBUF);
-				ServerInstance->Config->ConfValue("type", "class", j, ClassName, MAXBUF);
-
-				if (!strcmp(TypeName,OperType))
-				{
-					/* found this oper's opertype */
-					if (!ServerInstance->IsNick(TypeName, ServerInstance->Config->Limits.NickMax))
-					{
-						user->WriteNumeric(491, "%s :Invalid oper type (oper types must follow the same syntax as nicknames)",user->nick.c_str());
-						ServerInstance->SNO->WriteToSnoMask('o',"CONFIGURATION ERROR! Oper type '%s' contains invalid characters",OperType);
-						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("type","host", j, HostName, MAXBUF);
-					if (*HostName)
-						user->ChangeDisplayedHost(HostName);
-					if (*ClassName)
-					{
-						user->SetClass(ClassName);
-						user->CheckClass();
-					}
-					found = true;
-					type_invalid = false;
-					break;
-				}
-			}
-		}
-		if (match_login || found)
-			break;
-	}
-	if (found)
-	{
-		/* correct oper credentials */
-		user->Oper(OperType, LoginName);
-	}
-	else
-	{
-		char broadcast[MAXBUF];
-
-		if (!type_invalid)
-		{
-			std::string fields;
-			if (!match_login)
-				fields.append("login ");
-			else
-			{
-				if (!match_pass)
-					fields.append("password ");
-				if (!match_hosts)
-					fields.append("hosts");
-			}
-
-			// tell them they suck, and lag them up to help prevent brute-force attacks
-			user->WriteNumeric(491, "%s :Invalid oper credentials",user->nick.c_str());
-			user->IncreasePenalty(10);
-
-			snprintf(broadcast, MAXBUF, "WARNING! Failed oper attempt by %s!%s@%s using login '%s': The following fields do not match: %s", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), parameters[0].c_str(), fields.c_str());
-			ServerInstance->SNO->WriteToSnoMask('o',std::string(broadcast));
-			ServerInstance->PI->SendSNONotice("o", std::string("OPER: ") + broadcast);
-
-			ServerInstance->Logs->Log("OPER",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s using login '%s': The following fields did not match: %s", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), parameters[0].c_str(), fields.c_str());
-			return CMD_FAILURE;
-		}
-		else
-		{
-			user->WriteNumeric(491, "%s :Your oper block does not have a valid opertype associated with it",user->nick.c_str());
-
-			snprintf(broadcast, MAXBUF, "CONFIGURATION ERROR! Oper block '%s': missing OperType %s",parameters[0].c_str(),OperType);
-
-			ServerInstance->SNO->WriteToSnoMask('o', std::string(broadcast));
-
-			ServerInstance->Logs->Log("OPER",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s using login '%s': credentials valid, but oper type nonexistent.", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), parameters[0].c_str());
-			return CMD_FAILURE;
-		}
-	}
-	return CMD_SUCCESS;
-}
-
-COMMAND_INIT(CommandOper)