Release 2.0.17.

This avoids slow startups for the 95% of users who are using the
db_flatfile database backend.

.github/SECURITY.md

@@ -14,6 +14,6 @@ Version | Supported
 
 ## Reporting a Vulnerability
 
-Please do not report security vulnerabilities on GitHub. Instead, email the details to team@anope.org or get the attention of a developer in our development IRC channel at irc.anope.org #anope-devel and PM them the details.
+Please do not report security vulnerabilities on GitHub. Instead, email the details to team@anope.org or get the attention of a developer in our development IRC channel at irc.teranova.net #anope-devel and PM them the details.
 
 We will triage your issue as soon as possible and try to release a fixed version within a week of receiving your report.

.github/dependabot.yml

@@ -4,3 +4,4 @@ updates:
     directory: /
     schedule:
       interval: monthly
+    target-branch: "2.1"

README.md

@@ -4,7 +4,7 @@ Anope is an open source set of IRC Services. It is highly modular, with a vast n
 
 * [Website](https://anope.org)
 * [GitHub](https://github.com/anope)
-* IRC \#anope on irc.anope.org
+* IRC \#anope on irc.teranova.net
 
 ## Installation
 
@@ -33,7 +33,7 @@ Copy conf/example.conf to conf/services.conf
 $ cp conf/example.conf conf/services.conf
 ```
 
-Edit services.conf, configuring the uplink, serverinfo, and protocol module configurations. Example link blocks for popular IRCds are included in the the example.conf documentation. The [Anope wiki](https://wiki.anope.org) is also a good source of information. Our support channel is located at #anope on [irc.anope.org](irc://irc.anope.org/#anope).
+Edit services.conf, configuring the uplink, serverinfo, and protocol module configurations. Example link blocks for popular IRCds are included in the the example.conf documentation. The [Anope wiki](https://wiki.anope.org) is also a good source of information. Our support channel is located at #anope on [irc.teranova.net](ircs://irc.teranova.net/anope).
 
 Note that the example configuration file includes other example configuration files. If you want to modify the other example configuration files, copy them (e.g. `modules.example.conf` to `modules.conf`) and modify the `include` directive in `services.conf` to include the new file.
 

data/chanserv.example.conf

@@ -109,10 +109,9 @@ module
 	/*
 	 * The length of time before a channel registration expires.
 	 *
-	 * This directive is optional, but recommended.
-	 * If not set, the default is 14 days.
+	 * This directive is optional. If not set, the default is never.
 	 */
-	expire = 14d
+	#expire = 90d
 
 	/*
 	 * The maximum number of entries on a channel's access list.

data/example.conf

@@ -259,7 +259,7 @@ serverinfo
  *  - hybrid
  *  - inspircd12
  *  - inspircd20
- *  - inspircd3
+ *  - inspircd3 (for 3.x and 4.x)
  *  - ngircd
  *  - plexus
  *  - ratbox
@@ -458,12 +458,6 @@ options
 	 */
 	readtimeout = 5s
 
-	/*
-	 * Sets the interval between sending warning messages for program errors via
-	 * WALLOPS/GLOBOPS.
-	 */
-	warningtimeout = 4h
-
 	/*
 	 * Sets the (maximum) frequency at which the timeout list is checked. This,
 	 * combined with readtimeout above, determines how accurately timed events,
@@ -953,7 +947,7 @@ mail
 	 * If set, this option enables the mail commands in Services. You may choose
 	 * to disable it if you have no Sendmail-compatible mailer installed. Whilst
 	 * this directive (and entire block) is optional, it is required if
-	 * nickserv:registration is set to yes.
+	 * nickserv:registration is set to mail.
 	 */
 	usemail = yes
 
@@ -1153,11 +1147,6 @@ module
 	 * This is only useful with very large databases, with hundreds
 	 * of thousands of objects, that have a noticeable delay from
 	 * writing databases.
-	 *
-	 * If your database is large enough cause a noticeable delay when
-	 * saving you should consider a more powerful alternative such
-	 * as db_sql or db_redis, which incrementally update their
-	 * databases asynchronously in real time.
 	 */
 	fork = no
 }
@@ -1195,9 +1184,10 @@ module
 
 	/* Whether or not to import data from another database module in to SQL on startup.
 	 * If you enable this, be sure that the database services is configured to use is
-	 * empty and that another database module to import from is loaded before db_sql.
-	 * After you enable this and do a database import you should disable it for
-	 * subsequent restarts.
+	 * empty and that another database module to import from is loaded BEFORE db_sql.
+	 * After you enable this and do a database import you MUST disable it for
+	 * subsequent restarts. If you want to keep writing a flatfile database after the
+	 * SQL import is done you should load db_flatfile AFTER this module.
 	 *
 	 * Note that you can not import databases using db_sql_live. If you want to import
 	 * databases and use db_sql_live you should import them using db_sql, then shut down

data/stats.standalone.example.conf

@@ -256,7 +256,7 @@ serverinfo
  *  - hybrid
  *  - inspircd12
  *  - inspircd20
- *  - inspircd3
+ *  - inspircd3 (for 3.x and 4.x)
  *  - ngircd
  *  - plexus
  *  - ratbox
@@ -371,12 +371,6 @@ options
 	 */
 	readtimeout = 5s
 
-	/*
-	 * Sets the interval between sending warning messages for program errors via
-	 * WALLOPS/GLOBOPS.
-	 */
-	warningtimeout = 4h
-
 	/*
 	 * If set, Services will only show /stats o to IRC Operators. This directive
 	 * is optional.

docs/Changes

@@ -1,6 +1,40 @@
+Anope Version 2.0.17
+--------------------
+Fixed importing large flatfile databases into SQL.
+Fixed marking channels as permanent.
+Fixed serialising unset boolean extension items.
+Fixed the documentation about how to import SQL databases.
+Fixed the documentation of options:usemail.
+Fixed the location of the geoipupdate CSV files.
+Fixed translating memo emails.
+Fixed unnecessary SQL updates caused by dereferencing user accounts.
+Increased the size of the chanstats letter and word count columns.
+Updated the location of the Anope IRC channels.
+
 Anope Version 2.0.16-git
 ------------------------
-No significant changes.
+Added a workaround for users matching expired sqlines.
+Fixed a copy/paste error in webcpanel.
+Fixed a crash in db_flatfile caused by trying to serialize data without a type.
+Fixed duplicate messages when synconset/syncongroup is set.
+Fixed expiring channel suspensions.
+Fixed expiring forbids.
+Fixed expiring nick suspensions.
+Fixed feature detection on InspIRCd.
+Fixed InspIRCd account cloaks causing CHGHOST spam when a user also has a services vhost.
+Fixed joining users to channels with a key set on InspIRCd.
+Fixed logging users out fully when their nick gets suspended.
+Fixed marking boolean columns in SQL as TEXT instead of INT.
+Fixed matching extbans on InspIRCd and implement missing matchers.
+Fixed operserv/sqline expiry on UnrealIRCd
+Fixed respecting --noexpire in cs_suspend and ns_suspend.
+Fixed sending emails to nicks ending with a backslash.
+Fixed sending SVSTOPIC when topiclock is loaded on InspIRCd.
+Fixed some SQL tables taking up too much space on disk.
+Fixed the default config for channel suspensions.
+Fixed the TIME message on InspIRCd.
+Fixed trying to escape SQL data when not connected to MySQL.
+Fixed {ldap,sql}_authentication creating zombie accounts on expiry.
 
 Anope Version 2.0.15
 --------------------

docs/Changes.conf

@@ -1,5 +1,9 @@
-Anope Version 2.0.16-git
-------------------------
+Anope Version 2.0.17
+--------------------
+No significant changes.
+
+Anope Version 2.0.16
+--------------------
 No significant changes.
 
 Anope Version 2.0.15

docs/DEFCON

@@ -90,4 +90,4 @@ Anope DefCon
 6) Support
 
     You might get DefCon support by posting on our online forum, or maybe on
-    our #anope channel at /server irc.anope.org.
+    our #anope channel at /server irc.teranova.net.

docs/INSTALL

@@ -60,7 +60,7 @@ Note: You should also read the README and FAQ files!
     most likely not work!
 
     If you need help, you should visit https://forum.anope.org/ or #anope on
-    irc.anope.org. Provide *complete* error output, along with other relevant
+    irc.teranova.net. Provide *complete* error output, along with other relevant
     information eg. OS, compiler and C++ library versions.
     See the README file for more information.
 

docs/INSTALL.fr

@@ -64,7 +64,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     recommandée, et Anope ne fonctionnera probablement pas !
 
     Si vous avez besoin d'aide, vous pouvez aller sur le site
-    https://forum.anope.org/ ou le canal #anope sur irc.anope.org.
+    https://forum.anope.org/ ou le canal #anope sur irc.teranova.net.
     Fournissez *l'essemble* des erreurs qui apparaîssent, en plus de
     toutes informations utiles, comme les versions de votre OS, du
     compilateur utilisé et de la librairie C++. Lisez le fichier README

docs/LANGUAGE

@@ -19,6 +19,8 @@ Anope Multi Language Support
         Then execute:
         dpkg-reconfigure locales
 
+    If you have already built Anope you will need to delete the build directory and rebuild from scratch.
+
     Building Anope on Windows with gettext support is explained in docs/WIN32.txt
 
 2) Adding a new language

docs/MODULES

@@ -111,7 +111,7 @@ Anope Modules
     Use modules at your own risk, and make sure you get them from a
     reputable source. You might get module support by contacting the module
     author, posting on our online forum, or maybe on our #anope channel
-    at /server irc.anope.org.
+    at /server irc.teranova.net.
 
 7) Information for Developers
 

docs/README

@@ -245,7 +245,7 @@ Table of Contents
 
     If you read the documentation carefully, and didn't find the answer to
     your question, feel free to post on the website forums or join our irc
-    channel (irc.anope.org #anope). Once you join our Support channel be as
+    channel (irc.teranova.net #anope). Once you join our Support channel be as
     precise as possible when asking a question, because we have no extraordinary
     powers and can't guess things if they aren't provided.
 

include/extensible.h

@@ -190,7 +190,8 @@ class SerializableExtensibleItem<bool> : public PrimitiveExtensibleItem<bool>
 
 	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const anope_override
 	{
-		data[this->name] << true;
+		data.SetType(this->name, Serialize::Data::DT_INT);
+		data[this->name] << this->HasExt(e);
 	}
 
 	void ExtensibleUnserialize(Extensible *e, Serializable *s, Serialize::Data &data) anope_override

modules/commands/bs_kick.cpp

@@ -51,17 +51,16 @@ struct KickerDataImpl : KickerData
 			if (kd == NULL)
 				return;
 
-			data["kickerdata:amsgs"] << kd->amsgs;
-			data["kickerdata:badwords"] << kd->badwords;
-			data["kickerdata:bolds"] << kd->bolds;
-			data["kickerdata:caps"] << kd->caps;
-			data["kickerdata:colors"] << kd->colors;
-			data["kickerdata:flood"] << kd->flood;
-			data["kickerdata:italics"] << kd->italics;
-			data["kickerdata:repeat"] << kd->repeat;
-			data["kickerdata:reverses"] << kd->reverses;
-			data["kickerdata:underlines"] << kd->underlines;
-
+			data.SetType("kickerdata:amsgs", Serialize::Data::DT_INT); data["kickerdata:amsgs"] << kd->amsgs;
+			data.SetType("kickerdata:badwords", Serialize::Data::DT_INT); data["kickerdata:badwords"] << kd->badwords;
+			data.SetType("kickerdata:bolds", Serialize::Data::DT_INT); data["kickerdata:bolds"] << kd->bolds;
+			data.SetType("kickerdata:caps", Serialize::Data::DT_INT); data["kickerdata:caps"] << kd->caps;
+			data.SetType("kickerdata:colors", Serialize::Data::DT_INT); data["kickerdata:colors"] << kd->colors;
+			data.SetType("kickerdata:flood", Serialize::Data::DT_INT); data["kickerdata:flood"] << kd->flood;
+			data.SetType("kickerdata:italics", Serialize::Data::DT_INT); data["kickerdata:italics"] << kd->italics;
+			data.SetType("kickerdata:repeat", Serialize::Data::DT_INT); data["kickerdata:repeat"] << kd->repeat;
+			data.SetType("kickerdata:reverses", Serialize::Data::DT_INT); data["kickerdata:reverses"] << kd->reverses;
+			data.SetType("kickerdata:underlines", Serialize::Data::DT_INT); data["kickerdata:underlines"] << kd->underlines;
 			data.SetType("capsmin", Serialize::Data::DT_INT); data["capsmin"] << kd->capsmin;
 			data.SetType("capspercent", Serialize::Data::DT_INT); data["capspercent"] << kd->capspercent;
 			data.SetType("floodlines", Serialize::Data::DT_INT); data["floodlines"] << kd->floodlines;

modules/commands/cs_set.cpp

@@ -510,12 +510,13 @@ class CommandCSSetPersist : public Command
 				/* Set the perm mode */
 				if (cm)
 				{
-					if (ci->c && !ci->c->HasMode("PERM"))
-						ci->c->SetMode(NULL, cm);
 					/* Add it to the channels mlock */
 					ModeLocks *ml = ci->Require<ModeLocks>("modelocks");
 					if (ml)
 						ml->SetMLock(cm, true, "", source.GetNick());
+
+					if (ci->c && !ci->c->HasMode("PERM"))
+						ci->c->SetMode(NULL, cm);
 				}
 				/* No botserv bot, no channel mode, give them ChanServ.
 				 * Yes, this works fine with no BotServ.
@@ -553,12 +554,13 @@ class CommandCSSetPersist : public Command
 				/* Unset perm mode */
 				if (cm)
 				{
-					if (ci->c && ci->c->HasMode("PERM"))
-						ci->c->RemoveMode(NULL, cm);
 					/* Remove from mlock */
 					ModeLocks *ml = ci->GetExt<ModeLocks>("modelocks");
 					if (ml)
 						ml->RemoveMLock(cm, true);
+
+					if (ci->c && ci->c->HasMode("PERM"))
+						ci->c->RemoveMode(NULL, cm);
 				}
 				/* No channel mode, no BotServ, but using ChanServ as the botserv bot
 				 * which was assigned when persist was set on

modules/commands/cs_suspend.cpp

@@ -210,6 +210,13 @@ class CSSuspend : public Module
 		}
 	};
 
+	void Expire(ChannelInfo *ci)
+	{
+		suspend.Unset(ci);
+		Log(this) << "Expiring suspend for " << ci->name;
+	}
+
+
 	bool Show(CommandSource &source, const Anope::string &what) const
 	{
 		return source.IsOper() || std::find(show.begin(), show.end(), what) != show.end();
@@ -255,23 +262,28 @@ class CSSuspend : public Module
 
 		expire = false;
 
-		if (!si->expires)
-			return;
-
-		if (si->expires < Anope::CurTime)
+		if (!Anope::NoExpire && si->expires && si->expires < Anope::CurTime)
 		{
 			ci->last_used = Anope::CurTime;
-			suspend.Unset(ci);
-
-			Log(this) << "Expiring suspend for " << ci->name;
+			Expire(ci);
 		}
 	}
 
 	EventReturn OnCheckKick(User *u, Channel *c, Anope::string &mask, Anope::string &reason) anope_override
 	{
-		if (u->HasMode("OPER") || !c->ci || !suspend.HasExt(c->ci))
+		if (u->HasMode("OPER") || !c->ci)
 			return EVENT_CONTINUE;
 
+		CSSuspendInfo *si = suspend.Get(c->ci);
+		if (!si)
+			return EVENT_CONTINUE;
+
+		if (!Anope::NoExpire && si->expires && si->expires < Anope::CurTime)
+		{
+			Expire(c->ci);
+			return EVENT_CONTINUE;
+		}
+
 		reason = Language::Translate(u, _("This channel may not be used."));
 		return EVENT_STOP;
 	}

modules/commands/greet.cpp

@@ -188,7 +188,7 @@ class Greet : public Module
 		 * to has synced, or we'll get greet-floods when the net
 		 * recovers from a netsplit. -GD
 		 */
-		if (!c->ci || !c->ci->bi || !user->server->IsSynced() || !user->Account())
+		if (!c->ci || !c->ci->bi || !user->server->IsSynced() || !user->IsIdentified())
 			return;
 
 		Anope::string *greet = ns_greet.Get(user->Account());

modules/commands/hs_group.cpp

@@ -28,7 +28,7 @@ class CommandHSGroup : public Command
 		for (unsigned i = 0; i < na->nc->aliases->size(); ++i)
 		{
 			NickAlias *nick = na->nc->aliases->at(i);
-			if (nick)
+			if (nick && nick != na)
 			{
 				nick->SetVhost(na->GetVhostIdent(), na->GetVhostHost(), na->GetVhostCreator());
 				FOREACH_MOD(OnSetVhost, (nick));

modules/commands/hs_set.cpp

@@ -114,7 +114,7 @@ class CommandHSSetAll : public Command
 		for (unsigned i = 0; i < na->nc->aliases->size(); ++i)
 		{
 			NickAlias *nick = na->nc->aliases->at(i);
-			if (nick)
+			if (nick && nick != na)
 				nick->SetVhost(na->GetVhostIdent(), na->GetVhostHost(), na->GetVhostCreator());
 		}
 	}

modules/commands/ns_identify.cpp

@@ -82,7 +82,7 @@ class CommandNSIdentify : public Command
 			return;
 		}
 
-		if (u->Account() && na && u->Account() == na->nc)
+		if (u->IsIdentified() && na && u->Account() == na->nc)
 		{
 			source.Reply(_("You are already identified."));
 			return;

modules/commands/ns_set.cpp

@@ -1286,7 +1286,7 @@ class NSSet : public Module
 		if (chan->ci)
 		{
 			/* Only give modes if autoop is set */
-			give_modes &= !user->Account() || autoop.HasExt(user->Account());
+			give_modes &= !user->IsIdentified() || autoop.HasExt(user->Account());
 		}
 	}
 
@@ -1321,13 +1321,13 @@ class NSSet : public Module
 
 	void OnUserModeSet(const MessageSource &setter, User *u, const Anope::string &mname) anope_override
 	{
-		if (u->Account() && setter.GetUser() == u)
+		if (u->IsIdentified() && setter.GetUser() == u)
 			u->Account()->last_modes = u->GetModeList();
 	}
 
 	void OnUserModeUnset(const MessageSource &setter, User *u, const Anope::string &mname) anope_override
 	{
-		if (u->Account() && setter.GetUser() == u)
+		if (u->IsIdentified() && setter.GetUser() == u)
 			u->Account()->last_modes = u->GetModeList();
 	}
 

modules/commands/ns_status.cpp

@@ -36,7 +36,7 @@ class CommandNSStatus : public Command
 			else if (u2->IsIdentified() && na && na->nc == u2->Account()) /* Nick is identified */
 				source.Reply("STATUS %s %d %s", nickbuf.c_str(), 3, u2->Account()->display.c_str());
 			else if (u2->IsRecognized()) /* Nick is recognised, but NOT identified */
-				source.Reply("STATUS %s %d %s", nickbuf.c_str(), 2, u2->Account() ? u2->Account()->display.c_str() : "");
+				source.Reply("STATUS %s %d %s", nickbuf.c_str(), 2, u2->IsIdentified() ? u2->Account()->display.c_str() : "");
 			else if (!na) /* Nick is online, but NOT a registered */
 				source.Reply("STATUS %s %d %s", nickbuf.c_str(), 0, "");
 			else

modules/commands/ns_suspend.cpp

@@ -127,6 +127,8 @@ class CommandNSSuspend : public Command
 				User *u2 = User::Find(na2->nick, true);
 				if (u2)
 				{
+					IRCD->SendLogout(u2);
+					u2->RemoveMode(source.service, "REGISTERED");
 					u2->Logout();
 					if (nickserv)
 						nickserv->Collide(u2, na2);
@@ -222,6 +224,12 @@ class NSSuspend : public Module
 		return source.IsOper() || std::find(show.begin(), show.end(), what) != show.end();
 	}
 
+	void Expire(NickAlias *na)
+	{
+		suspend.Unset(na->nc);
+		Log(LOG_NORMAL, "nickserv/expire", Config->GetClient("NickServ")) << "Expiring suspend for " << na->nick;
+	}
+
  public:
 	NSSuspend(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		commandnssuspend(this), commandnsunsuspend(this), suspend(this, "NS_SUSPENDED"),
@@ -262,15 +270,10 @@ class NSSuspend : public Module
 
 		expire = false;
 
-		if (!s->expires)
-			return;
-
-		if (s->expires < Anope::CurTime)
+		if (!Anope::NoExpire && s->expires && s->expires < Anope::CurTime)
 		{
 			na->last_seen = Anope::CurTime;
-			suspend.Unset(na->nc);
-
-			Log(LOG_NORMAL, "nickserv/expire", Config->GetClient("NickServ")) << "Expiring suspend for " << na->nick;
+			Expire(na);
 		}
 	}
 
@@ -280,6 +283,12 @@ class NSSuspend : public Module
 		if (!s)
 			return EVENT_CONTINUE;
 
+		if (!Anope::NoExpire && s->expires && s->expires < Anope::CurTime)
+		{
+			Expire(na);
+			return EVENT_CONTINUE;
+		}
+
 		u->SendMessage(Config->GetClient("NickServ"), NICK_X_SUSPENDED, u->nick.c_str());
 		return EVENT_STOP;
 	}

modules/commands/os_forbid.cpp

@@ -65,6 +65,33 @@ class MyForbidService : public ForbidService
 
 	inline std::vector<ForbidData *>& forbids(unsigned t) { return (*this->forbid_data)[t - 1]; }
 
+	void Expire(ForbidData *fd, unsigned ft, size_t idx)
+	{
+		Anope::string typestr;
+		switch (ft)
+		{
+			case FT_NICK:
+				typestr = "nick";
+				break;
+			case FT_CHAN:
+				typestr = "chan";
+				break;
+			case FT_EMAIL:
+				typestr = "email";
+				break;
+			case FT_REGISTER:
+				typestr = "register";
+				break;
+			default:
+				typestr = "unknown";
+				break;
+		}
+
+		Log(LOG_NORMAL, "expire/forbid", Config->GetClient("OperServ")) << "Expiring forbid for " << fd->mask << " type " << typestr;
+		this->forbids(ft).erase(this->forbids(ft).begin() + idx);
+		delete fd;
+	}
+
  public:
 	MyForbidService(Module *m) : ForbidService(m), forbid_data("ForbidData") { }
 
@@ -99,6 +126,12 @@ class MyForbidService : public ForbidService
 		{
 			ForbidData *d = this->forbids(ftype)[i - 1];
 
+			if (!Anope::NoExpire && d->expires && Anope::CurTime >= d->expires)
+			{
+				Expire(d, ftype, i - 1);
+				continue;
+			}
+
 			if (Anope::Match(mask, d->mask, false, true))
 				return d;
 		}
@@ -111,6 +144,12 @@ class MyForbidService : public ForbidService
 		{
 			ForbidData *d = this->forbids(ftype)[i - 1];
 
+			if (!Anope::NoExpire && d->expires && Anope::CurTime >= d->expires)
+			{
+				Expire(d, ftype, i - 1);
+				continue;
+			}
+
 			if (d->mask.equals_ci(mask))
 				return d;
 		}
@@ -126,19 +165,7 @@ class MyForbidService : public ForbidService
 				ForbidData *d = this->forbids(j).at(i - 1);
 
 				if (d->expires && !Anope::NoExpire && Anope::CurTime >= d->expires)
-				{
-					Anope::string ftype = "none";
-					if (d->type == FT_NICK)
-						ftype = "nick";
-					else if (d->type == FT_CHAN)
-						ftype = "chan";
-					else if (d->type == FT_EMAIL)
-						ftype = "email";
-
-					Log(LOG_NORMAL, "expire/forbid", Config->GetClient("OperServ")) << "Expiring forbid for " << d->mask << " type " << ftype;
-					this->forbids(j).erase(this->forbids(j).begin() + i - 1);
-					delete d;
-				}
+					Expire(d, j, i - 1);
 				else
 					f.push_back(d);
 			}

modules/database/db_flatfile.cpp

@@ -324,6 +324,8 @@ class DBFlatFile : public Module, public Pipe
 			{
 				Serializable *base = *it;
 				Serialize::Type *s_type = base->GetSerializableType();
+				if (!s_type)
+					continue;
 
 				data.fs = databases[s_type->GetOwner()];
 				if (!data.fs || !data.fs->is_open())

modules/database/db_sql.cpp

@@ -159,6 +159,14 @@ class DBSQL : public Module, public Pipe
 		this->import = block->Get<bool>("import");
 	}
 
+	void OnPostInit() anope_override
+	{
+		// If we are importing from flatfile we need to force a socket engine
+		// flush to ensure it actually gets written to the database before we
+		// connect to the uplink.
+		SocketEngine::Process();
+	}
+
 	void OnShutdown() anope_override
 	{
 		this->shutting_down = true;

modules/extra/m_ldap_authentication.cpp

@@ -143,7 +143,7 @@ class OnIdentifyInterface : public LDAPInterface
 	{
 		User *u = User::Find(uid);
 
-		if (!u || !u->Account() || r.empty())
+		if (!u || !u->IsIdentified() || r.empty())
 			return;
 
 		try
@@ -299,6 +299,15 @@ class ModuleLDAPAuthentication : public Module
 		Anope::string new_dn = username_attribute + "=" + na->nick + "," + basedn;
 		this->ldap->Add(&this->orinterface, new_dn, attributes);
 	}
+
+	void OnPreNickExpire(NickAlias *na, bool &expire) anope_override
+	{
+		// We can't let nicks expire if they still have a group or
+		// there will be a zombie account left over that can't be
+		// authenticated to.
+		if (na->nick == na->nc->display && na->nc->aliases->size() > 1)
+			expire = false;
+	}
 };
 
 MODULE_INIT(ModuleLDAPAuthentication)

modules/extra/m_ldap_oper.cpp

@@ -23,7 +23,7 @@ class IdentifyInterface : public LDAPInterface
 
 	void OnResult(const LDAPResult &r) anope_override
 	{
-		if (!u || !u->Account())
+		if (!u || !u->IsIdentified())
 			return;
 
 		NickCore *nc = u->Account();

modules/extra/m_mysql.cpp

@@ -339,9 +339,14 @@ Result MySQLService::RunQuery(const Query &query)
 {
 	this->Lock.Lock();
 
-	Anope::string real_query = this->BuildQuery(query);
+	if (!this->CheckConnection())
+	{
+		this->Lock.Unlock();
+		return MySQLResult(query, query.query, mysql_error(this->sql));
+	}
 
-	if (this->CheckConnection() && !mysql_real_query(this->sql, real_query.c_str(), real_query.length()))
+	Anope::string real_query = this->BuildQuery(query);
+	if (!mysql_real_query(this->sql, real_query.c_str(), real_query.length()))
 	{
 		MYSQL_RES *res = mysql_store_result(this->sql);
 		unsigned int id = mysql_insert_id(this->sql);
@@ -395,11 +400,11 @@ std::vector<Query> MySQLService::CreateTable(const Anope::string &table, const D
 
 			query_text += ", `" + it->first + "` ";
 			if (data.GetType(it->first) == Serialize::Data::DT_INT)
-				query_text += "int(11)";
+				query_text += "int";
 			else
 				query_text += "text";
 		}
-		query_text += ", PRIMARY KEY (`id`), KEY `timestamp_idx` (`timestamp`))";
+		query_text += ", PRIMARY KEY (`id`), KEY `timestamp_idx` (`timestamp`)) ROW_FORMAT=DYNAMIC";
 		queries.push_back(query_text);
 	}
 	else
@@ -412,7 +417,7 @@ std::vector<Query> MySQLService::CreateTable(const Anope::string &table, const D
 
 			Anope::string query_text = "ALTER TABLE `" + table + "` ADD `" + it->first + "` ";
 			if (data.GetType(it->first) == Serialize::Data::DT_INT)
-				query_text += "int(11)";
+				query_text += "int";
 			else
 				query_text += "text";
 

modules/extra/m_sql_authentication.cpp

@@ -143,6 +143,15 @@ class ModuleSQLAuthentication : public Module
 
 		Log(LOG_DEBUG) << "m_sql_authentication: Checking authentication for " << req->GetAccount();
 	}
+
+	void OnPreNickExpire(NickAlias *na, bool &expire) anope_override
+	{
+		// We can't let nicks expire if they still have a group or
+		// there will be a zombie account left over that can't be
+		// authenticated to.
+		if (na->nick == na->nc->display && na->nc->aliases->size() > 1)
+			expire = false;
+	}
 };
 
 MODULE_INIT(ModuleSQLAuthentication)

modules/extra/m_sql_oper.cpp

@@ -46,7 +46,7 @@ class SQLOperResult : public SQL::Interface
 	{
 		SQLOperResultDeleter d(this);
 
-		if (!user || !user->Account())
+		if (!user || !user->IsIdentified())
 			return;
 
 		if (r.Rows() == 0)

modules/extra/stats/irc2sql/irc2sql.cpp

@@ -108,7 +108,7 @@ void IRC2SQL::OnUserConnect(User *u, bool &exempt)
 	query.SetValue("ident", u->GetIdent());
 	query.SetValue("vident", u->GetVIdent());
 	query.SetValue("secure", u->HasMode("SSL") || u->HasExt("ssl") ? "Y" : "N");
-	query.SetValue("account", u->Account() ? u->Account()->display : "");
+	query.SetValue("account", u->IsIdentified() ? u->Account()->display : "");
 	query.SetValue("fingerprint", u->fingerprint);
 	query.SetValue("signon", u->signon);
 	query.SetValue("server", u->server->GetName());
@@ -176,7 +176,7 @@ void IRC2SQL::OnUserLogin(User *u)
 {
 	query = "UPDATE `" + prefix + "user` SET account=@account@ WHERE nick=@nick@";
 	query.SetValue("nick", u->nick);
-	query.SetValue("account", u->Account() ? u->Account()->display : "");
+	query.SetValue("account", u->IsIdentified() ? u->Account()->display : "");
 	this->RunQuery(query);
 }
 

modules/extra/stats/m_chanstats.cpp

@@ -207,7 +207,7 @@ class MChanstats : public Module
 
 	const Anope::string GetDisplay(User *u)
 	{
-		if (u && u->Account() && ns_stats.HasExt(u->Account()))
+		if (u && u->IsIdentified() && ns_stats.HasExt(u->Account()))
 			return u->Account()->display;
 		else
 			return "";
@@ -277,8 +277,8 @@ class MChanstats : public Module
 				"`chan` varchar(64) NOT NULL DEFAULT '',"
 				"`nick` varchar(64) NOT NULL DEFAULT '',"
 				"`type` ENUM('total', 'monthly', 'weekly', 'daily') NOT NULL,"
-				"`letters` int(10) unsigned NOT NULL DEFAULT '0',"
-				"`words` int(10) unsigned NOT NULL DEFAULT '0',"
+				"`letters` bigint unsigned NOT NULL DEFAULT '0',"
+				"`words` bigint unsigned NOT NULL DEFAULT '0',"
 				"`line` int(10) unsigned NOT NULL DEFAULT '0',"
 				"`actions` int(10) unsigned NOT NULL DEFAULT '0',"
 				"`smileys_happy` int(10) unsigned NOT NULL DEFAULT '0',"
@@ -527,7 +527,7 @@ class MChanstats : public Module
 
 	void OnTopicUpdated(User *source, Channel *c, const Anope::string &user, const Anope::string &topic) anope_override
 	{
-		if (!source || !source->Account() || !c->ci || !cs_stats.HasExt(c->ci))
+		if (!source || !source->IsIdentified() || !c->ci || !cs_stats.HasExt(c->ci))
 			return;
 		query = "CALL " + prefix + "chanstats_proc_update(@channel@, @nick@, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1);";
 		query.SetValue("channel", c->name);
@@ -550,7 +550,7 @@ class MChanstats : public Module
  private:
 	void OnModeChange(Channel *c, User *u)
 	{
-		if (!u || !u->Account() || !c->ci || !cs_stats.HasExt(c->ci))
+		if (!u || !u->IsIdentified() || !c->ci || !cs_stats.HasExt(c->ci))
 			return;
 
 		query = "CALL " + prefix + "chanstats_proc_update(@channel@, @nick@, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0);";

modules/fantasy.cpp

@@ -167,7 +167,7 @@ class Fantasy : public Module
 		}
 
 		// Command requires registered users only
-		if (!cmd->AllowUnregistered() && !u->Account())
+		if (!cmd->AllowUnregistered() && !u->IsIdentified())
 			return;
 
 		if (params.size() < cmd->min_params)

modules/m_dnsbl.cpp

@@ -68,7 +68,7 @@ class DNSBLResolver : public Request
 		if (!blacklist.replies.empty() && !reply)
 			return;
 
-		if (reply && reply->allow_account && user->Account())
+		if (reply && reply->allow_account && user->IsIdentified())
 			return;
 
 		Anope::string reason = this->blacklist.reason, addr = user->ip.addr();

modules/m_xmlrpc_main.cpp

@@ -226,7 +226,7 @@ class MyXMLRPCEvent : public XMLRPCEvent
 			request.reply("ip", u->ip.addr());
 			request.reply("timestamp", stringify(u->timestamp));
 			request.reply("signon", stringify(u->signon));
-			if (u->Account())
+			if (u->IsIdentified())
 			{
 				request.reply("account", iface->Sanitize(u->Account()->display));
 				if (u->Account()->o)

modules/protocol/inspircd20.cpp

@@ -253,7 +253,7 @@ namespace InspIRCdExtban
 		{
 			const Anope::string &mask = e->GetMask();
 			Anope::string real_mask = mask.substr(2);
-			return !u->Account() && Entry("BAN", real_mask).Matches(u);
+			return !u->IsIdentified() && Entry("BAN", real_mask).Matches(u);
 		}
 	};
 }

modules/protocol/inspircd3.cpp

@@ -66,9 +66,7 @@ class InspIRCd3Proto : public IRCDProto
 		CanSetVHost = true;
 		CanSetVIdent = true;
 		CanSQLine = true;
-		CanSQLineChannel = true;
 		CanSZLine = true;
-		CanSVSHold = true;
 		CanCertFP = true;
 		RequiresID = true;
 		MaxModes = 20;
@@ -182,7 +180,7 @@ class InspIRCd3Proto : public IRCDProto
 
 	void SendTopic(const MessageSource &source, Channel *c) anope_override
 	{
-		if (Servers::Capab.count("SVSTOPIC"))
+		if (Servers::Capab.count("TOPICLOCK"))
 		{
 			UplinkSocket::Message(c->WhoSends()) << "SVSTOPIC " << c->name << " " << c->topic_ts << " " << c->topic_setter << " :" << c->topic;
 		}
@@ -396,9 +394,12 @@ class InspIRCd3Proto : public IRCDProto
 		SendAddLine("Z", x->GetHost(), timeleft, x->by, x->GetReason());
 	}
 
-	void SendSVSJoin(const MessageSource &source, User *u, const Anope::string &chan, const Anope::string &other) anope_override
+	void SendSVSJoin(const MessageSource &source, User *u, const Anope::string &chan, const Anope::string &key) anope_override
 	{
-		UplinkSocket::Message(source) << "SVSJOIN " << u->GetUID() << " " << chan;
+		if (key.empty())
+			UplinkSocket::Message(source) << "SVSJOIN " << u->GetUID() << " " << chan;
+		else
+			UplinkSocket::Message(source) << "SVSJOIN " << u->GetUID() << " " << chan << " :" << key;
 	}
 
 	void SendSVSPart(const MessageSource &source, User *u, const Anope::string &chan, const Anope::string &param) anope_override
@@ -444,6 +445,7 @@ class InspIRCd3Proto : public IRCDProto
 		if (na->nc->HasExt("UNCONFIRMED"))
 			return;
 
+		IRCD->SendVhost(u, na->GetVhostIdent(), na->GetVhostHost());
 		UplinkSocket::Message(Me) << "METADATA " << u->GetUID() << " accountid :" << na->nc->GetId();
 		UplinkSocket::Message(Me) << "METADATA " << u->GetUID() << " accountname :" << na->nc->display;
 	}
@@ -697,7 +699,7 @@ namespace InspIRCdExtban
 		{
 			const Anope::string &mask = e->GetMask();
 			Anope::string real_mask = mask.substr(2);
-			return !u->Account() && Entry("BAN", real_mask).Matches(u);
+			return !u->IsIdentified() && Entry("BAN", real_mask).Matches(u);
 		}
 	};
 
@@ -931,8 +933,7 @@ struct IRCDMessageCapab : Message::Capab
 			}
 
 			/* reset CAPAB */
-			Servers::Capab.insert("SERVERS");
-			Servers::Capab.insert("TOPICLOCK");
+			Servers::Capab.clear();
 			IRCD->CanSQLineChannel = false;
 			IRCD->CanSVSHold = false;
 			IRCD->DefaultPseudoclientModes = "+oI";
@@ -1238,11 +1239,15 @@ struct IRCDMessageCapab : Message::Capab
 				return;
 			}
 			if (!IRCD->CanSVSHold)
-				Log() << "SVSHOLD missing, Usage disabled until module is loaded.";
+				Log() << "The remote server does not have the svshold module; fake users will be used for nick protection until the module is loaded.";
+			if (!IRCD->CanSQLineChannel)
+				Log() << "The remote server does not have the cban module; services will manually enforce forbidden channels until the module is loaded.";
 			if (!Servers::Capab.count("CHGHOST"))
-				Log() << "CHGHOST missing, Usage disabled until module is loaded.";
+				Log() << "The remote server does not have the chghost module; vhosts are disabled until the module is loaded.";
 			if (!Servers::Capab.count("CHGIDENT"))
-				Log() << "CHGIDENT missing, Usage disabled until module is loaded.";
+				Log() << "The remote server does not have the chgident module; vidents are disabled until the module is loaded.";
+			if (!Servers::Capab.count("GLOBOPS"))
+				Log() << "The remote server does not have the globops module; oper notices will be sent as announcements until the module is loaded.";
 		}
 
 		Message::Capab::Run(source, params);
@@ -1484,12 +1489,16 @@ class IRCDMessageMetadata : IRCDMessage
 					required = true;
 				else if (module.equals_cs("m_hidechans.so"))
 					required = true;
+				else if (module.equals_cs("m_cban.so=glob") && plus)
+					IRCD->CanSQLineChannel = true;
+				if (module.equals_cs("m_cban.so") && !plus)
+					IRCD->CanSQLineChannel = false;
 				else if (module.equals_cs("m_chghost.so"))
 					capab = "CHGHOST";
 				else if (module.equals_cs("m_chgident.so"))
 					capab = "CHGIDENT";
 				else if (module.equals_cs("m_svshold.so"))
-					capab = "SVSHOLD";
+					IRCD->CanSVSHold = plus;
 				else if (module.equals_cs("m_rline.so"))
 					capab = "RLINE";
 				else if (module.equals_cs("m_topiclock.so"))
@@ -1504,9 +1513,9 @@ class IRCDMessageMetadata : IRCDMessage
 				}
 				else
 				{
-					if (plus)
+					if (plus && !capab.empty())
 						Servers::Capab.insert(capab);
-					else
+					else if (!capab.empty())
 						Servers::Capab.erase(capab);
 
 					Log() << "InspIRCd " << (plus ? "loaded" : "unloaded") << " module " << module << ", adjusted functionality";
@@ -1677,7 +1686,7 @@ struct IRCDMessageIJoin : IRCDMessage
 		time_t chants = Anope::CurTime;
 		if (params.size() >= 4)
 		{
-			chants = params[2].is_pos_number_only() ? convertTo<unsigned>(params[2]) : 0;
+			chants = params[2].is_pos_number_only() ? convertTo<time_t>(params[2]) : 0;
 			for (unsigned i = 0; i < params[3].length(); ++i)
 				user.first.AddMode(params[3][i]);
 		}
@@ -1828,16 +1837,6 @@ struct IRCDMessageSQuit : Message::SQuit
 	}
 };
 
-struct IRCDMessageTime : IRCDMessage
-{
-	IRCDMessageTime(Module *creator) : IRCDMessage(creator, "TIME", 2) { }
-
-	void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override
-	{
-		UplinkSocket::Message(Me) << "TIME " << source.GetSource() << " " << params[1] << " " << Anope::CurTime;
-	}
-};
-
 struct IRCDMessageUID : IRCDMessage
 {
 	IRCDMessageUID(Module *creator) : IRCDMessage(creator, "UID", 8) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
@@ -1901,6 +1900,7 @@ class ProtoInspIRCd3 : public Module
 	Message::Privmsg message_privmsg;
 	Message::Quit message_quit;
 	Message::Stats message_stats;
+	Message::Time message_time;
 
 	/* Our message handlers */
 	IRCDMessageAway message_away;
@@ -1924,7 +1924,6 @@ class ProtoInspIRCd3 : public Module
 	IRCDMessageSave message_save;
 	IRCDMessageServer message_server;
 	IRCDMessageSQuit message_squit;
-	IRCDMessageTime message_time;
 	IRCDMessageUID message_uid;
 
 	bool use_server_side_topiclock, use_server_side_mlock;
@@ -1938,12 +1937,12 @@ class ProtoInspIRCd3 : public Module
 	ProtoInspIRCd3(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this), ssl(this, "ssl"),
 		message_error(this), message_invite(this), message_kill(this), message_motd(this), message_notice(this),
-		message_part(this), message_privmsg(this), message_quit(this), message_stats(this),
+		message_part(this), message_privmsg(this), message_quit(this), message_stats(this), message_time(this),
 		message_away(this), message_capab(this), message_encap(this), message_endburst(this), message_fhost(this),
 		message_fident(this), message_fjoin(this), message_fmode(this), message_ftopic(this), message_idle(this),
 		message_ijoin(this), message_kick(this), message_metadata(this, use_server_side_topiclock, use_server_side_mlock, ircd_proto.maxlist),
 		message_mode(this), message_nick(this), message_opertype(this), message_ping(this), message_rsquit(this),
-		message_save(this), message_server(this), message_squit(this), message_time(this), message_uid(this)
+		message_save(this), message_server(this), message_squit(this), message_uid(this)
 	{
 	}
 

modules/protocol/unreal.cpp

@@ -537,7 +537,7 @@ namespace UnrealExtban
 			const Anope::string &mask = e->GetMask();
 			Anope::string real_mask = mask.substr(3);
 
-			return u->Account() && Anope::Match(u->Account()->display, real_mask);
+			return u->IsIdentified() && Anope::Match(u->Account()->display, real_mask);
 		}
 	};
 }

modules/protocol/unreal4.cpp

@@ -196,7 +196,7 @@ class UnrealIRCdProto : public IRCDProto
 	*/
 	void SendSQLine(User *, const XLine *x) anope_override
 	{
-		UplinkSocket::Message() << "SQLINE " << x->mask << " :" << x->GetReason();
+		UplinkSocket::Message() << "TKL + Q * " << x->mask << " " << x->by << " " << x->expires << " " << x->created << " :" << x->GetReason();
 	}
 
 	/* Functions that use serval cmd functions */
@@ -559,10 +559,10 @@ namespace UnrealExtban
 			const Anope::string &mask = e->GetMask();
 			Anope::string real_mask = mask.substr(3);
 
-			if (real_mask == "0" && !u->Account()) /* ~a:0 is special and matches all unauthenticated users */
+			if (real_mask == "0" && !u->IsIdentified()) /* ~a:0 is special and matches all unauthenticated users */
 				return true;
 
-			return u->Account() && Anope::Match(u->Account()->display, real_mask);
+			return u->IsIdentified() && Anope::Match(u->Account()->display, real_mask);
 		}
 	};
 

modules/pseudoclients/chanserv.cpp

@@ -378,8 +378,11 @@ class ChanServCore : public Module, public ChanServService
 		return EVENT_CONTINUE;
 	}
 
-	void OnPostInit() anope_override
+	void OnUplinkSync(Server* s) anope_override
 	{
+		// We need to do this when the uplink is synced as we may not know if
+		// the mode exists before then on some IRCds (e.g. InspIRCd).
+
 		if (!persist)
 			return;
 

modules/pseudoclients/memoserv.cpp

@@ -18,7 +18,7 @@ class MemoServCore : public Module, public MemoServService
 	bool SendMemoMail(NickCore *nc, MemoInfo *mi, Memo *m)
 	{
 		Anope::string subject = Language::Translate(nc, Config->GetBlock("mail")->Get<const Anope::string>("memo_subject").c_str()),
-			message = Language::Translate(Config->GetBlock("mail")->Get<const Anope::string>("memo_message").c_str());
+			message = Language::Translate(nc, Config->GetBlock("mail")->Get<const Anope::string>("memo_message").c_str());
 
 		subject = subject.replace_all_cs("%n", nc->display);
 		subject = subject.replace_all_cs("%s", m->sender);
@@ -100,7 +100,7 @@ class MemoServCore : public Module, public MemoServService
 
 					if (ci->AccessFor(cu->user).HasPriv("MEMO"))
 					{
-						if (cu->user->Account() && cu->user->Account()->HasExt("MEMO_RECEIVE"))
+						if (cu->user->IsIdentified() && cu->user->Account()->HasExt("MEMO_RECEIVE"))
 							cu->user->SendMessage(MemoServ, MEMO_NEW_X_MEMO_ARRIVED, ci->name.c_str(), Config->StrictPrivmsg.c_str(), MemoServ->nick.c_str(), ci->name.c_str(), mi->memos->size());
 					}
 				}

modules/pseudoclients/nickserv.cpp

@@ -399,7 +399,7 @@ class NickServCore : public Module, public NickServService
 		const NickAlias *na = NickAlias::Find(u->nick);
 
 		const Anope::string &unregistered_notice = Config->GetModule(this)->Get<const Anope::string>("unregistered_notice");
-		if (!Config->GetModule("nickserv")->Get<bool>("nonicknameownership") && !unregistered_notice.empty() && !na && !u->Account())
+		if (!Config->GetModule("nickserv")->Get<bool>("nonicknameownership") && !unregistered_notice.empty() && !na && !u->IsIdentified())
 			u->SendMessage(NickServ, unregistered_notice.replace_all_cs("%n", u->nick));
 		else if (na && !u->IsIdentified(true))
 			this->Validate(u);

modules/pseudoclients/operserv.cpp

@@ -126,6 +126,9 @@ class SQLineManager : public XLineManager
 		{
 			XLine *x = *it;
 
+			if (!Anope::NoExpire && x->expires && x->expires < Anope::CurTime)
+				continue; // Skip expired lines.
+
 			if (x->regex)
 			{
 				if (x->regex->Matches(c->name))

src/config.cpp

@@ -174,7 +174,6 @@ Conf::Conf() : Block("")
 	ValidateNotEmpty("serverinfo", "motd", serverinfo->Get<const Anope::string>("motd"));
 
 	ValidateNotZero("options", "readtimeout", options->Get<time_t>("readtimeout"));
-	ValidateNotZero("options", "warningtimeout", options->Get<time_t>("warningtimeout"));
 
 	ValidateNotZero("networkinfo", "nicklen", networkinfo->Get<unsigned>("nicklen"));
 	ValidateNotZero("networkinfo", "userlen", networkinfo->Get<unsigned>("userlen"));

src/init.cpp

@@ -329,7 +329,7 @@ void Anope::Init(int ac, char **av)
 		Log(LOG_TERMINAL) << "-v, --version";
 		Log(LOG_TERMINAL) << "";
 		Log(LOG_TERMINAL) << "Further support is available from https://www.anope.org/";
-		Log(LOG_TERMINAL) << "Or visit us on IRC at irc.anope.org #anope";
+		Log(LOG_TERMINAL) << "Or visit us on IRC at irc.teranova.net #anope";
 		throw CoreException();
 	}
 
@@ -482,7 +482,7 @@ void Anope::Init(int ac, char **av)
 		Log(LOG_TERMINAL) << "*** Support resources: Read through the services.conf self-contained";
 		Log(LOG_TERMINAL) << "*** documentation. Read the documentation files found in the 'docs'";
 		Log(LOG_TERMINAL) << "*** folder. Visit our portal located at https://www.anope.org/. Join";
-		Log(LOG_TERMINAL) << "*** our support channel on /server irc.anope.org channel #anope.";
+		Log(LOG_TERMINAL) << "*** our support channel on /server irc.teranova.net channel #anope.";
 		throw CoreException("Configuration file failed to validate");
 	}
 

src/language.cpp

@@ -62,7 +62,7 @@ const char *Language::Translate(const char *string)
 
 const char *Language::Translate(User *u, const char *string)
 {
-	if (u && u->Account())
+	if (u && u->IsIdentified())
 		return Translate(u->Account(), string);
 	else
 		return Translate("", string);

src/mail.cpp

@@ -48,7 +48,7 @@ void Mail::Message::Run()
 	if (this->dont_quote_addresses)
 		fprintf(pipe, "To: %s <%s>\r\n", mail_to.c_str(), addr.c_str());
 	else
-		fprintf(pipe, "To: \"%s\" <%s>\r\n", mail_to.c_str(), addr.c_str());
+		fprintf(pipe, "To: \"%s\" <%s>\r\n", mail_to.replace_all_cs("\\", "\\\\").c_str(), addr.c_str());
 	fprintf(pipe, "Subject: %s\r\n", subject.c_str());
 	fprintf(pipe, "Content-Type: %s\r\n", content_type.c_str());
 	fprintf(pipe, "Content-Transfer-Encoding: 8bit\r\n");

src/memos.cpp

@@ -114,7 +114,7 @@ void MemoInfo::Del(unsigned index)
 bool MemoInfo::HasIgnore(User *u)
 {
 	for (unsigned i = 0; i < this->ignores.size(); ++i)
-		if (u->nick.equals_ci(this->ignores[i]) || (u->Account() && u->Account()->display.equals_ci(this->ignores[i])) || Anope::Match(u->GetMask(), Anope::string(this->ignores[i])))
+		if (u->nick.equals_ci(this->ignores[i]) || (u->IsIdentified() && u->Account()->display.equals_ci(this->ignores[i])) || Anope::Match(u->GetMask(), Anope::string(this->ignores[i])))
 			return true;
 	return false;
 }

src/tools/geoipupdate.sh

@@ -24,8 +24,8 @@ die="yes"
 ###########################
 
 # The GeoIP data is created by MaxMind, available from www.maxmind.com.
-geoip_country_source="https://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip"
-geoip_city_source="https://geolite.maxmind.com/download/geoip/database/GeoLiteCity_CSV/GeoLiteCity-latest.zip"
+geoip_country_source="https://mirrors-cdn.liferay.com/geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip"
+geoip_city_source="https://mirrors-cdn.liferay.com/geolite.maxmind.com/download/geoip/database/GeoLiteCity-latest.tar.xz"
 geoip_region_source="https://www.maxmind.com/download/geoip/misc/region_codes.csv"
 
 ###########################
@@ -65,17 +65,17 @@ elif test $geoip_database = "city"; then
 	download "$geoip_city_source" "City Database:"
 	download "$geoip_region_source" "Region Database:"
 	echo "Unpacking..."
-	unzip -jo GeoLiteCity-latest.zip
-	rm GeoLiteCity-latest.zip
+	tar -xf GeoLiteCity-latest.tar.xz --strip-components 1
+	rm GeoLiteCity-latest.tar.xz
 	echo "Converting to utf-8..."
 	iconv -f ISO-8859-1 -t UTF-8 GeoLiteCity-Blocks.csv -o $prefix"geoip_city_blocks.csv"
 	iconv -f ISO-8859-1 -t UTF-8 GeoLiteCity-Location.csv -o $prefix"geoip_city_location.csv"
-	iconv -f ISO-8859-1 -t UTF-8 region.csv -o $prefix"geoip_city_region.csv"
-	rm GeoLiteCity-Blocks.csv GeoLiteCity-Location.csv region.csv
+	iconv -f ISO-8859-1 -t UTF-8 region_codes.csv -o $prefix"geoip_city_region.csv"
+	rm GeoLiteCity-Blocks.csv GeoLiteCity-Location.csv region_codes.csv
 	echo "Importing..."
 	mysqlimport --columns=start,end,locID --ignore-lines=2 $PARAMS $prefix"geoip_city_blocks.csv"
 	mysqlimport --columns=locID,country,region,city,@x,latitude,longitude,@x,areaCode --ignore-lines=2 $PARAMS $prefix"geoip_city_location.csv"
 	mysqlimport --columns=country,region,regionname $PARAMS $prefix"geoip_city_region.csv"
-	rm $prefix"geoip_city_blocks.csv" $prefix"geoip_city_location.csv" $prefix"geoip_city_region.csv" $prefix"geoip_country6.csv"
+	rm $prefix"geoip_city_blocks.csv" $prefix"geoip_city_location.csv" $prefix"geoip_city_region.csv"
 	echo "Done..."
 fi

src/version.sh

@@ -2,5 +2,5 @@
 
 VERSION_MAJOR=2
 VERSION_MINOR=0
-VERSION_PATCH=16
-VERSION_EXTRA="-git"
+VERSION_PATCH=17
+VERSION_EXTRA=""