diff options
author | Adam <Adam@anope.org> | 2011-09-16 14:07:33 -0400 |
---|---|---|
committer | Adam <Adam@anope.org> | 2011-09-16 14:07:33 -0400 |
commit | f07295cc78b6132c0803ad7c459ca3a7eb962e94 (patch) | |
tree | 3371b4b5e57252df813ba699063d00acf0fe215b | |
parent | 26c1d67556d1475c0a27938aa760f834469b1d43 (diff) |
Bug #1332 - Fixed ValidateUser to not require secure off to disable nickserv kill
-rw-r--r-- | modules/pseudoclients/nickserv.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index 14067b712..428f2a67d 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -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; |