Prevent path names from being specified in modules, and move moduledir to a <path...

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11914 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/configreader.cpp b/src/configreader.cpp
index b586db5316c0ebc902a156e70d929ed01b3d23f7..80d123842e1756b4c77a48d1fd00e27db0914a51 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -791,7 +791,7 @@ void ServerConfig::Fill()
        AdminName = ConfValue("admin")->getString("name", "");
        AdminEmail = ConfValue("admin")->getString("email", "null@example.com");
        AdminNick = ConfValue("admin")->getString("nick", "admin");
-       ModPath = options->getString("moduledir", MOD_PATH);
+       ModPath = ConfValue("path")->getString("moduledir", MOD_PATH);
        NetBufferSize = ConfValue("performance")->getInt("netbuffersize", 10240);
        MaxWhoResults = ConfValue("performance")->getInt("maxwho", 1024);
        dns_timeout = ConfValue("dns")->getInt("timeout", 5);

diff --git a/src/modules.cpp b/src/modules.cpp
index 2dafc88643565cf3729469dc59c4b6db4b61e567..8957b4bb622522b23ca725e9ed306ae5b8760065 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -321,6 +321,9 @@ std::string& ModuleManager::LastError()
 
 bool ModuleManager::Load(const char* filename)
 {
+       /* Don't allow people to specify paths for modules, it doesn't work as expected */
+       if (strchr(filename, '/'))
+               return false;
        /* Do we have a glob pattern in the filename?
         * The user wants to load multiple modules which
         * match the pattern.