diff options
| author |  Sadie Powell | 2023-01-13 07:44:32 +0000 |
|---|---|---|
| committer | Sadie Powell | 2023-01-13 07:46:47 +0000 |
| commit | 713b57749674beb77f1bedbec984776ad4d5a8ca (patch) | |
| tree | df7315487d8c8f36855d24f8cf2cf01510e9b870 /src/configreader.cpp | |
| parent | Add a new cloak system that cloaks using HMAC-SHA256. (diff) | |
| parent | Fix core_dns rejecting simple hostnames. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/configreader.cpp')
| -rw-r--r-- | src/configreader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp index 487e80ac1..7556aab97 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -270,7 +270,7 @@ static std::string GetServerHost() if (name.find('.') == std::string::npos) name.append(".local"); - if (name.length() <= ServerInstance->Config->Limits.MaxHost && InspIRCd::IsHost(name)) + if (name.length() <= ServerInstance->Config->Limits.MaxHost && InspIRCd::IsFQDN(name)) return name; } return "irc.example.com"; @@ -283,7 +283,7 @@ void ServerConfig::Fill() auto server = ConfValue("server"); if (sid.empty()) { - ServerName = server->getString("name", GetServerHost(), InspIRCd::IsHost); + ServerName = server->getString("name", GetServerHost(), InspIRCd::IsFQDN); sid = server->getString("id"); if (!sid.empty() && !InspIRCd::IsSID(sid)) @@ -308,7 +308,7 @@ void ServerConfig::Fill() NetBufferSize = ConfValue("performance")->getInt("netbuffersize", 10240, 1024, 65534); CustomVersion = security->getString("customversion"); HideBans = security->getBool("hidebans"); - HideServer = security->getString("hideserver", "", InspIRCd::IsHost); + HideServer = security->getString("hideserver", "", InspIRCd::IsFQDN); SyntaxHints = options->getBool("syntaxhints"); FullHostInTopic = options->getBool("hostintopic"); MaxTargets = security->getUInt("maxtargets", 20, 1, 31); |