diff options
| author |  w00t | 2008-08-22 15:16:46 +0000 |
|---|---|---|
| committer | w00t | 2008-08-22 15:16:46 +0000 |
| commit | 58f4306bb6e1f91076fccf30a3b43a40b3d1915a (patch) | |
| tree | 145095fad6904382ecf6775dedc5c981d406a61a /src/modules/m_httpd_acl.cpp | |
| parent | Fix a lot of calls to match() and uses of wildcard.h (which doesn't exist any... (diff) | |
| download | inspircd++-58f4306bb6e1f91076fccf30a3b43a40b3d1915a.tar.gz inspircd++-58f4306bb6e1f91076fccf30a3b43a40b3d1915a.tar.bz2 inspircd++-58f4306bb6e1f91076fccf30a3b43a40b3d1915a.zip | |
Revert automated conversion by Special, as it (unfortunately) neglects some details. It provides a useful start point, though, so it'll be used as the basis for the final conversion.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10215 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/m_httpd_acl.cpp')
| -rw-r--r-- | src/modules/m_httpd_acl.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp index 0258deba9..0aa462818 100644 --- a/src/modules/m_httpd_acl.cpp +++ b/src/modules/m_httpd_acl.cpp @@ -14,6 +14,7 @@ #include "inspircd.h" #include "httpd.h" #include "protocol.h" +#include "wildcard.h" /* $ModDesc: Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd.so dependent modules */ /* $ModDep: httpd.h */ @@ -172,7 +173,7 @@ class ModuleHTTPAccessList : public Module for (std::vector<HTTPACL>::const_iterator this_acl = acl_list.begin(); this_acl != acl_list.end(); ++this_acl) { - if (InspIRCd::Match(http->GetURI(), this_acl->path)) + if (match(http->GetURI(), this_acl->path)) { if (!this_acl->blacklist.empty()) { @@ -182,7 +183,7 @@ class ModuleHTTPAccessList : public Module while (sep.GetToken(entry)) { - if (InspIRCd::Match(http->GetIP(), entry)) + if (match(http->GetIP(), entry)) { ServerInstance->Logs->Log("m_httpd_acl", DEBUG, "Denying access to blacklisted resource %s (matched by pattern %s) from ip %s (matched by entry %s)", http->GetURI().c_str(), this_acl->path.c_str(), http->GetIP().c_str(), entry.c_str()); @@ -200,7 +201,7 @@ class ModuleHTTPAccessList : public Module while (sep.GetToken(entry)) { - if (InspIRCd::Match(http->GetIP(), entry)) + if (match(http->GetIP(), entry)) allow_access = true; } |