diff options
| author | Sadie Powell <sadie@witchery.services> | 2021-11-30 09:50:33 +0000 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2021-11-30 09:50:33 +0000 |
| commit | 595bc09ec14cd717295e56785a520a7689c4f193 (patch) | |
| tree | f160799c24ae0f57151c4c7ece1b4f5f4d042e3b /modules | |
| parent | 27cff11e313e52a939e0dcd898eb711ddd6934d5 (diff) | |
| parent | 64f65b035e5c4eaa98d0bd916a1fb9331710789e (diff) | |
Merge branch '2.0' into 2.1.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/protocol/inspircd.cpp | 12 | ||||
| -rw-r--r-- | modules/pseudoclients/nickserv.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/modules/protocol/inspircd.cpp b/modules/protocol/inspircd.cpp index 9329b1a70..054d8a58e 100644 --- a/modules/protocol/inspircd.cpp +++ b/modules/protocol/inspircd.cpp @@ -60,7 +60,7 @@ class InspIRCdProto : public IRCDProto InspIRCdProto(Module *creator) : IRCDProto(creator, "InspIRCd 3+"), maxlist(creator, "maxlist") { - DefaultPseudoclientModes = "+I"; + DefaultPseudoclientModes = "+oI"; CanSVSNick = true; CanSVSJoin = true; CanSetVHost = true; @@ -893,7 +893,7 @@ struct IRCDMessageCapab : Message::Capab Servers::Capab.insert("TOPICLOCK"); IRCD->CanSQLineChannel = false; IRCD->CanSVSHold = false; - IRCD->DefaultPseudoclientModes = "+I"; + IRCD->DefaultPseudoclientModes = "+oI"; } else if (params[0].equals_cs("CHANMODES") && params.size() > 1) { @@ -1220,7 +1220,7 @@ struct IRCDMessageEncap : IRCDMessage return; u->SetIdent(params[3]); - UplinkSocket::Message(u) << "FIDENT " << params[3]; + UplinkSocket::Message(u) << "FIDENT :" << params[3]; } else if (params[1] == "CHGHOST") { @@ -1229,7 +1229,7 @@ struct IRCDMessageEncap : IRCDMessage return; u->SetDisplayedHost(params[3]); - UplinkSocket::Message(u) << "FHOST " << params[3]; + UplinkSocket::Message(u) << "FHOST :" << params[3]; } else if (params[1] == "CHGNAME") { @@ -1238,7 +1238,7 @@ struct IRCDMessageEncap : IRCDMessage return; u->SetRealname(params[3]); - UplinkSocket::Message(u) << "FNAME " << params[3]; + UplinkSocket::Message(u) << "FNAME :" << params[3]; } else if (SASL::sasl && params[1] == "SASL" && params.size() >= 6) { @@ -1619,7 +1619,7 @@ struct IRCDMessageIJoin : IRCDMessage { // When receiving an IJOIN, first check if the target channel exists. If it does not exist, // ignore the join (that is, do not create the channel) and send a RESYNC back to the source. - UplinkSocket::Message(Me) << "RESYNC " << params[0]; + UplinkSocket::Message(Me) << "RESYNC :" << params[0]; return; } diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index adfe5734b..f08fee7a3 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -86,7 +86,7 @@ class NickServRelease : public User, public Timer public: NickServRelease(Module *me, NickAlias *na, time_t delay) : User(na->nick, Config->GetModule("nickserv")->Get<const Anope::string>("enforceruser", "user"), - Config->GetModule("nickserv")->Get<const Anope::string>("enforcerhost", "services.localhost.net"), "", "", Me, "Services Enforcer", Anope::CurTime, "", IRCD->UID_Retrieve(), NULL), Timer(me, delay), nick(na->nick) + Config->GetModule("nickserv")->Get<const Anope::string>("enforcerhost", Me->GetName()), "", "", Me, "Services Enforcer", Anope::CurTime, "", IRCD->UID_Retrieve(), NULL), Timer(me, delay), nick(na->nick) { /* Erase the current release timer and use the new one */ Anope::map<NickServRelease *>::iterator nit = NickServReleases.find(this->nick); |