Blah

[user/henk/code/inspircd.git] / src / modules / m_chghost.cpp

diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 3ce3d37bd85b471195f039658552dcbfda7cd0f6..e0f69faba5e1ccb5218185a9daf84db930409be6 100644 (file)
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -26,9 +26,9 @@
 class cmd_chghost : public command_t
 {
  private:
-       char*& hostmap;
+       char* hostmap;
  public:
-       cmd_chghost (InspIRCd* Instance, char* &hmap) : command_t(Instance,"CHGHOST",'o',2), hostmap(hmap)
+       cmd_chghost (InspIRCd* Instance, char* hmap) : command_t(Instance,"CHGHOST",'o',2), hostmap(hmap)
        {
                this->source = "m_chghost.so";
                syntax = "<nick> <newhost>";
@@ -40,7 +40,7 @@ class cmd_chghost : public command_t
 
                for (; *x; x++)
                {
-                       if (!strchr(hostmap, *x))
+                       if (!hostmap[(unsigned char)*x])
                        {
                                user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
                                return CMD_FAILURE;
@@ -70,8 +70,7 @@ class cmd_chghost : public command_t
 class ModuleChgHost : public Module
 {
        cmd_chghost* mycommand;
-       char* hostmap;
-       std::string hmap;
+       char hostmap[256];
  public:
        ModuleChgHost(InspIRCd* Me)
                : Module::Module(Me)
@@ -89,16 +88,19 @@ class ModuleChgHost : public Module
        void OnRehash(const std::string &parameter)
        {
                ConfigReader Conf(ServerInstance);
-               hmap = Conf.ReadValue("hostname", "charmap", 0);
+               std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
 
                if (hmap.empty())
-                       hostmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
-               else
-                       hostmap = (char*)hmap.c_str();
+                       hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
+
+               memset(&hostmap, 0, 255);
+               for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
+                       hostmap[(unsigned char)*n] = 1;
        }
 
        ~ModuleChgHost()
        {
+               delete[] hostmap;
        }
        
        Version GetVersion()