summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/config.cpp9
-rw-r--r--src/main.cpp4
2 files changed, 2 insertions, 11 deletions
diff --git a/src/config.cpp b/src/config.cpp
index 40bfc0613..f3931571f 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -155,7 +155,6 @@ Conf::Conf() : Block("")
{"networkinfo", "userlen"},
{"networkinfo", "hostlen"},
{"networkinfo", "chanlen"},
- {"options", "passlen"},
};
for (unsigned i = 0; i < sizeof(noreload) / sizeof(noreload[0]); ++i)
@@ -171,16 +170,8 @@ Conf::Conf() : Block("")
ValidateNotEmpty("serverinfo", "pid", serverinfo->Get<const Anope::string>("pid"));
ValidateNotEmpty("serverinfo", "motd", serverinfo->Get<const Anope::string>("motd"));
- ValidateNotZero("options", "releasetimeout", options->Get<time_t>("releasetimeout"));
- ValidateNotZero("options", "updatetimeout", options->Get<time_t>("updatetimeout"));
- ValidateNotZero("options", "expiretimeout", options->Get<time_t>("expiretimeout"));
ValidateNotZero("options", "readtimeout", options->Get<time_t>("readtimeout"));
ValidateNotZero("options", "warningtimeout", options->Get<time_t>("warningtimeout"));
- ValidateNotZero("options", "passlen", options->Get<time_t>("passlen"));
-
- ValidateNotEmpty("options", "enforceruser", options->Get<const Anope::string>("enforceruser"));
- ValidateNotEmpty("options", "enforcerhost", options->Get<const Anope::string>("enforcerhost"));
- ValidateNotEmpty("options", "guestnickprefix", options->Get<const Anope::string>("guestnickprefix"));
ValidateNotZero("networkinfo", "nicklen", networkinfo->Get<unsigned>("nicklen"));
ValidateNotZero("networkinfo", "userlen", networkinfo->Get<unsigned>("userlen"));
diff --git a/src/main.cpp b/src/main.cpp
index d799d9a21..beeacdc05 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -157,8 +157,8 @@ int main(int ac, char **av, char **envp)
/* Set up timers */
time_t last_check = Anope::CurTime;
- UpdateTimer updateTimer(Config->GetBlock("options")->Get<time_t>("updatetimeout"));
- ExpireTimer expireTimer(Config->GetBlock("options")->Get<time_t>("expiretimeout"));
+ UpdateTimer updateTimer(Config->GetBlock("options")->Get<time_t>("updatetimeout", "5m"));
+ ExpireTimer expireTimer(Config->GetBlock("options")->Get<time_t>("expiretimeout", "30m"));
/*** Main loop. ***/
while (!Anope::Quitting)