1
0
mirror of https://github.com/anope/anope.git synced 2026-07-03 08:53:12 +02:00

Bug #1332 - Fixed ValidateUser to not require secure off to disable nickserv kill

This commit is contained in:
Adam
2011-09-16 14:07:33 -04:00
parent 26c1d67556
commit f07295cc78
+3 -3
View File
@@ -51,7 +51,7 @@ class MyNickServService : public NickServService
return;
}
if (u->IsRecognized() || !na->nc->HasFlag(NI_KILL_IMMED))
if (u->IsRecognized(false) || !na->nc->HasFlag(NI_KILL_IMMED))
{
if (na->nc->HasFlag(NI_SECURE))
u->SendMessage(NickServ, NICK_IS_SECURE, Config->UseStrictPrivMsgString.c_str(), Config->NickServ.c_str());
@@ -59,7 +59,7 @@ class MyNickServService : public NickServService
u->SendMessage(NickServ, NICK_IS_REGISTERED, Config->UseStrictPrivMsgString.c_str(), Config->NickServ.c_str());
}
if (na->nc->HasFlag(NI_KILLPROTECT) && !u->IsRecognized())
if (na->nc->HasFlag(NI_KILLPROTECT) && !u->IsRecognized(false))
{
if (na->nc->HasFlag(NI_KILL_IMMED))
{
@@ -97,7 +97,7 @@ class ExpireCallback : public CallBack
++it;
User *u = finduser(na->nick);
if (u && (na->nc->HasFlag(NI_SECURE) ? u->IsIdentified(true) : u->IsRecognized(true)))
if (u && (na->nc->HasFlag(NI_SECURE) ? u->IsIdentified(true) : u->IsRecognized()))
na->last_seen = Anope::CurTime;
bool expire = false;