From c202dea024542b9c6c6b771bb9a3a081d9eacdc5 Mon Sep 17 00:00:00 2001
From: attilamolnar
Date: Fri, 16 Aug 2013 12:10:55 +0200
Subject: Replace OnRehash() with ReadConfig() that is called on boot, on
 module load and on rehash

This eliminates the need for calling OnRehash() in init()
---
 src/modules/m_httpd_acl.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/modules/m_httpd_acl.cpp')

diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp
index 272316440..74d25deba 100644
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -49,7 +49,7 @@ class ModuleHTTPAccessList : public Module
 	{
 	}
 
-	void OnRehash(User* user)
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		acl_list.clear();
 		ConfigTagList acls = ServerInstance->Config->ConfTags("httpdacl");
@@ -93,11 +93,6 @@ class ModuleHTTPAccessList : public Module
 		}
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		OnRehash(NULL);
-	}
-
 	void BlockAccess(HTTPRequest* http, int returnval, const std::string &extraheaderkey = "", const std::string &extraheaderval="")
 	{
 		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "BlockAccess (%d)", returnval);
-- 
cgit v1.3.1-10-gc9f91