From 9306d5474d0acc010e11b4cb4632e3341d659367 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 28 Dec 2021 13:53:57 +0000 Subject: Add support for forwarding a password from the second nick param. --- src/modules/m_passforward.cpp | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'src/modules/m_passforward.cpp') diff --git a/src/modules/m_passforward.cpp b/src/modules/m_passforward.cpp index e373068b8..04bf2c701 100644 --- a/src/modules/m_passforward.cpp +++ b/src/modules/m_passforward.cpp @@ -33,18 +33,18 @@ class ModulePassForward : public Module public: Version GetVersion() CXX11_OVERRIDE { - return Version("Allows the /PASS password to be forwarded to a services pseudoclient such as NickServ.", VF_VENDOR); + return Version("Allows an account password to be forwarded to a services pseudoclient such as NickServ.", VF_VENDOR); } void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { ConfigTag* tag = ServerInstance->Config->ConfValue("passforward"); nickrequired = tag->getString("nick", "NickServ"); - forwardmsg = tag->getString("forwardmsg", "NOTICE $nick :*** Forwarding PASS to $nickrequired"); + forwardmsg = tag->getString("forwardmsg", "NOTICE $nick :*** Forwarding password to $nickrequired"); forwardcmd = tag->getString("cmd", "SQUERY $nickrequired :IDENTIFY $pass", 1); } - void FormatStr(std::string& result, const std::string& format, const LocalUser* user) + void FormatStr(const LocalUser* user, const std::string& format, const std::string& pass, std::string& result) { for (unsigned int i = 0; i < format.length(); i++) { @@ -68,7 +68,7 @@ class ModulePassForward : public Module } else if (!format.compare(i, 5, "$pass", 5)) { - result.append(user->password); + result.append(pass); i += 4; } else @@ -96,6 +96,17 @@ class ModulePassForward : public Module return; } + ForwardPass(user, user->password); + } + + void OnPostCommand(Command* command, const CommandBase::Params& parameters, LocalUser* user, CmdResult result, bool loop) CXX11_OVERRIDE + { + if (command->name == "NICK" && parameters.size() > 1) + ForwardPass(user, parameters[1]); + } + + void ForwardPass(LocalUser* user, const std::string& pass) + { if (!nickrequired.empty()) { /* Check if nick exists and its server is ulined */ @@ -107,12 +118,12 @@ class ModulePassForward : public Module std::string tmp; if (!forwardmsg.empty()) { - FormatStr(tmp, forwardmsg, user); + FormatStr(user, forwardmsg, pass, tmp); ServerInstance->Parser.ProcessBuffer(user, tmp); tmp.clear(); } - FormatStr(tmp, forwardcmd, user); + FormatStr(user, forwardcmd, pass, tmp); ServerInstance->Parser.ProcessBuffer(user, tmp); } }; -- cgit v1.3.1-10-gc9f91 From adbe149c56bc938aa5d2454e4a4f9cc9d68efa68 Mon Sep 17 00:00:00 2001 From: InspIRCd Robot Date: Thu, 30 Dec 2021 18:52:08 +0000 Subject: Update copyright headers. --- include/configreader.h | 2 +- include/iohook.h | 1 + include/modules/account.h | 2 +- include/modules/ircv3.h | 2 +- include/server.h | 2 +- include/token_list.h | 2 +- include/typedefs.h | 2 +- src/coremods/core_channel/cmd_kick.cpp | 2 +- src/coremods/core_hostname_lookup.cpp | 1 - src/coremods/core_info/core_info.cpp | 2 +- src/coremods/core_user/cmd_nick.cpp | 2 +- src/coremods/core_xline/cmd_eline.cpp | 2 +- src/coremods/core_xline/cmd_gline.cpp | 2 +- src/coremods/core_xline/cmd_kline.cpp | 2 +- src/inspircd.cpp | 2 +- src/modules/extra/m_ldap.cpp | 2 +- src/modules/m_banredirect.cpp | 4 ++-- src/modules/m_classban.cpp | 2 +- src/modules/m_clearchan.cpp | 2 +- src/modules/m_customprefix.cpp | 2 +- src/modules/m_dccallow.cpp | 2 +- src/modules/m_haproxy.cpp | 2 +- src/modules/m_httpd_stats.cpp | 4 ++-- src/modules/m_ircv3_accounttag.cpp | 2 +- src/modules/m_kicknorejoin.cpp | 2 +- src/modules/m_ldapoper.cpp | 2 +- src/modules/m_messageflood.cpp | 2 +- src/modules/m_nokicks.cpp | 2 +- src/modules/m_override.cpp | 4 ++-- src/modules/m_passforward.cpp | 2 +- src/modules/m_repeat.cpp | 3 ++- src/modules/m_sajoin.cpp | 2 +- src/modules/m_serverban.cpp | 2 +- src/modules/m_shun.cpp | 3 ++- src/modules/m_spanningtree/main.h | 2 +- src/modules/m_spanningtree/resolvers.cpp | 2 +- src/modules/m_spanningtree/resolvers.h | 2 +- src/modules/m_sqlauth.cpp | 2 +- src/modules/m_sslinfo.cpp | 2 +- src/modules/m_starttls.cpp | 4 ++-- src/serializable.cpp | 2 +- src/server.cpp | 2 +- src/socketengine.cpp | 2 +- src/users.cpp | 1 - win/inspircd_win32wrapper.h | 2 +- 45 files changed, 49 insertions(+), 48 deletions(-) (limited to 'src/modules/m_passforward.cpp') diff --git a/include/configreader.h b/include/configreader.h index 91b7603d7..e8fce3313 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2019 Matt Schatz - * Copyright (C) 2018 Chris Novakovic + * Copyright (C) 2018 Chris Novakovic * Copyright (C) 2013-2014, 2016 Attila Molnar * Copyright (C) 2013 Daniel Vassdal * Copyright (C) 2012-2014, 2016-2021 Sadie Powell diff --git a/include/iohook.h b/include/iohook.h index b2d3c06a0..43d2953f0 100644 --- a/include/iohook.h +++ b/include/iohook.h @@ -1,6 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2021 Sadie Powell * Copyright (C) 2019 Robby * Copyright (C) 2013, 2016-2017 Attila Molnar * diff --git a/include/modules/account.h b/include/modules/account.h index 3ec01b3e8..a5f58576f 100644 --- a/include/modules/account.h +++ b/include/modules/account.h @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2015 Attila Molnar - * Copyright (C) 2013 Sadie Powell + * Copyright (C) 2013, 2020 Sadie Powell * Copyright (C) 2012 Robby * Copyright (C) 2009-2010 Daniel De Graaf * Copyright (C) 2009 Uli Schlachter diff --git a/include/modules/ircv3.h b/include/modules/ircv3.h index 577cb1841..59b614007 100644 --- a/include/modules/ircv3.h +++ b/include/modules/ircv3.h @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2018-2019, 2021 Sadie Powell + * Copyright (C) 2018-2021 Sadie Powell * Copyright (C) 2015, 2018 Attila Molnar * * This file is part of InspIRCd. InspIRCd is free software: you can diff --git a/include/server.h b/include/server.h index d8c81d99b..5e3110bb0 100644 --- a/include/server.h +++ b/include/server.h @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2019-2020 Sadie Powell + * Copyright (C) 2019-2021 Sadie Powell * Copyright (C) 2018 Matt Schatz * Copyright (C) 2014 Attila Molnar * diff --git a/include/token_list.h b/include/token_list.h index 9e4e9a1b9..c8e587e65 100644 --- a/include/token_list.h +++ b/include/token_list.h @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2017 Sadie Powell + * Copyright (C) 2017, 2021 Sadie Powell * * 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/typedefs.h b/include/typedefs.h index 063ee23cb..f821edf9f 100644 --- a/include/typedefs.h +++ b/include/typedefs.h @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2013, 2016, 2018, 2020 Sadie Powell + * Copyright (C) 2013, 2016, 2018, 2020-2021 Sadie Powell * Copyright (C) 2012-2014, 2016, 2018 Attila Molnar * Copyright (C) 2012 Robby * Copyright (C) 2009-2010 Daniel De Graaf diff --git a/src/coremods/core_channel/cmd_kick.cpp b/src/coremods/core_channel/cmd_kick.cpp index 421f0566c..477c6fe25 100644 --- a/src/coremods/core_channel/cmd_kick.cpp +++ b/src/coremods/core_channel/cmd_kick.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2017-2018 Sadie Powell + * Copyright (C) 2017-2018, 2021 Sadie Powell * Copyright (C) 2017 B00mX0r * Copyright (C) 2013-2014, 2016 Attila Molnar * Copyright (C) 2012, 2019 Robby diff --git a/src/coremods/core_hostname_lookup.cpp b/src/coremods/core_hostname_lookup.cpp index d0f1786f2..cf7d22716 100644 --- a/src/coremods/core_hostname_lookup.cpp +++ b/src/coremods/core_hostname_lookup.cpp @@ -1,7 +1,6 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2020 Matt Schatz * Copyright (C) 2013, 2017-2021 Sadie Powell * Copyright (C) 2013, 2016 Adam * Copyright (C) 2013, 2015 Attila Molnar diff --git a/src/coremods/core_info/core_info.cpp b/src/coremods/core_info/core_info.cpp index 810717cd5..0805c21ae 100644 --- a/src/coremods/core_info/core_info.cpp +++ b/src/coremods/core_info/core_info.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2018, 2020 Sadie Powell + * Copyright (C) 2018, 2020-2021 Sadie Powell * Copyright (C) 2018 linuxdaemon * Copyright (C) 2014, 2016, 2018 Attila Molnar * diff --git a/src/coremods/core_user/cmd_nick.cpp b/src/coremods/core_user/cmd_nick.cpp index 3848a38b9..bac1f1f26 100644 --- a/src/coremods/core_user/cmd_nick.cpp +++ b/src/coremods/core_user/cmd_nick.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2017 B00mX0r * Copyright (C) 2014, 2016 Attila Molnar - * Copyright (C) 2013, 2016, 2018 Sadie Powell + * Copyright (C) 2013, 2016, 2018, 2021 Sadie Powell * Copyright (C) 2012 Robby * Copyright (C) 2009-2010 Daniel De Graaf * Copyright (C) 2009 Uli Schlachter diff --git a/src/coremods/core_xline/cmd_eline.cpp b/src/coremods/core_xline/cmd_eline.cpp index 13ed8a685..cf0a38f80 100644 --- a/src/coremods/core_xline/cmd_eline.cpp +++ b/src/coremods/core_xline/cmd_eline.cpp @@ -2,8 +2,8 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2019 Matt Schatz + * Copyright (C) 2018, 2021 Sadie Powell * Copyright (C) 2018 linuxdaemon - * Copyright (C) 2018 Sadie Powell * Copyright (C) 2012, 2019 Robby * Copyright (C) 2012, 2014 Attila Molnar * Copyright (C) 2009 Daniel De Graaf diff --git a/src/coremods/core_xline/cmd_gline.cpp b/src/coremods/core_xline/cmd_gline.cpp index 16b7abbf4..11cf5acc4 100644 --- a/src/coremods/core_xline/cmd_gline.cpp +++ b/src/coremods/core_xline/cmd_gline.cpp @@ -2,8 +2,8 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2019 Matt Schatz + * Copyright (C) 2018, 2021 Sadie Powell * Copyright (C) 2018 linuxdaemon - * Copyright (C) 2018 Sadie Powell * Copyright (C) 2012, 2019 Robby * Copyright (C) 2012, 2014 Attila Molnar * Copyright (C) 2009 Uli Schlachter diff --git a/src/coremods/core_xline/cmd_kline.cpp b/src/coremods/core_xline/cmd_kline.cpp index 62538e481..1af4ee38f 100644 --- a/src/coremods/core_xline/cmd_kline.cpp +++ b/src/coremods/core_xline/cmd_kline.cpp @@ -2,8 +2,8 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2019 Matt Schatz + * Copyright (C) 2018, 2021 Sadie Powell * Copyright (C) 2018 linuxdaemon - * Copyright (C) 2018 Sadie Powell * Copyright (C) 2012, 2019 Robby * Copyright (C) 2012, 2014 Attila Molnar * Copyright (C) 2009 Uli Schlachter diff --git a/src/inspircd.cpp b/src/inspircd.cpp index f7ab3b902..4e4f8caeb 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2021 Valentin Lorentz * Copyright (C) 2020 Matt Schatz - * Copyright (C) 2018 Chris Novakovic + * Copyright (C) 2018 Chris Novakovic * Copyright (C) 2013, 2017-2021 Sadie Powell * Copyright (C) 2013 Adam * Copyright (C) 2012-2014, 2016, 2018 Attila Molnar diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp index 8aea323a3..1251ca3dd 100644 --- a/src/modules/extra/m_ldap.cpp +++ b/src/modules/extra/m_ldap.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2020 Joel Sing * Copyright (C) 2019 linuxdaemon - * Copyright (C) 2016-2020 Sadie Powell + * Copyright (C) 2016-2021 Sadie Powell * Copyright (C) 2014, 2016 Attila Molnar * Copyright (C) 2013-2016 Adam * diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index 481059e59..57de6fa01 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -3,8 +3,8 @@ * * Copyright (C) 2018 linuxdaemon * Copyright (C) 2014 Adam - * Copyright (C) 2013-2016 Attila Molnar - * Copyright (C) 2013, 2017-2018 Sadie Powell + * Copyright (C) 2013-2014, 2016 Attila Molnar + * Copyright (C) 2013, 2017-2018, 2021 Sadie Powell * Copyright (C) 2013 Daniel Vassdal * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009-2010 Daniel De Graaf diff --git a/src/modules/m_classban.cpp b/src/modules/m_classban.cpp index 26dcca1ee..fbfac594c 100644 --- a/src/modules/m_classban.cpp +++ b/src/modules/m_classban.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2020-2021 Sadie Powell - * Copyright (C) 2016 Johanna A + * Copyright (C) 2016 Johanna A * * 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/src/modules/m_clearchan.cpp b/src/modules/m_clearchan.cpp index fba493960..2e4feb5d9 100644 --- a/src/modules/m_clearchan.cpp +++ b/src/modules/m_clearchan.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2019 Robby - * Copyright (C) 2017-2018 Sadie Powell + * Copyright (C) 2017-2018, 2021 Sadie Powell * Copyright (C) 2014, 2016 Attila Molnar * * This file is part of InspIRCd. InspIRCd is free software: you can diff --git a/src/modules/m_customprefix.cpp b/src/modules/m_customprefix.cpp index b71fd47b4..2c364a9b1 100644 --- a/src/modules/m_customprefix.cpp +++ b/src/modules/m_customprefix.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2013-2014 Attila Molnar - * Copyright (C) 2013, 2017-2018 Sadie Powell + * Copyright (C) 2013, 2017-2018, 2021 Sadie Powell * Copyright (C) 2012, 2019 Robby * Copyright (C) 2010 Daniel De Graaf * diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp index 007f0efef..937278768 100644 --- a/src/modules/m_dccallow.cpp +++ b/src/modules/m_dccallow.cpp @@ -13,7 +13,7 @@ * Copyright (C) 2008 John Brooks * Copyright (C) 2007-2008 Robin Burchell * Copyright (C) 2007-2008 Dennis Friis - * Copyright (C) 2006 jamie + * Copyright (C) 2006 jamie * * 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/src/modules/m_haproxy.cpp b/src/modules/m_haproxy.cpp index d50d1ff09..509a00ede 100644 --- a/src/modules/m_haproxy.cpp +++ b/src/modules/m_haproxy.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2019-2020 Matt Schatz * Copyright (C) 2019 linuxdaemon - * Copyright (C) 2018-2019 Sadie Powell + * Copyright (C) 2018-2019, 2021 Sadie Powell * * 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/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index 9c6454c5a..1c8b80dbe 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2021 Herman * Copyright (C) 2019 linuxdaemon * Copyright (C) 2018 Matt Schatz - * Copyright (C) 2016 Johanna A + * Copyright (C) 2016 Johanna A * Copyright (C) 2013-2016 Attila Molnar - * Copyright (C) 2013, 2017, 2019-2020 Sadie Powell + * Copyright (C) 2013, 2017, 2019-2021 Sadie Powell * Copyright (C) 2012 Robby * Copyright (C) 2009 Uli Schlachter * Copyright (C) 2009 Daniel De Graaf diff --git a/src/modules/m_ircv3_accounttag.cpp b/src/modules/m_ircv3_accounttag.cpp index 6201ee267..f0ce48077 100644 --- a/src/modules/m_ircv3_accounttag.cpp +++ b/src/modules/m_ircv3_accounttag.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2018 Sadie Powell + * Copyright (C) 2018, 2020 Sadie Powell * Copyright (C) 2018 Attila Molnar * * This file is part of InspIRCd. InspIRCd is free software: you can diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index e14530a92..2b0970d29 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2018 A_D + * Copyright (C) 2018 A_D * Copyright (C) 2014 Daniel Vassdal * Copyright (C) 2013, 2017-2020 Sadie Powell * Copyright (C) 2012-2015 Attila Molnar diff --git a/src/modules/m_ldapoper.cpp b/src/modules/m_ldapoper.cpp index 4304ad8d5..8827c2ad3 100644 --- a/src/modules/m_ldapoper.cpp +++ b/src/modules/m_ldapoper.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2020 Christos Triantafyllidis + * Copyright (C) 2020 Christos Triantafyllidis * Copyright (C) 2018-2020 Sadie Powell * Copyright (C) 2014, 2018 Attila Molnar * Copyright (C) 2013-2014 Adam diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp index 5db1e1e9d..cdd61871f 100644 --- a/src/modules/m_messageflood.cpp +++ b/src/modules/m_messageflood.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2013, 2017-2019 Sadie Powell + * Copyright (C) 2013, 2017-2019, 2021 Sadie Powell * Copyright (C) 2012-2014, 2016 Attila Molnar * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009 Daniel De Graaf diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp index 7f5f21d64..1c829bcf9 100644 --- a/src/modules/m_nokicks.cpp +++ b/src/modules/m_nokicks.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2019 Matt Schatz - * Copyright (C) 2013, 2017 Sadie Powell + * Copyright (C) 2013, 2017, 2021 Sadie Powell * Copyright (C) 2012, 2019 Robby * Copyright (C) 2012 Attila Molnar * Copyright (C) 2009-2010 Daniel De Graaf diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index f5408b8a2..c75b022e3 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -2,11 +2,11 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2021 Herman - * Copyright (C) 2020 satmd + * Copyright (C) 2020 satmd * Copyright (C) 2017 B00mX0r * Copyright (C) 2017 Adam * Copyright (C) 2016 Sheogorath - * Copyright (C) 2013, 2017, 2020 Sadie Powell + * Copyright (C) 2013, 2017, 2020-2021 Sadie Powell * Copyright (C) 2013 Daniel Vassdal * Copyright (C) 2012-2015 Attila Molnar * Copyright (C) 2012 Shawn Smith diff --git a/src/modules/m_passforward.cpp b/src/modules/m_passforward.cpp index 04bf2c701..7ac5d1e93 100644 --- a/src/modules/m_passforward.cpp +++ b/src/modules/m_passforward.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2019 linuxdaemon * Copyright (C) 2014 Googolplexed - * Copyright (C) 2013, 2018, 2020 Sadie Powell + * Copyright (C) 2013, 2018, 2020-2021 Sadie Powell * Copyright (C) 2012-2014 Attila Molnar * Copyright (C) 2012 Robby * Copyright (C) 2012 Boleslaw Tokarski diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp index c432ae57e..d341080d2 100644 --- a/src/modules/m_repeat.cpp +++ b/src/modules/m_repeat.cpp @@ -2,10 +2,11 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2021 iwalkalone + * Copyright (C) 2021 David Schultz * Copyright (C) 2019 Robby * Copyright (C) 2018-2019 linuxdaemon * Copyright (C) 2018 Matt Schatz - * Copyright (C) 2017-2019 Sadie Powell + * Copyright (C) 2017-2019, 2021 Sadie Powell * Copyright (C) 2015 James Lu * Copyright (C) 2013-2015 Attila Molnar * Copyright (C) 2013 Daniel Vassdal diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp index 885597bc5..89e1a2fae 100644 --- a/src/modules/m_sajoin.cpp +++ b/src/modules/m_sajoin.cpp @@ -7,7 +7,7 @@ * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009 Daniel De Graaf * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2006 jamie + * Copyright (C) 2006 jamie * Copyright (C) 2005, 2007 Robin Burchell * Copyright (C) 2004, 2007, 2010 Craig Edwards * diff --git a/src/modules/m_serverban.cpp b/src/modules/m_serverban.cpp index b94a22cca..686a38702 100644 --- a/src/modules/m_serverban.cpp +++ b/src/modules/m_serverban.cpp @@ -2,8 +2,8 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2013, 2021 Sadie Powell - * Copyright (C) 2012, 2014 Attila Molnar * Copyright (C) 2012 Robby + * Copyright (C) 2012 Attila Molnar * Copyright (C) 2010 Craig Edwards * Copyright (C) 2009 Uli Schlachter * Copyright (C) 2009 Daniel De Graaf diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index 89e71e4ca..96329f4f4 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -3,12 +3,13 @@ * * Copyright (C) 2019 Matt Schatz * Copyright (C) 2018 linuxdaemon - * Copyright (C) 2017-2018 B00mX0r + * Copyright (C) 2017 B00mX0r * Copyright (C) 2013, 2017-2018, 2020-2021 Sadie Powell * Copyright (C) 2012-2013, 2015-2016 Attila Molnar * Copyright (C) 2012, 2019 Robby * Copyright (C) 2012 Jens Voss * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 John Brooks * Copyright (C) 2009 Dennis Friis * Copyright (C) 2009 Daniel De Graaf * Copyright (C) 2008-2010 Craig Edwards diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h index 7e8ce3af6..f1c4149d7 100644 --- a/src/modules/m_spanningtree/main.h +++ b/src/modules/m_spanningtree/main.h @@ -3,7 +3,7 @@ * * Copyright (C) 2019 linuxdaemon * Copyright (C) 2013-2016, 2018 Attila Molnar - * Copyright (C) 2013, 2017-2020 Sadie Powell + * Copyright (C) 2013, 2017-2021 Sadie Powell * Copyright (C) 2013 Adam * Copyright (C) 2012 Robby * Copyright (C) 2009-2010 Daniel De Graaf diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp index a339c7756..aa94073bc 100644 --- a/src/modules/m_spanningtree/resolvers.cpp +++ b/src/modules/m_spanningtree/resolvers.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2013, 2019-2020 Sadie Powell + * Copyright (C) 2019-2021 Sadie Powell * Copyright (C) 2013, 2016 Adam * Copyright (C) 2012-2014, 2016 Attila Molnar * Copyright (C) 2012 Robby diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h index 0fdc5c77a..59e8cc631 100644 --- a/src/modules/m_spanningtree/resolvers.h +++ b/src/modules/m_spanningtree/resolvers.h @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2013 Sadie Powell + * Copyright (C) 2013, 2021 Sadie Powell * Copyright (C) 2013 Attila Molnar * Copyright (C) 2013 Adam * Copyright (C) 2012 Robby diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp index ec3885d89..1e2feeb7b 100644 --- a/src/modules/m_sqlauth.cpp +++ b/src/modules/m_sqlauth.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2015 Daniel Vassdal - * Copyright (C) 2013, 2017-2019 Sadie Powell + * Copyright (C) 2013, 2017-2019, 2021 Sadie Powell * Copyright (C) 2012-2015 Attila Molnar * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009-2010 Daniel De Graaf diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp index 0fae5d821..5f19e8610 100644 --- a/src/modules/m_sslinfo.cpp +++ b/src/modules/m_sslinfo.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2021 Molly Miller + * Copyright (C) 2021 Molly Miller * Copyright (C) 2020 Matt Schatz * Copyright (C) 2019 linuxdaemon * Copyright (C) 2013, 2017-2021 Sadie Powell diff --git a/src/modules/m_starttls.cpp b/src/modules/m_starttls.cpp index d73fb4e6d..48efef892 100644 --- a/src/modules/m_starttls.cpp +++ b/src/modules/m_starttls.cpp @@ -3,9 +3,9 @@ * * Copyright (C) 2020 Matt Schatz * Copyright (C) 2019 Robby - * Copyright (C) 2018 Sadie Powell + * Copyright (C) 2018, 2021 Sadie Powell * Copyright (C) 2014 Adam - * Copyright (C) 2013, 2015-2016 Attila Molnar + * Copyright (C) 2013, 2016 Attila Molnar * * 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/src/serializable.cpp b/src/serializable.cpp index 13d94ef29..6bc1a7299 100644 --- a/src/serializable.cpp +++ b/src/serializable.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2019 Sadie Powell + * Copyright (C) 2019, 2021 Sadie Powell * * 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/src/server.cpp b/src/server.cpp index 46e7d6567..46ed9e9ff 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2019 nia * Copyright (C) 2013-2014, 2016 Attila Molnar - * Copyright (C) 2013, 2016-2017, 2020 Sadie Powell + * Copyright (C) 2013, 2016-2017, 2020-2021 Sadie Powell * Copyright (C) 2013 Adam * Copyright (C) 2012 Robby * Copyright (C) 2012 ChrisTX diff --git a/src/socketengine.cpp b/src/socketengine.cpp index 9186f2c8c..629203710 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -8,7 +8,7 @@ * Copyright (C) 2012 ChrisTX * Copyright (C) 2009-2010 Daniel De Graaf * Copyright (C) 2008, 2017 Robin Burchell - * Copyright (C) 2007 burlex + * Copyright (C) 2007 burlex * Copyright (C) 2007 Dennis Friis * Copyright (C) 2006-2008, 2010 Craig Edwards * diff --git a/src/users.cpp b/src/users.cpp index 38e677226..32056e1ea 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -1,7 +1,6 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2021 Herman * Copyright (C) 2019 linuxdaemon * Copyright (C) 2018 systocrat * Copyright (C) 2018 Dylan Frank diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h index b2ca05229..31e4da045 100644 --- a/win/inspircd_win32wrapper.h +++ b/win/inspircd_win32wrapper.h @@ -11,7 +11,7 @@ * Copyright (C) 2007-2009 Robin Burchell * Copyright (C) 2007-2008 Craig Edwards * Copyright (C) 2007, 2009 Dennis Friis - * Copyright (C) 2007 burlex + * Copyright (C) 2007 burlex * * 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 -- cgit v1.3.1-10-gc9f91