summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2012-01-13 15:37:17 -0500
committerAdam <Adam@anope.org>2012-01-13 15:37:17 -0500
commitc462a69b7da4570ed07e627d81dbb80e012c7788 (patch)
tree4baa6475039e4c19cdd79dd52af865a6b6a8653b /src
parent14a2c9cec030fb8f586999aed16d4aa51bd38e96 (diff)
Only match users nicks against access list entries if the entry is a mask... accidentally removed from an earlier fix for #1368
Diffstat (limited to 'src')
-rw-r--r--src/access.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/access.cpp b/src/access.cpp
index d82953c7f..7639b7723 100644
--- a/src/access.cpp
+++ b/src/access.cpp
@@ -122,7 +122,8 @@ void ChanAccess::unserialize(serialized_data &data)
bool ChanAccess::Matches(User *u, NickCore *nc)
{
- if (u && Anope::Match(u->nick, this->mask))
+ bool is_mask = this->mask.find_first_of("!@?*") != Anope::string::npos;
+ if (u && is_mask && Anope::Match(u->nick, this->mask))
return true;
else if (u && Anope::Match(u->GetDisplayedMask(), this->mask))
return true;