summaryrefslogtreecommitdiff
path: root/src/users.c
diff options
context:
space:
mode:
authorrburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864>2009-02-16 09:17:24 +0000
committerrburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864>2009-02-16 09:17:24 +0000
commit010c774bc241f0c3a9c116988bfc3637cf64c5d7 (patch)
tree65a80fd39dadfa703a484799b338ea1518efbbbf /src/users.c
parent22e8e87a00404725f32f4a53f57809d917876914 (diff)
Revert "Patch from DukePyrolator to replace all calls to match_wild() and match_wild_nocase() to use Anope::Match() instead. Also changes line-endings on wildcard.cpp to Unix-style, as well as fixes a small compile warning in language.c."
This reverts commit fcab9857f55567f10eaecbd6b26ee96f0f549d65. This isn't a simple sed operation, the order of arguments changed, so this would break everything using it. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2081 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/users.c')
-rw-r--r--src/users.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/users.c b/src/users.c
index 3c66fedaf..4be186909 100644
--- a/src/users.c
+++ b/src/users.c
@@ -928,14 +928,14 @@ int match_usermask(const char *mask, User * user)
}
if (nick) {
- result = Anope::Match(nick, user->nick, false)
- && Anope::Match(username, user->GetIdent().c_str(), false)
- && (Anope::Match(host, user->host, false)
- || Anope::Match(host, user->vhost, false));
+ result = match_wild_nocase(nick, user->nick)
+ && match_wild_nocase(username, user->GetIdent().c_str())
+ && (match_wild_nocase(host, user->host)
+ || match_wild_nocase(host, user->vhost));
} else {
- result = Anope::Match(username, user->GetIdent().c_str(), false)
- && (Anope::Match(host, user->host, false)
- || Anope::Match(host, user->vhost, false));
+ result = match_wild_nocase(username, user->GetIdent().c_str())
+ && (match_wild_nocase(host, user->host)
+ || match_wild_nocase(host, user->vhost));
}
delete [] mask2;