, MaxQuit(tag->getUInt("maxquit", 255))
, MaxTopic(tag->getUInt("maxtopic", 307))
, MaxKick(tag->getUInt("maxkick", 255))
- , MaxGecos(tag->getUInt("maxgecos", 128))
+ , MaxReal(tag->getUInt("maxreal", tag->getUInt("maxgecos", 128)))
, MaxAway(tag->getUInt("maxaway", 200))
, MaxLine(tag->getUInt("maxline", 512))
, MaxHost(tag->getUInt("maxhost", 64))
delete EmptyTag;
}
-static void ValidHost(const std::string& p, const std::string& msg)
-{
- int num_dots = 0;
- if (p.empty() || p[0] == '.')
- throw CoreException("The value of "+msg+" is not a valid hostname");
- for (unsigned int i=0;i < p.length();i++)
- {
- switch (p[i])
- {
- case ' ':
- throw CoreException("The value of "+msg+" is not a valid hostname");
- case '.':
- num_dots++;
- break;
- }
- }
- if (num_dots == 0)
- throw CoreException("The value of "+msg+" is not a valid hostname");
-}
-
bool ServerConfig::ApplyDisabledCommands()
{
// Enable everything first.
throw CoreException("<"+tag+":"+key+"> missing at " + ctag->getTagLocation());
std::string reason = ctag->getString("reason", "<Config>");
XLine* xl = make->Generate(ServerInstance->Time(), 0, "<Config>", reason, mask);
+ xl->from_config = true;
if (!ServerInstance->XLines->AddLine(xl, NULL))
delete xl;
}
}
}
-/** Represents a deprecated configuration tag.
- */
-struct DeprecatedConfig
-{
- /** Tag name. */
- std::string tag;
-
- /** Attribute key. */
- std::string key;
-
- /** Attribute value. */
- std::string value;
-
- /** Reason for deprecation. */
- std::string reason;
-};
-
-static const DeprecatedConfig ChangedConfig[] = {
- { "bind", "transport", "", "has been moved to <bind:ssl> as of 2.0" },
- { "die", "value", "", "you need to reread your config" },
- { "gnutls", "starttls", "", "has been replaced with m_starttls as of 3.0" },
- { "link", "autoconnect", "", "2.0+ does not use this attribute - define <autoconnect> tags instead" },
- { "link", "transport", "", "has been moved to <link:ssl> as of 2.0" },
- { "module", "name", "m_chanprotect.so", "has been replaced with m_customprefix as of 3.0" },
- { "module", "name", "m_halfop.so", "has been replaced with m_customprefix as of 3.0" },
- { "options", "cyclehosts", "", "has been replaced with m_hostcycle as of 3.0" },
- { "performance", "nouserdns", "", "has been moved to <connect:resolvehostnames> as of 3.0" }
-};
-
void ServerConfig::Fill()
{
ConfigTag* options = ConfValue("options");
ConfigTag* server = ConfValue("server");
if (sid.empty())
{
- ServerName = server->getString("name", "irc.example.com");
- ValidHost(ServerName, "<server:name>");
+ ServerName = server->getString("name", "irc.example.com", InspIRCd::IsHost);
sid = server->getString("id");
if (!sid.empty() && !InspIRCd::IsSID(sid))
Network = server->getString("network", "Network");
NetBufferSize = ConfValue("performance")->getInt("netbuffersize", 10240, 1024, 65534);
DisabledDontExist = ConfValue("disabled")->getBool("fakenonexistant");
- UserStats = security->getString("userstats");
CustomVersion = security->getString("customversion");
- HideSplits = security->getBool("hidesplits");
HideBans = security->getBool("hidebans");
HideServer = security->getString("hideserver", security->getString("hidewhois"));
- HideKillsServer = security->getString("hidekills");
- HideULineKills = security->getBool("hideulinekills");
- RestrictBannedUsers = security->getBool("restrictbannedusers", true);
- GenericOper = security->getBool("genericoper");
SyntaxHints = options->getBool("syntaxhints");
- CycleHostsFromUser = options->getBool("cyclehostsfromuser");
FullHostInTopic = options->getBool("hostintopic");
MaxTargets = security->getUInt("maxtargets", 20, 1, 31);
DefaultModes = options->getString("defaultmodes", "not");
SocketEngine::Close(socktest);
}
+ ServerInstance->XLines->ClearConfigLines();
ReadXLine(this, "badip", "ipmask", ServerInstance->XLines->GetFactory("Z"));
ReadXLine(this, "badnick", "nick", ServerInstance->XLines->GetFactory("Q"));
ReadXLine(this, "badhost", "host", ServerInstance->XLines->GetFactory("K"));
ReadXLine(this, "exception", "host", ServerInstance->XLines->GetFactory("E"));
+ const std::string restrictbannedusers = options->getString("restrictbannedusers", "yes");
+ if (stdalgo::string::equalsci(restrictbannedusers, "no"))
+ RestrictBannedUsers = ServerConfig::BUT_NORMAL;
+ else if (stdalgo::string::equalsci(restrictbannedusers, "silent"))
+ RestrictBannedUsers = ServerConfig::BUT_RESTRICT_SILENT;
+ else if (stdalgo::string::equalsci(restrictbannedusers, "yes"))
+ RestrictBannedUsers = ServerConfig::BUT_RESTRICT_NOTIFY;
+ else
+ throw CoreException(restrictbannedusers + " is an invalid <options:restrictbannedusers> value, at " + options->getTagLocation());
+
DisabledUModes.reset();
std::string modes = ConfValue("disabled")->getString("usermodes");
for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
/* The stuff in here may throw CoreException, be sure we're in a position to catch it. */
try
{
- for (unsigned long index = 0; index * sizeof(DeprecatedConfig) < sizeof(ChangedConfig); index++)
+ // Ensure the user has actually edited ther config.
+ ConfigTagList dietags = ConfTags("die");
+ if (dietags.first != dietags.second)
{
- std::string value;
- ConfigTagList tags = ConfTags(ChangedConfig[index].tag);
- for(ConfigIter i = tags.first; i != tags.second; ++i)
+ errstr << "Your configuration has not been edited correctly!" << std::endl;
+ for (ConfigIter iter = dietags.first; iter != dietags.second; ++iter)
{
- if (i->second->readString(ChangedConfig[index].key, value, true)
- && (ChangedConfig[index].value.empty() || value == ChangedConfig[index].value))
- {
- errstr << "Your configuration contains a deprecated value: <" << ChangedConfig[index].tag;
- if (ChangedConfig[index].value.empty())
- {
- errstr << ':' << ChangedConfig[index].key;
- }
- else
- {
- errstr << ' ' << ChangedConfig[index].key << "=\"" << ChangedConfig[index].value << "\"";
- }
- errstr << "> - " << ChangedConfig[index].reason << " (at " << i->second->getTagLocation() << ")" << std::endl;
- }
+ ConfigTag* tag = iter->second;
+ const std::string reason = tag->getString("reason", "You left a <die> tag in your config", 1);
+ errstr << reason << " (at " << tag->getTagLocation() << ")" << std::endl;
}
}
for (ClassVector::const_iterator it = this->Classes.begin(), it_end = this->Classes.end(); it != it_end; ++it)
{
ConfigTag *tag = (*it)->config;
- // Make sure our connection class allows motd colors
- if(!tag->getBool("allowmotdcolors"))
- continue;
ConfigFileCache::iterator file = this->Files.find(tag->getString("motd", "motd"));
if (file != this->Files.end())
catch (CoreException& modex)
{
ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Exception caught: " + modex.GetReason());
+ if (user)
+ user->WriteNotice(i->first + ": " + modex.GetReason());
}
}
projects / user / henk / code / inspircd.git / blobdiff