X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd_acl.cpp;h=685eae5c69ad8fc5dd2a7af40d3080b441fce790;hb=87dd84a97265843cfe19f20c207c1c72f38a4f2d;hp=e29c50c31535ce819308ac38690bb2e606acba8f;hpb=ce168051e23bf7a33410ad17a4b78f5da478dbbe;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp
index e29c50c31..685eae5c6 100644
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -19,7 +19,7 @@
 /* $ModDesc: Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd.so dependent modules */
 /* $ModDep: httpd.h */
 
-class ACL : public Extensible
+class HTTPACL : public Extensible
 {
  public:
 	std::string path;
@@ -28,12 +28,12 @@ class ACL : public Extensible
 	std::string whitelist;
 	std::string blacklist;
 
-	ACL(const std::string &set_path, const std::string &set_username, const std::string &set_password,
+	HTTPACL(const std::string &set_path, const std::string &set_username, const std::string &set_password,
 		const std::string &set_whitelist, const std::string &set_blacklist)
 		: path(set_path), username(set_username), password(set_password), whitelist(set_whitelist),
 		blacklist(set_blacklist) { }
 
-	~ACL() { }
+	~HTTPACL() { }
 };
 
 class ModuleHTTPAccessList : public Module
@@ -41,7 +41,7 @@ class ModuleHTTPAccessList : public Module
 	
 	std::string stylesheet;
 	bool changed;
-	std::vector<ACL> acl_list;
+	std::vector<HTTPACL> acl_list;
 
  public:
 
@@ -85,7 +85,7 @@ class ModuleHTTPAccessList : public Module
 			ServerInstance->Logs->Log("m_httpd_acl", DEBUG, "Read ACL: path=%s pass=%s whitelist=%s blacklist=%s", path.c_str(),
 					password.c_str(), whitelist.c_str(), blacklist.c_str());
 
-			acl_list.push_back(ACL(path, username, password, whitelist, blacklist));
+			acl_list.push_back(HTTPACL(path, username, password, whitelist, blacklist));
 		}
 	}
 
@@ -171,7 +171,7 @@ class ModuleHTTPAccessList : public Module
 			ServerInstance->Logs->Log("m_http_stats", DEBUG,"Handling httpd acl event");
 			HTTPRequest* http = (HTTPRequest*)event->GetData();
 
-			for (std::vector<ACL>::const_iterator this_acl = acl_list.begin(); this_acl != acl_list.end(); ++this_acl)
+			for (std::vector<HTTPACL>::const_iterator this_acl = acl_list.begin(); this_acl != acl_list.end(); ++this_acl)
 			{
 				if (match(http->GetURI(), this_acl->path))
 				{