Removed <options:tempdir> - this hasn't been used since modules were updated to not...

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

diff --git a/docs/inspircd.conf.example b/docs/inspircd.conf.example
index 9430b8a0f36f3753a18d18acd5d94997c3118f95..a6e067b6ab585689b55f2b5ded18531d7a75caf9 100644 (file)
--- a/docs/inspircd.conf.example
+++ b/docs/inspircd.conf.example
@@ -686,10 +686,6 @@
 #                  opers. Please be aware that this will also hide    #
 #                  any leaf servers of a U-lined server, e.g. jupes.  #
 #                                                                     #
-#  tempdir       - If defined, indicates a path where modules will be #
-#                  temporarily copied before loading. If not defined, #
-#                  defaults to /tmp.                                  #
-#                                                                     #
 #  nouserdns     - If set to 'yes', 'true' or '1', no user dns        #
 #                  lookups will be performed for connecting users.    #
 #                  this can save a lot of resources on very busy irc  #

diff --git a/include/configreader.h b/include/configreader.h
index f3816ba32b61c1756918fae6eae917ac202a843f..1790bd8470c85e5875a8d9158a553c474530db92 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -292,10 +292,6 @@ class ServerConfig : public Extensible
         */
        char ModPath[1024];
 
-       /** The temporary directory where modules are copied
-        */
-       char TempDir[1024];
-
        /** The full pathname to the executable, as
         * given in argv[0] when the program starts.
         */

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 71fd9e6b9bae943f53d68de9d00150f06beeeb19..8ba19968631991e14ce2f24a5916b1129fc1f10e 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -25,7 +25,7 @@ std::vector<std::string> old_module_names, new_module_names, added_modules, remo
 ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance)
 {
        this->ClearStack();
-       *TempDir = *ServerName = *Network = *ServerDesc = *AdminName = '\0';
+       *ServerName = *Network = *ServerDesc = *AdminName = '\0';
        *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = '\0';
        *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
        *UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
@@ -140,13 +140,6 @@ bool NoValidation(ServerConfig* conf, const char* tag, const char* value, ValueI
        return true;
 }
 
-bool ValidateTempDir(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
-{
-       if (!*(data.GetString()))
-               data.Set("/tmp");
-       return true;
-}
- 
 bool ValidateMaxTargets(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
 {
        if ((data.GetInteger() < 0) || (data.GetInteger() > 31))
@@ -564,7 +557,6 @@ void ServerConfig::Read(bool bail, userrec* user)
                {"options",             "hidebans",                     new ValueContainerBool (&this->HideBans),               DT_BOOLEAN, NoValidation},
                {"options",             "hidewhois",                    new ValueContainerChar (this->HideWhoisServer),         DT_CHARPTR, NoValidation},
                {"options",             "operspywhois",                 new ValueContainerBool (&this->OperSpyWhois),           DT_BOOLEAN, NoValidation},
-               {"options",             "tempdir",                      new ValueContainerChar (this->TempDir),                 DT_CHARPTR, ValidateTempDir},
                {"options",             "nouserdns",                    new ValueContainerBool (&this->NoUserDns),              DT_BOOLEAN, NoValidation},
                {"options",             "syntaxhints",                  new ValueContainerBool (&this->SyntaxHints),            DT_BOOLEAN, NoValidation},
                {"options",             "cyclehosts",                   new ValueContainerBool (&this->CycleHosts),             DT_BOOLEAN, NoValidation},