X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ldapoper.cpp;h=cde5b00d7878b9cc0da9e985881e4ea8d0062190;hb=dccf47d0a091be2395257d401f8ed55eaa258bc7;hp=9deb9a203790b703dde614651c00312271ff900f;hpb=b9e11915a976daaf790ebc763aff56e19fd49e0f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_ldapoper.cpp b/src/modules/m_ldapoper.cpp index 9deb9a203..cde5b00d7 100644 --- a/src/modules/m_ldapoper.cpp +++ b/src/modules/m_ldapoper.cpp @@ -45,10 +45,11 @@ class LDAPOperBase : public LDAPInterface if (!oper_command) return; - std::vector params; + CommandBase::Params params; params.push_back(opername); params.push_back(password); - oper_command->Handle(params, user); + ClientProtocol::TagMap tags; + oper_command->Handle(user, CommandBase::Params(params, tags)); } void Fallback() @@ -201,7 +202,7 @@ class ModuleLDAPAuth : public Module attribute = tag->getString("attribute"); } - ModResult OnPreCommand(std::string& command, std::vector& parameters, LocalUser* user, bool validated, const std::string& original_line) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE { if (validated && command == "OPER" && parameters.size() >= 2) { @@ -217,7 +218,7 @@ class ModuleLDAPAuth : public Module return MOD_RES_PASSTHRU; std::string acceptedhosts = tag->getString("host"); - std::string hostname = user->ident + "@" + user->host; + std::string hostname = user->ident + "@" + user->GetRealHost(); if (!InspIRCd::MatchMask(acceptedhosts, hostname, user->GetIPString())) return MOD_RES_PASSTHRU;