X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_rline.cpp;h=c1eeb7b9a792d3818bba2e87ffa9211d99802feb;hb=8ec9a73a91ad1c7009fd3055fbad7c980b5e1732;hp=64228caf7fcc1b7d920f2c93af7d6b69c2cad96d;hpb=384ef31bc01e4a1a2e59d082c9066002410ba54a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index 64228caf7..c1eeb7b9a 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -40,7 +40,7 @@ class RLine : public XLine * @param regex Pattern to match with * @ */ - RLine(time_t s_time, long d, const std::string& src, const std::string& re, const std::string& regexs, dynamic_reference& rxfactory) + RLine(time_t s_time, unsigned long d, const std::string& src, const std::string& re, const std::string& regexs, dynamic_reference& rxfactory) : XLine(s_time, d, src, re, "R") , matchtext(regexs) { @@ -63,8 +63,8 @@ class RLine : public XLine if (lu && lu->exempt) return false; - const std::string host = u->nick + "!" + u->ident + "@" + u->GetRealHost() + " " + u->fullname; - const std::string ip = u->nick + "!" + u->ident + "@" + u->GetIPString() + " " + u->fullname; + const std::string host = u->nick + "!" + u->ident + "@" + u->GetRealHost() + " " + u->GetRealName(); + const std::string ip = u->nick + "!" + u->ident + "@" + u->GetIPString() + " " + u->GetRealName(); return (regex->Matches(host) || regex->Matches(ip)); } @@ -114,7 +114,7 @@ class RLineFactory : public XLineFactory /** Generate a RLine */ - XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE { if (!rxfactory) {