Merge branch '2.0' into 2.1.

6 files changed, 23 insertions, 23 deletions

diff --git a/data/anope.example.conf b/data/anope.example.conf
index 407bbe535..306e8ee34 100644
--- a/data/anope.example.conf
+++ b/data/anope.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!
- *     <link name="services.localhost.net"
+ *     <link name="services.example.com"
  *           ipaddr="127.0.0.1"
  *           port="7000"
  *           sendpass="mypassword"
  *           recvpass="mypassword">
- *     <uline server="services.localhost.net" silent="yes">
+ *     <uline server="services.example.com" silent="yes">
  *     <bind address="127.0.0.1" port="7000" type="servers">
  *
  * 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
@@ -476,7 +476,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.
@@ -953,7 +953,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/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
diff --git a/data/stats.standalone.example.conf b/data/stats.standalone.example.conf
index 3d0a3bd03..e65a7d419 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!
- *     <link name="stats.localhost.net"
+ *     <link name="stats.example.com"
  *           ipaddr="127.0.0.1"
  *           port="7000"
  *           sendpass="mypassword"
  *           recvpass="mypassword">
- *     <uline server="stats.localhost.net" silent="yes">
+ *     <uline server="stats.example.com" silent="yes">
  *     <bind address="127.0.0.1" port="7000" type="servers">
  *
  * 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
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);
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<const Anope::string>("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);
 }