summaryrefslogtreecommitdiff
path: root/modules/nickserv/recover.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'modules/nickserv/recover.cpp')
-rw-r--r--modules/nickserv/recover.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/nickserv/recover.cpp b/modules/nickserv/recover.cpp
index f18c78379..91ce7639d 100644
--- a/modules/nickserv/recover.cpp
+++ b/modules/nickserv/recover.cpp
@@ -66,7 +66,7 @@ class NSRecoverRequestListener : public NickServ::IdentifyRequestListener
// same person that is executing the command, so kill them off (old GHOST command).
else if (u->Account() == na->GetAccount())
{
- if (!source.GetAccount() && na->GetAccount()->IsSecure())
+ if (!source.GetAccount())
{
source.GetUser()->Login(u->Account());
cmd->logger.Command(LogType::COMMAND, source, _("{source} used {command} and was automatically identified to {0}"), u->Account()->GetDisplay());
@@ -97,7 +97,7 @@ class NSRecoverRequestListener : public NickServ::IdentifyRequestListener
/* User is not identified or not identified to the same account as the person using this command */
else
{
- if (!source.GetAccount() && na->GetAccount()->IsSecure())
+ if (!source.GetAccount())
{
source.GetUser()->Login(na->GetAccount()); // Identify the user using the command if they arent identified
cmd->logger.Command(LogType::COMMAND, source, _("{source} used {command} and was automatically identified to {0} ({1})"), na->GetNick(), na->GetAccount()->GetDisplay());
@@ -193,8 +193,6 @@ class CommandNSRecover : public Command
bool ok = false;
if (source.GetAccount() == na->GetAccount())
ok = true;
- else if (!na->GetAccount()->IsSecure() && source.GetUser() && na->GetAccount()->IsOnAccess(source.GetUser()))
- ok = true;
if (certservice && source.GetUser() && certservice->Matches(source.GetUser(), na->GetAccount()))
ok = true;