Merge branch 'insp3' into master.

25 files changed, 30 insertions, 27 deletions

diff --git a/configure b/configure
index 3b5f7a989..46c8322d8 100755
--- a/configure
+++ b/configure
@@ -5,7 +5,7 @@
 #   Copyright (C) 2020 Nicole Kleinhoff <ilbelkyr@shalture.org>
 #   Copyright (C) 2020 Daniel Vassdal <shutter@canternet.org>
 #   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
-#   Copyright (C) 2013-2021 Sadie Powell <sadie@witchery.services>
+#   Copyright (C) 2013-2022 Sadie Powell <sadie@witchery.services>
 #   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
 #   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
 #   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
diff --git a/include/clientprotocol.h b/include/clientprotocol.h
index 5aab4b0a3..83b1aa907 100644
--- a/include/clientprotocol.h
+++ b/include/clientprotocol.h
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018-2020, 2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2018 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -700,7 +700,7 @@ public:
 	 * @param mod Module owning the serializer.
 	 * @param Name Name of the serializer, e.g. "rfc".
 	 */
-	Serializer(Module* mod, const char* Name);
+	Serializer(Module* mod, const std::string& Name);
 
 	/** Handle a tag in a message being parsed. Call this method for each parsed tag.
 	 * @param user User sending the tag.
diff --git a/include/flat_map.h b/include/flat_map.h
index 7a5aa4805..ec959fca3 100644
--- a/include/flat_map.h
+++ b/include/flat_map.h
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2019-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2019-2020, 2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/include/intrusive_list_impl.h b/include/intrusive_list_impl.h
index d8dff536c..f04d13c9a 100644
--- a/include/intrusive_list_impl.h
+++ b/include/intrusive_list_impl.h
@@ -1,6 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/include/moduledefs.h b/include/moduledefs.h
index 23eb90684..57492e732 100644
--- a/include/moduledefs.h
+++ b/include/moduledefs.h
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2020-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2020, 2022 Sadie Powell <sadie@witchery.services>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
diff --git a/include/users.h b/include/users.h
index ce885e0e9..91851f3c8 100644
--- a/include/users.h
+++ b/include/users.h
@@ -5,7 +5,7 @@
  *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
  *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
  *   Copyright (C) 2012-2016, 2018 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2012-2013, 2016-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2013, 2016-2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012 DjSlash <djslash@djslash.org>
  *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
diff --git a/make/template/inspircd-testssl.1 b/make/template/inspircd-testssl.1
index 4138c0e74..c9125ac47 100644
--- a/make/template/inspircd-testssl.1
+++ b/make/template/inspircd-testssl.1
@@ -1,7 +1,7 @@
 .\"
 .\" InspIRCd -- Internet Relay Chat Daemon
 .\"
-.\"   Copyright (C) 2020 Sadie Powell <sadie@witchery.services>
+.\"   Copyright (C) 2020, 2022 Sadie Powell <sadie@witchery.services>
 .\"
 .\" This file is part of InspIRCd.  InspIRCd is free software: you can
 .\" redistribute it and/or modify it under the terms of the GNU General Public
@@ -17,7 +17,7 @@
 .\"
 
 
-.TH "InspIRCd" "1" "June 2020" "InspIRCd @VERSION_FULL@" "InspIRCd Manual"
+.TH "InspIRCd" "1" "2020-06-16" "InspIRCd @VERSION_FULL@" "InspIRCd Manual"
 
 .SH "NAME"
 \t\fBInspIRCd\fR - \fIthe\fR stable, high-performance and modular Internet Relay Chat Daemon
diff --git a/make/template/inspircd.1 b/make/template/inspircd.1
index 4aac14701..076823fbe 100644
--- a/make/template/inspircd.1
+++ b/make/template/inspircd.1
@@ -1,7 +1,7 @@
 .\"
 .\" InspIRCd -- Internet Relay Chat Daemon
 .\"
-.\"   Copyright (C) 2014, 2016, 2018 Sadie Powell <sadie@witchery.services>
+.\"   Copyright (C) 2014, 2018, 2022 Sadie Powell <sadie@witchery.services>
 .\"
 .\" This file is part of InspIRCd.  InspIRCd is free software: you can
 .\" redistribute it and/or modify it under the terms of the GNU General Public
@@ -17,7 +17,7 @@
 .\"
 
 
-.TH "InspIRCd" "1" "June 2014" "InspIRCd @VERSION_FULL@" "InspIRCd Manual"
+.TH "InspIRCd" "1" 2018-08-24" "InspIRCd @VERSION_FULL@" "InspIRCd Manual"
 
 .SH "NAME"
 \t\fBInspIRCd\fR - \fIthe\fR stable, high-performance and modular Internet Relay Chat Daemon
diff --git a/make/template/logrotate b/make/template/logrotate
index ccef31fbe..65cb4c8d7 100644
--- a/make/template/logrotate
+++ b/make/template/logrotate
@@ -1,6 +1,7 @@
 #
 # InspIRCd -- Internet Relay Chat Daemon
 #
+#   Copyright (C) 2022 Wade Cline <wadecline@hotmail.com>
 #   Copyright (C) 2020 Sadie Powell <sadie@witchery.services>
 #
 # This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/src/clientprotocol.cpp b/src/clientprotocol.cpp
index 00f2cbc4c..91317640c 100644
--- a/src/clientprotocol.cpp
+++ b/src/clientprotocol.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018-2020, 2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2018 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -20,8 +20,8 @@
 
 #include "inspircd.h"
 
-ClientProtocol::Serializer::Serializer(Module* mod, const char* Name)
-	: DataProvider(mod, std::string("serializer/") + Name)
+ClientProtocol::Serializer::Serializer(Module* mod, const std::string& Name)
+	: DataProvider(mod, "serializer/" + Name)
 	, evprov(mod)
 {
 }
diff --git a/src/coremods/core_mode.cpp b/src/coremods/core_mode.cpp
index 048f2845d..6fc377707 100644
--- a/src/coremods/core_mode.cpp
+++ b/src/coremods/core_mode.cpp
@@ -3,7 +3,7 @@
  *
  *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
  *   Copyright (C) 2019 Robby <robby@chatbelgie.be>
- *   Copyright (C) 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018-2020, 2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
  *   Copyright (C) 2014-2016 Attila Molnar <attilamolnar@hush.com>
  *
diff --git a/src/coremods/core_oper/cmd_restart.cpp b/src/coremods/core_oper/cmd_restart.cpp
index 88f43d505..72bcd1620 100644
--- a/src/coremods/core_oper/cmd_restart.cpp
+++ b/src/coremods/core_oper/cmd_restart.cpp
@@ -1,8 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2018, 2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
- *   Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2017 Jordyn/The Linux Geek <onlinecloud1@gmail.com>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012, 2014-2016 Attila Molnar <attilamolnar@hush.com>
diff --git a/src/coremods/core_user/cmd_userhost.cpp b/src/coremods/core_user/cmd_userhost.cpp
index 9ae0fd3c2..0ebc6d635 100644
--- a/src/coremods/core_user/cmd_userhost.cpp
+++ b/src/coremods/core_user/cmd_userhost.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017-2019, 2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index f3d998f2f..9e40e70e1 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -4,7 +4,7 @@
  *   Copyright (C) 2021 Val Lorentz <progval+git@progval.net>
  *   Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2018 Chris Novakovic
- *   Copyright (C) 2013, 2017-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2017-2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013 Adam <Adam@anope.org>
  *   Copyright (C) 2012-2014, 2016, 2018 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012-2013 ChrisTX <xpipe@hotmail.de>
diff --git a/src/modules/extra/m_argon2.cpp b/src/modules/extra/m_argon2.cpp
index d15fcf9bd..57e2d895d 100644
--- a/src/modules/extra/m_argon2.cpp
+++ b/src/modules/extra/m_argon2.cpp
@@ -1,6 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2020 Elizabeth Myers <elizabeth@interlinked.me>
  *   Copyright (C) 2020 Daniel Vassdal <shutter@canternet.org>
  *
diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp
index 2b4b34bc5..d0ad7ab2c 100644
--- a/src/modules/extra/m_ssl_mbedtls.cpp
+++ b/src/modules/extra/m_ssl_mbedtls.cpp
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
- *   Copyright (C) 2016-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2016-2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2016-2017 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index 461cd685c..8fe7bfccc 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2018, 2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index de307f2d0..5f5ff5588 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013, 2018-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2018-2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2013 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp
index c668a9368..9120cde9a 100644
--- a/src/modules/m_repeat.cpp
+++ b/src/modules/m_repeat.cpp
@@ -6,7 +6,7 @@
  *   Copyright (C) 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2018-2019 linuxdaemon <linuxdaemon.irc@gmail.com>
  *   Copyright (C) 2018 Matt Schatz <genius3000@g3k.solutions>
- *   Copyright (C) 2017-2019, 2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017-2019, 2021-2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2015 James Lu <GLolol@overdrivenetworks.com>
  *   Copyright (C) 2013-2015 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 12939718f..19717300c 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
- *   Copyright (C) 2013, 2017-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2017-2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2015 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012 Shawn Smith <ShawnSmith0828@gmail.com>
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 798df840f..1d90053b1 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013-2014, 2017-2019, 2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014, 2017-2019, 2021-2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013 Adam <Adam@anope.org>
  *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
diff --git a/src/modules/m_websocket.cpp b/src/modules/m_websocket.cpp
index f9363f998..24994211f 100644
--- a/src/modules/m_websocket.cpp
+++ b/src/modules/m_websocket.cpp
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2019 iwalkalone <iwalkalone69@gmail.com>
- *   Copyright (C) 2017-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017-2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2016-2017 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/src/server.cpp b/src/server.cpp
index 0aafc483e..95031b6ac 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -3,7 +3,7 @@
  *
  *   Copyright (C) 2019 nia <nia@netbsd.org>
  *   Copyright (C) 2013-2014, 2016 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2013, 2016-2017, 2020-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2016-2017, 2020-2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013 Adam <Adam@anope.org>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index 772d091e3..d83475379 100644
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017-2020, 2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013-2014 Adam <Adam@anope.org>
  *   Copyright (C) 2012, 2014-2015 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 653be4f50..689caa7b6 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -4,7 +4,7 @@
  *   Copyright (C) 2019 iwalkalone <iwalkalone69@gmail.com>
  *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2013-2016, 2018 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2013, 2018-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2018-2020, 2022 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013, 2015 Adam <Adam@anope.org>
  *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>