From 1cab1d32c20b4e4d5630b45a9537be45f39306b0 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 29 Aug 2021 18:36:17 +0100 Subject: [PATCH 1/7] Send the oper mode for services pseudoclients on InspIRCd. --- modules/protocol/inspircd3.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/protocol/inspircd3.cpp b/modules/protocol/inspircd3.cpp index e56b66b56..039df9762 100644 --- a/modules/protocol/inspircd3.cpp +++ b/modules/protocol/inspircd3.cpp @@ -60,7 +60,7 @@ class InspIRCd3Proto : public IRCDProto InspIRCd3Proto(Module *creator) : IRCDProto(creator, "InspIRCd 3"), maxlist(creator, "maxlist") { - DefaultPseudoclientModes = "+I"; + DefaultPseudoclientModes = "+oI"; CanSVSNick = true; CanSVSJoin = true; CanSetVHost = true; @@ -897,7 +897,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) { From 079fb1b66fbd9d5c7a0416b86e5a9243fedbbbaa Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 29 Aug 2021 20:02:21 +0100 Subject: [PATCH 2/7] Mark as 2.0.11-git. --- src/version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.sh b/src/version.sh index 34ca4f7e4..313ef2369 100644 --- a/src/version.sh +++ b/src/version.sh @@ -2,5 +2,5 @@ VERSION_MAJOR=2 VERSION_MINOR=0 -VERSION_PATCH=10 -VERSION_EXTRA="" +VERSION_PATCH=11 +VERSION_EXTRA="-git" From aa0adcf99b04f3462b47601e23d9d74de89d271c Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 6 Oct 2021 20:58:57 +0100 Subject: [PATCH 3/7] Show the protocol module name when connecting to the uplink. --- src/uplink.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uplink.cpp b/src/uplink.cpp index 785ef88cd..c1c8404e4 100644 --- a/src/uplink.cpp +++ b/src/uplink.cpp @@ -53,7 +53,7 @@ void Uplink::Connect() UplinkSock->Bind(Config->GetBlock("serverinfo")->Get("localhost")); FOREACH_MOD(OnPreServerConnect, ()); Anope::string ip = Anope::Resolve(u.host, u.ipv6 ? AF_INET6 : AF_INET); - Log(LOG_TERMINAL) << "Attempting to connect to uplink #" << (Anope::CurrentUplink + 1) << " " << u.host << " (" << ip << "), port " << u.port; + Log(LOG_TERMINAL) << "Attempting to connect to uplink #" << (Anope::CurrentUplink + 1) << " " << u.host << " (" << ip << '/' << u.port << ") with protocol " << IRCD->GetProtocolName(); UplinkSock->Connect(ip, u.port); } From 8b8bc97194399864537fda2b5e9f67c1f8612099 Mon Sep 17 00:00:00 2001 From: Austin Ellis Date: Sat, 13 Nov 2021 18:42:09 -0600 Subject: [PATCH 4/7] Fix the grammar of the globaloncycledown message (#279). The previous default example (which is in use on many Anope networks) refers to Services in 2nd person, then 1st person - in the same sentence. --- data/global.example.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/global.example.conf b/data/global.example.conf index 09534dae7..90ec350ce 100644 --- a/data/global.example.conf +++ b/data/global.example.conf @@ -71,7 +71,7 @@ module * * This directive is optional. */ - #globaloncycledown = "Services are restarting, they will be back shortly - please be good while we're gone" + #globaloncycledown = "Services are restarting, they will be back shortly - please be good while they're gone" /* * This is the global message that will be sent when Services (re)join the From a736b54ef1f84bf9a2ae277120e0d6caf1872015 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 14 Nov 2021 20:45:01 +0000 Subject: [PATCH 5/7] Use the server name as the enforcer hostname if not otherwise set. --- modules/pseudoclients/nickserv.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index 013b067f9..6720d7768 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("enforceruser", "user"), - Config->GetModule("nickserv")->Get("enforcerhost", "services.localhost.net"), "", "", Me, "Services Enforcer", Anope::CurTime, "", IRCD->UID_Retrieve(), NULL), Timer(me, delay), nick(na->nick) + Config->GetModule("nickserv")->Get("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::iterator nit = NickServReleases.find(this->nick); From b6f1c86f656bd860a5ef0c16b8ecb0e5921ab8ac Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 14 Nov 2021 20:45:17 +0000 Subject: [PATCH 6/7] Use example.com instead of localhost.net in the example configs. --- data/example.conf | 16 ++++++++-------- data/stats.standalone.example.conf | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/data/example.conf b/data/example.conf index 0ddc140fe..67d60e3b9 100644 --- a/data/example.conf +++ b/data/example.conf @@ -90,7 +90,7 @@ define { name = "services.host" - value = "services.localhost.net" + value = "services.example.com" } /* @@ -127,12 +127,12 @@ define * and serverinfo configuration would look like: * * # This goes in inspircd.conf, *NOT* your Anope config! - * - * + * * * * An example configuration for UnrealIRCd that is compatible with the below uplink @@ -146,14 +146,14 @@ define * serversonly; * }; * }; - * link services.localhost.net { + * link services.example.com { * incoming { * mask *@127.0.0.1; * }; * password "mypassword"; * class servers; * }; - * ulines { services.localhost.net; }; + * ulines { services.example.com; }; */ uplink { @@ -206,7 +206,7 @@ serverinfo * other server names on the rest of your IRC network. Note that it does not have * to be an existing hostname, just one that isn't on your network already. */ - name = "services.localhost.net" + name = "services.example.com" /* * The text which should appear as the server's information in /WHOIS and similar @@ -491,7 +491,7 @@ options /* * If set, will force Services to only respond to PRIVMSGs addresses to - * Nick@ServerName - e.g. NickServ@localhost.net. This should be used in + * Nick@ServerName - e.g. NickServ@example.com. This should be used in * conjunction with IRCd aliases. This directive is optional. * * This option will have no effect on some IRCds, such as TS6 IRCds. @@ -969,7 +969,7 @@ mail * This is the e-mail address from which all the e-mails are to be sent from. * It should really exist. */ - sendfrom = "services@localhost.net" + sendfrom = "services@example.com" /* * This controls the minimum amount of time a user must wait before sending diff --git a/data/stats.standalone.example.conf b/data/stats.standalone.example.conf index 79635891e..5aea3a6e2 100644 --- a/data/stats.standalone.example.conf +++ b/data/stats.standalone.example.conf @@ -90,7 +90,7 @@ define { name = "stats.host" - value = "stats.localhost.net" + value = "stats.example.com" } /* @@ -127,12 +127,12 @@ define * and serverinfo configuration would look like: * * # This goes in inspircd.conf, *NOT* your Anope config! - * - * + * * * * An example configuration for UnrealIRCd that is compatible with the below uplink @@ -146,14 +146,14 @@ define * serversonly; * }; * }; - * link stats.localhost.net { + * link stats.example.com { * incoming { * mask *@127.0.0.1; * }; * password "mypassword"; * class servers; * }; - * ulines { stats.localhost.net; }; + * ulines { stats.example.com; }; */ uplink { @@ -206,7 +206,7 @@ serverinfo * other server names on the rest of your IRC network. Note that it does not have * to be an existing hostname, just one that isn't on your network already. */ - name = "stats.localhost.net" + name = "stats.example.com" /* * The text which should appear as the server's information in /WHOIS and similar From 64f65b035e5c4eaa98d0bd916a1fb9331710789e Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sat, 20 Nov 2021 19:54:56 +0000 Subject: [PATCH 7/7] Fix some message params being sent as instead of . --- modules/protocol/inspircd20.cpp | 6 +++--- modules/protocol/inspircd3.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp index 3a557ae12..221de3d2b 100644 --- a/modules/protocol/inspircd20.cpp +++ b/modules/protocol/inspircd20.cpp @@ -802,7 +802,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") { @@ -811,7 +811,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") { @@ -820,7 +820,7 @@ struct IRCDMessageEncap : IRCDMessage return; u->SetRealname(params[3]); - UplinkSocket::Message(u) << "FNAME " << params[3]; + UplinkSocket::Message(u) << "FNAME :" << params[3]; } if (insp12_encap) diff --git a/modules/protocol/inspircd3.cpp b/modules/protocol/inspircd3.cpp index 039df9762..8aae15e67 100644 --- a/modules/protocol/inspircd3.cpp +++ b/modules/protocol/inspircd3.cpp @@ -1224,7 +1224,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") { @@ -1233,7 +1233,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") { @@ -1242,7 +1242,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) { @@ -1623,7 +1623,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; }