diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/configreader.cpp | 2 | ||||
| -rw-r--r-- | src/coremods/core_info/isupport.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_chgident.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_ident.cpp | 6 | ||||
| -rw-r--r-- | src/modules/m_setident.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/capab.cpp | 2 | ||||
| -rw-r--r-- | src/users.cpp | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp index f818d997d..4b7c5cd4e 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -42,7 +42,7 @@ ServerLimits::ServerLimits(std::shared_ptr<ConfigTag> tag) , NickMax(tag->getUInt("maxnick", 30, 1, MaxLine)) , ChanMax(tag->getUInt("maxchan", 64, 1, MaxLine)) , MaxModes(tag->getUInt("maxmodes", 20, 1)) - , IdentMax(tag->getUInt("maxident", 10, 1)) + , MaxUser(tag->getUInt("maxident", 10, 1)) , MaxQuit(tag->getUInt("maxquit", 255, 0, MaxLine)) , MaxTopic(tag->getUInt("maxtopic", 307, 1, MaxLine)) , MaxKick(tag->getUInt("maxkick", 255, 1, MaxLine)) diff --git a/src/coremods/core_info/isupport.cpp b/src/coremods/core_info/isupport.cpp index 1a4cfd4b2..98201d51a 100644 --- a/src/coremods/core_info/isupport.cpp +++ b/src/coremods/core_info/isupport.cpp @@ -88,7 +88,7 @@ void ISupportManager::Build() { "PREFIX", ServerInstance->Modes.BuildPrefixes() }, { "STATUSMSG", ServerInstance->Modes.BuildPrefixes(false) }, { "TOPICLEN", ConvToStr(ServerInstance->Config->Limits.MaxTopic) }, - { "USERLEN", ConvToStr(ServerInstance->Config->Limits.IdentMax) }, + { "USERLEN", ConvToStr(ServerInstance->Config->Limits.MaxUser) }, }; isupportevprov.Call(&ISupport::EventListener::OnBuildISupport, tokens); diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp index d05892569..889fc1720 100644 --- a/src/modules/m_chgident.cpp +++ b/src/modules/m_chgident.cpp @@ -50,7 +50,7 @@ class CommandChgident : public Command return CmdResult::FAILURE; } - if (parameters[1].length() > ServerInstance->Config->Limits.IdentMax) + if (parameters[1].length() > ServerInstance->Config->Limits.MaxUser) { user->WriteNotice("*** CHGIDENT: Ident is too long"); return CmdResult::FAILURE; diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index 54f29ad98..1bb4a378b 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -238,7 +238,7 @@ class IdentRequestSocket : public EventHandler /* Truncate the ident at any characters we don't like, skip leading spaces */ for (std::string::const_iterator i = buf.begin()+lastcolon+1; i != buf.end(); ++i) { - if (result.size() == ServerInstance->Config->Limits.IdentMax) + if (result.size() == ServerInstance->Config->Limits.MaxUser) /* Ident is getting too long */ break; @@ -290,8 +290,8 @@ class ModuleIdent : public Module newident.insert(newident.begin(), '~'); // If the username is too long then truncate it. - if (newident.length() > ServerInstance->Config->Limits.IdentMax) - newident.erase(ServerInstance->Config->Limits.IdentMax); + if (newident.length() > ServerInstance->Config->Limits.MaxUser) + newident.erase(ServerInstance->Config->Limits.MaxUser); // Apply the new username. user->ChangeIdent(newident); diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp index c749548c8..2894a586d 100644 --- a/src/modules/m_setident.cpp +++ b/src/modules/m_setident.cpp @@ -40,7 +40,7 @@ class CommandSetident : public Command CmdResult Handle(User* user, const Params& parameters) override { - if (parameters[0].size() > ServerInstance->Config->Limits.IdentMax) + if (parameters[0].size() > ServerInstance->Config->Limits.MaxUser) { user->WriteNotice("*** SETIDENT: Ident is too long"); return CmdResult::FAILURE; diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index 6b47bcf93..ffd47cc0e 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -163,7 +163,7 @@ void TreeSocket::SendCapabilities(int phase) ":NICKMAX="+ConvToStr(ServerInstance->Config->Limits.NickMax)+ " CHANMAX="+ConvToStr(ServerInstance->Config->Limits.ChanMax)+ " MAXMODES="+ConvToStr(ServerInstance->Config->Limits.MaxModes)+ - " IDENTMAX="+ConvToStr(ServerInstance->Config->Limits.IdentMax)+ + " IDENTMAX="+ConvToStr(ServerInstance->Config->Limits.MaxUser)+ " MAXQUIT="+ConvToStr(ServerInstance->Config->Limits.MaxQuit)+ " MAXTOPIC="+ConvToStr(ServerInstance->Config->Limits.MaxTopic)+ " MAXKICK="+ConvToStr(ServerInstance->Config->Limits.MaxKick)+ diff --git a/src/users.cpp b/src/users.cpp index 805c9da64..97c92140e 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -1078,7 +1078,7 @@ bool User::ChangeIdent(const std::string& newident) FOREACH_MOD(OnChangeIdent, (this,newident)); - this->ident.assign(newident, 0, ServerInstance->Config->Limits.IdentMax); + this->ident.assign(newident, 0, ServerInstance->Config->Limits.MaxUser); this->InvalidateCache(); return true; |