summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspecial <special@e03df62e-2008-0410-955e-edbf42e46eb7>2006-11-22 04:29:51 +0000
committerspecial <special@e03df62e-2008-0410-955e-edbf42e46eb7>2006-11-22 04:29:51 +0000
commit1c912588ddd8f14ae75f3166fffad84c44c6c4e6 (patch)
tree39d3f80f1ee6fd434b17a8c4b55d3841f4c4daba
parent783f1640b6a5e9ffeae9a7d8c96bec9c412d4a91 (diff)
Removed <options:tempdir> - this hasn't been used since modules were updated to not copy before load (quite awhile ago)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5785 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--docs/inspircd.conf.example4
-rw-r--r--include/configreader.h4
-rw-r--r--src/configreader.cpp10
3 files changed, 1 insertions, 17 deletions
diff --git a/docs/inspircd.conf.example b/docs/inspircd.conf.example
index 9430b8a0f..a6e067b6a 100644
--- 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 f3816ba32..1790bd847 100644
--- 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 71fd9e6b9..8ba199686 100644
--- 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},