diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_chgname.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_setname.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/capab.cpp | 7 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/main.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/main.h | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/uid.cpp | 2 |
6 files changed, 11 insertions, 8 deletions
diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp index fa35732b8..d0a4d6fdc 100644 --- a/src/modules/m_chgname.cpp +++ b/src/modules/m_chgname.cpp @@ -49,7 +49,7 @@ class CommandChgname : public Command return CMD_FAILURE; } - if (parameters[1].length() > ServerInstance->Config->Limits.MaxGecos) + if (parameters[1].length() > ServerInstance->Config->Limits.MaxReal) { user->WriteNotice("*** CHGNAME: Real name is too long"); return CMD_FAILURE; diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp index 3bede1ad2..bc2b0f3d9 100644 --- a/src/modules/m_setname.cpp +++ b/src/modules/m_setname.cpp @@ -34,7 +34,7 @@ class CommandSetname : public Command CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { - if (parameters[0].size() > ServerInstance->Config->Limits.MaxGecos) + if (parameters[0].size() > ServerInstance->Config->Limits.MaxReal) { user->WriteNotice("*** SETNAME: Real name is too long"); return CMD_FAILURE; diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index 97b4a90af..342945c3a 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -163,9 +163,12 @@ void TreeSocket::SendCapabilities(int phase) extra = " CHALLENGE=" + this->GetOurChallenge(); } - // 2.0 needs this key + // 2.0 needs these keys. if (proto_version == 1202) + { extra.append(" PROTOCOL="+ConvToStr(ProtocolVersion)); + extra.append(" MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxReal)); + } this->WriteLine("CAPAB CAPABILITIES " /* Preprocessor does this one. */ ":NICKMAX="+ConvToStr(ServerInstance->Config->Limits.NickMax)+ @@ -175,7 +178,7 @@ void TreeSocket::SendCapabilities(int phase) " MAXQUIT="+ConvToStr(ServerInstance->Config->Limits.MaxQuit)+ " MAXTOPIC="+ConvToStr(ServerInstance->Config->Limits.MaxTopic)+ " MAXKICK="+ConvToStr(ServerInstance->Config->Limits.MaxKick)+ - " MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxGecos)+ + " MAXREAL="+ConvToStr(ServerInstance->Config->Limits.MaxReal)+ " MAXAWAY="+ConvToStr(ServerInstance->Config->Limits.MaxAway)+ " MAXHOST="+ConvToStr(ServerInstance->Config->Limits.MaxHost)+ extra+ diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 0d153737f..344a6088b 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -493,12 +493,12 @@ void ModuleSpanningTree::OnChangeHost(User* user, const std::string &newhost) CmdBuilder(user, "FHOST").push(newhost).Broadcast(); } -void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos) +void ModuleSpanningTree::OnChangeName(User* user, const std::string& real) { if (user->registered != REG_ALL || !IS_LOCAL(user)) return; - CmdBuilder(user, "FNAME").push_last(gecos).Broadcast(); + CmdBuilder(user, "FNAME").push_last(real).Broadcast(); } void ModuleSpanningTree::OnChangeIdent(User* user, const std::string &ident) diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h index 20c1ac2b9..b6374e32e 100644 --- a/src/modules/m_spanningtree/main.h +++ b/src/modules/m_spanningtree/main.h @@ -152,7 +152,7 @@ class ModuleSpanningTree : public Module, public Stats::EventListener void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE; void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) CXX11_OVERRIDE; void OnChangeHost(User* user, const std::string &newhost) CXX11_OVERRIDE; - void OnChangeName(User* user, const std::string &gecos) CXX11_OVERRIDE; + void OnChangeName(User* user, const std::string& real) CXX11_OVERRIDE; void OnChangeIdent(User* user, const std::string &ident) CXX11_OVERRIDE; void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) CXX11_OVERRIDE; void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) CXX11_OVERRIDE; diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index f9cff6c0d..86933dc72 100644 --- a/src/modules/m_spanningtree/uid.cpp +++ b/src/modules/m_spanningtree/uid.cpp @@ -30,7 +30,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params { /** * 0 1 2 3 4 5 6 7 8 9 (n-1) - * UID uuid age nick host dhost ident ip.string signon +modes (modepara) :gecos + * UID uuid age nick host dhost ident ip.string signon +modes (modepara) :real */ time_t age_t = ServerCommand::ExtractTS(params[1]); time_t signon = ServerCommand::ExtractTS(params[7]); |