From 9aa414b1f63196d88731a5fc5adbc56be2c6fb39 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 16 Aug 2011 15:28:21 -0400 Subject: Fixed matching acount access entries against nicknames --- modules/commands/cs_access.cpp | 2 +- modules/commands/cs_flags.cpp | 2 +- modules/commands/cs_xop.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp index 7ec65328a..d03f165f8 100644 --- a/modules/commands/cs_access.cpp +++ b/modules/commands/cs_access.cpp @@ -83,7 +83,7 @@ class AccessChanAccess : public ChanAccess bool Matches(User *u, NickCore *nc) { - if (u && (Anope::Match(u->nick, this->mask) || Anope::Match(u->GetMask(), this->mask))) + if (u && this->mask.find_first_of("!@?*") != Anope::string::npos && (Anope::Match(u->nick, this->mask) || Anope::Match(u->GetMask(), this->mask))) return true; else if (nc && Anope::Match(nc->display, this->mask)) return true; diff --git a/modules/commands/cs_flags.cpp b/modules/commands/cs_flags.cpp index cc88c330d..a8d44aeea 100644 --- a/modules/commands/cs_flags.cpp +++ b/modules/commands/cs_flags.cpp @@ -70,7 +70,7 @@ class FlagsChanAccess : public ChanAccess bool Matches(User *u, NickCore *nc) { - if (u && (Anope::Match(u->nick, this->mask) || Anope::Match(u->GetMask(), this->mask))) + if (u && this->mask.find_first_of("!@?*") != Anope::string::npos && (Anope::Match(u->nick, this->mask) || Anope::Match(u->GetMask(), this->mask))) return true; else if (nc && Anope::Match(nc->display, this->mask)) return true; diff --git a/modules/commands/cs_xop.cpp b/modules/commands/cs_xop.cpp index a6107be3c..365b19e7c 100644 --- a/modules/commands/cs_xop.cpp +++ b/modules/commands/cs_xop.cpp @@ -101,7 +101,7 @@ class XOPChanAccess : public ChanAccess bool Matches(User *u, NickCore *nc) { - if (u && (Anope::Match(u->nick, this->mask) || Anope::Match(u->GetMask(), this->mask))) + if (u && this->mask.find_first_of("!@?*") != Anope::string::npos && (Anope::Match(u->nick, this->mask) || Anope::Match(u->GetMask(), this->mask))) return true; else if (nc && Anope::Match(nc->display, this->mask)) return true; -- cgit