Removed nickrequests, instead have unconfirmed registrations. Also made ns_resetpass allow remote-id to get past things such as kill immed.

1 files changed, 1 insertions, 24 deletions

diff --git a/modules/core/ns_drop.cpp b/modules/core/ns_drop.cpp
index e7edcd79a..33a18009d 100644
--- a/modules/core/ns_drop.cpp
+++ b/modules/core/ns_drop.cpp
@@ -36,30 +36,7 @@ class CommandNSDrop : public Command
 		NickAlias *na = findnick((u->Account() && !nick.empty() ? nick : u->nick));
 		if (!na)
 		{
-			NickRequest *nr = findrequestnick(u->Account() && !nick.empty() ? nick : u->nick);
-			if (nr && u->Account() && u->Account()->IsServicesOper())
-			{
-				Log(LOG_ADMIN, u, this) << "to drop nickname " << nr->nick << " (email: " << nr->email << ")";
-				delete nr;
-				source.Reply(_("Nickname \002%s\002 has been dropped."), nick.c_str());
-			}
-			else if (nr && !nick.empty())
-			{
-				int res = enc_check_password(nick, nr->password);
-				if (res)
-				{
-					Log(LOG_COMMAND, u, this) << "to drop nick request " << nr->nick;
-					source.Reply(_("Nickname \002%s\002 has been dropped."), nr->nick.c_str());
-					delete nr;
-				}
-				else if (bad_password(u))
-					return MOD_STOP;
-				else
-					source.Reply(_(PASSWORD_INCORRECT));
-			}
-			else
-				source.Reply(_(NICK_NOT_REGISTERED));
-
+			source.Reply(_(NICK_NOT_REGISTERED));
 			return MOD_CONT;
 		}