Release 2.0.15.

Closes #351.

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Report a non-security issue with Anope.
+---
+
+<!--
+Please fill in the template below. It will help us process your bug report a lot faster. If you have multiple bugs to report then please open one issue for each bug.
+-->
+
+**Description**
+
+
+
+**Steps to reproduce the issue:**
+
+1.
+2.
+3.
+
+**Describe the results you received:**
+
+
+
+**Describe the results you expected:**
+
+
+
+**Additional information you deem important (e.g. issue happens only occasionally):**
+
+
+
+**Output of `services --version`:**
+

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

@@ -0,0 +1,15 @@
+---
+name: Feature request
+about: Request that a new feature is added to Anope.
+---
+
+<!--
+Please fill in the template below. It will help us process your feature request a lot faster. If you have multiple features to request then please open one issue for each feature.
+-->
+
+**Description**
+
+
+
+**Why this would be useful**
+

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,26 @@
+<!--
+Please fill in the template below. It will help us process your pull request a lot faster.
+-->
+
+## Summary
+
+<!--
+Briefly describe what this pull request changes.
+-->
+
+## Rationale
+
+<!--
+Describe why you have made this change.
+-->
+
+## Testing Environment
+
+<!--
+Describe the environment in which you have tested this change:
+-->
+
+I have tested this pull request on:
+
+**Operating system name and version:** <!-- e.g. Linux 3.11 -->
+**Compiler name and version:** <!-- e.g. GCC 4.2.0 -->

.github/SECURITY.md

@@ -0,0 +1,19 @@
+# Security Policy
+
+## Supported Versions
+
+Currently the 2.0 (stable) branch is actively receiving security fixes.
+
+The 2.1 (development) branch is still early in development and currently only receives security fixes when they are synced from the 2.0 branch.
+
+Version | Supported
+------- | ---------
+2.1.x   | :warning:
+2.0.x   | :white_check_mark:
+1.8.x   | :x:
+
+## 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.
+
+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

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: monthly

.github/workflows/ci-linux.yml

@@ -1,45 +1,51 @@
-name: Linux CI
+name: Ubuntu CI
 on:
   - pull_request
   - push
 jobs:
   build:
+    if: "!contains(github.event.head_commit.message, '[skip ubuntu ci]')"
     runs-on: ubuntu-20.04
     env:
       CXX: ${{ matrix.compiler }}
       CXXFLAGS: -std=${{ matrix.standard }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+
       - name: Install dependencies
         run: |
           sudo apt-get update --assume-yes
           sudo apt-get install --assume-yes --no-install-recommends \
             clang \
             g++ \
+            gettext \
             git \
-            libc++-dev \
-            libc++abi-dev \
             libgnutls28-dev \
             libldap2-dev \
             libmysqlclient-dev \
+            libpcre2-dev \
             libpcre3-dev \
             libsqlite3-dev \
             libssl-dev \
             libtre-dev \
-            make
+            ninja-build
+
       - name: Enable extras
         run: |
-          for MODULE in m_ldap.cpp m_ldap_authentication.cpp m_ldap_oper.cpp m_mysql.cpp m_regex_pcre.cpp m_regex_posix.cpp m_regex_tre.cpp m_sql_authentication.cpp m_sql_log.cpp m_sql_oper.cpp m_sqlite.cpp m_ssl_gnutls.cpp m_ssl_openssl.cpp stats
+          for MODULE in m_ldap.cpp m_ldap_authentication.cpp m_ldap_oper.cpp m_mysql.cpp m_regex_pcre.cpp m_regex_pcre2.cpp m_regex_posix.cpp m_regex_tre.cpp m_sql_authentication.cpp m_sql_log.cpp m_sql_oper.cpp m_sqlite.cpp m_ssl_gnutls.cpp m_ssl_openssl.cpp stats
           do
             ln -s ${{ github.workspace }}/modules/extra/$MODULE ${{ github.workspace }}/modules
           done
+
       - name: Run CMake
         run: |
           mkdir build && cd build
-          cmake -DCMAKE_BUILD_TYPE:STRING=DEBUG -DINSTDIR:STRING=${{ github.workspace }}/run ..
+          cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=DEBUG -DINSTDIR:STRING=${{ github.workspace }}/run ..
+
       - name: Build Anope
         run: |
-          make --directory ${{ github.workspace }}/build --jobs $(nproc) --no-print-directory install
+          ninja -C ${{ github.workspace }}/build install
+
     strategy:
       fail-fast: false
       matrix:

.gitignore

@@ -1,4 +1,19 @@
+build/
 config.cache
 include/sysconf.h
-build/
+modules/m_ldap.cpp
+modules/m_ldap_authentication.cpp
+modules/m_ldap_oper.cpp
+modules/m_mysql.cpp
+modules/m_regex_pcre.cpp
+modules/m_regex_pcre2.cpp
+modules/m_regex_posix.cpp
+modules/m_regex_tre.cpp
+modules/m_sql_authentication.cpp
+modules/m_sql_log.cpp
+modules/m_sql_oper.cpp
+modules/m_sqlite.cpp
+modules/m_ssl_gnutls.cpp
+modules/m_ssl_openssl.cpp
+modules/stats
 run/

CMakeLists.txt

@@ -87,9 +87,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
   if(GCC_VERSION LESS 4.2)
     message(FATAL_ERROR "Your compiler is too old to build Anope. Upgrade to GCC 4.2 or newer!")
   endif(GCC_VERSION LESS 4.2)
-  if(GCC_VERSION GREATER 6.0 OR GCC_VERSION EQUAL 6.0)
-    set(CXXFLAGS "${CXXFLAGS} -fno-delete-null-pointer-checks")
-  endif(GCC_VERSION GREATER 6.0 OR GCC_VERSION EQUAL 6.0)
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
 # If we are using a GNU compiler (have to use CXX because it seems to fail on C), we will be able to determine it's default paths for libraries and includes
@@ -232,6 +229,12 @@ if(EXTRA_LIBS)
   link_directories(${EXTRA_LIBS})
 endif(EXTRA_LIBS)
 
+# setup conan
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/conanbuildinfo.cmake")
+  include("${CMAKE_CURRENT_SOURCE_DIR}/conanbuildinfo.cmake")
+  conan_basic_setup()
+endif()
+
 # Find gettext
 find_package(Gettext)
 
@@ -505,10 +508,6 @@ if(WIN32)
   install(FILES ${Anope_SOURCE_DIR}/src/win32/anope.bat
     DESTINATION ${BIN_DIR}
   )
-
-  # Package any DLLs in src/win/
-  file(GLOB EXTRA_DLLS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${Anope_SOURCE_DIR}/src/win32/*.dll")
-  install(FILES ${EXTRA_DLLS} DESTINATION ${BIN_DIR})
 endif(WIN32)
 
 install(CODE "file(REMOVE_RECURSE \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/modules\")")

Config

@@ -2,7 +2,7 @@
 #
 # Configuration script for Services.
 #
-# Anope (c) 2003-2021 Anope Team
+# Anope (C) 2003-2024 Anope Team
 # Contact us at team@anope.org
 #
 # This program is free but copyrighted software; see the file COPYING for
@@ -193,6 +193,7 @@ if [ ! "$NO_INTRO" ] ; then
 			clear
 			;;
 	esac
+	export MORE='-e'
 	. $SOURCE_DIR/src/version.sh
 	cat $SOURCE_DIR/.BANNER | sed "s/CURVER/$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH$VERSION_EXTRA/" | sed "s@SOURCE_DIR@$SOURCE_DIR@" | $PAGER
 	echo ""

cmake/Anope.cmake

@@ -445,24 +445,32 @@ macro(calculate_libraries SRC SRC_LDFLAGS EXTRA_DEPENDS)
     string(REGEX REPLACE "," ";" REQUIRED_LIBRARY ${REQUIRED_LIBRARY})
     # Iterate through the libraries given
     foreach(LIBRARY ${REQUIRED_LIBRARY})
+      # If the library has multiple names extract the alternate.
+      unset(LIBRARY_ALT)
+      if (${LIBRARY} MATCHES "^.+\\|.+$")
+        string(REGEX REPLACE ".+\\|(.*)" "\\1" LIBRARY_ALT ${LIBRARY})
+        string(REGEX REPLACE "(.+)\\|.*" "\\1" LIBRARY ${LIBRARY})
+      endif(${LIBRARY} MATCHES "^.+\\|.+$")
       # Locate the library to see if it exists
       if(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
-        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib ${EXTRA_INCLUDE} ${EXTRA_LIBS})
+        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${LIBRARY_ALT} PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib ${EXTRA_INCLUDE} ${EXTRA_LIBS})
       else(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
-        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS} NO_DEFAULT_PATH)
-        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS})
+        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${LIBRARY_ALT} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS} NO_DEFAULT_PATH)
+        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${LIBRARY_ALT} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS})
       endif(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
       # If the library was found, we will add it to the linker flags
       if(FOUND_${LIBRARY}_LIBRARY)
-        # Get the path only of the library, to add it to linker flags
-        get_filename_component(LIBRARY_PATH ${FOUND_${LIBRARY}_LIBRARY} PATH)
         if(MSVC)
           # For Visual Studio, instead of editing the linker flags, we'll add the library to a separate list of extra dependencies
           append_to_list(EXTRA_DEPENDENCIES "${FOUND_${LIBRARY}_LIBRARY}")
         else(MSVC)
-          # For all others, add the library paths and libraries
+          # Get the path only of the library, to add it to library paths.
+          get_filename_component(LIBRARY_PATH ${FOUND_${LIBRARY}_LIBRARY} PATH)
           append_to_list(LIBRARY_PATHS "${LIBRARY_PATH}")
-          append_to_list(LIBRARIES "${LIBRARY}")
+          # Extract the library short name, add it to the library path
+          get_filename_component(LIBRARY_NAME ${FOUND_${LIBRARY}_LIBRARY} NAME_WE)
+          string(REGEX REPLACE "^lib" "" LIBRARY_NAME ${LIBRARY_NAME})
+          append_to_list(LIBRARIES ${LIBRARY_NAME})
         endif(MSVC)
       else(FOUND_${LIBRARY}_LIBRARY)
         # In the case of the library not being found, we fatally error so CMake stops trying to generate
@@ -531,7 +539,7 @@ endmacro(check_functions)
 #   of TRUE is given, periods will be converted to \\. for CPack.
 ###############################################################################
 macro(add_to_cpack_ignored_files ITEM)
-  # Temporary copy of the orignal item
+  # Temporary copy of the original item
   set(REAL_ITEM "${ITEM}")
   # If we have 2+ arguments, assume that the second one was something like TRUE (doesn't matter really) and convert periods so they will be \\. for CPack
   if(${ARGC} GREATER 1)

cmake/FindGettext.cmake

@@ -10,9 +10,9 @@ if(NOT WIN32)
     endif(GETTEXT_LIBRARY)
   endif(GETTEXT_INCLUDE AND GETTEXT_MSGFMT)
 else(NOT WIN32)
-  find_path(GETTEXT_INCLUDE libintl.h ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/include $ENV{VCINSTALLDIR}/include gettext/include ${EXTRA_INCLUDE})
-  find_library(GETTEXT_LIBRARY libintl PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_LIBS})
-  find_program(GETTEXT_MSGFMT msgfmt PATHS ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/bin $ENV{VCINSTALLDIR}/bin gettext/bin ${EXTRA_INCLUDE})
+  find_path(GETTEXT_INCLUDE libintl.h)
+  find_library(GETTEXT_LIBRARY gnuintl)
+  find_program(GETTEXT_MSGFMT msgfmt)
   if(GETTEXT_INCLUDE AND GETTEXT_LIBRARY AND GETTEXT_MSGFMT)
     set(GETTEXT_FOUND TRUE)
     set(GETTEXT_LIBRARIES ${GETTEXT_LIBRARY})

cmake/NSIS.template.in

@@ -118,7 +118,7 @@ Var AR_RegFlags
  "exit_${SecName}:"
 !macroend
 
-!macro RemoveSection SecName
+!macro RemoveSection_CPack SecName
   ;  This macro is used to call section's Remove_... macro
   ;from the uninstaller.
   ;Input: section index constant name specified in Section command.
@@ -731,7 +731,7 @@ Section "Uninstall"
   DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
 
   ; Removes all optional components
-  !insertmacro SectionList "RemoveSection"
+  !insertmacro SectionList "RemoveSection_CPack"
 
   !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
 

data/botserv.example.conf

@@ -249,7 +249,7 @@ command { service = "BotServ"; name = "INFO"; command = "botserv/info"; }
  *   botserv/kick/italics - Configures BotServ's italics kicker.
  *   botserv/kick/repeat - Configures BotServ's repeat kicker.
  *   botserv/kick/reverses - Configures BotServ's reverse kicker.
- *   botserv/kick/underlines - Configures BotServ's reverse kicker.
+ *   botserv/kick/underlines - Configures BotServ's underline kicker.
  *   botserv/set/dontkickops - Used for preventing BotServ from kicking channel operators.
  *   botserv/set/dontkickvoices - Used for preventing BotServ from kicking voices.
  *

data/chanserv.example.conf

@@ -89,10 +89,12 @@ module
 	 * -       noautoop: Disables autoop on the channel
 	 * -  cs_keep_modes: Enables keep modes on the channel, which retains modes when the channel is
 	 *                     not in use.
+	 * -   cs_no_expire: Enables no expire. Needs founder, successor (if set) or anyone in the access list
+	 *                   to be a registered nick, otherwise the channel will be dropped.
 	 * -           none: No defaults
 	 *
-	 * This directive is optional, if left blank, the options will default to keeptopic, cs_secure, securefounder,
-	 * and signkick. If you really want no defaults, use "none" by itself as the option.
+	 * This directive is optional, if left blank, the options will default to keeptopic, peace, cs_secure,
+	 * securefounder, and signkick. If you really want no defaults, use "none" by itself as the option.
 	 */
 	defaults = "keeptopic peace cs_secure securefounder signkick"
 

data/example.conf

@@ -90,7 +90,7 @@
 define
 {
 	name = "services.host"
-	value = "services.localhost.net"
+	value = "services.example.com"
 }
 
 /*
@@ -127,13 +127,16 @@ define
  * and serverinfo configuration would look like:
  *
  *     # This goes in inspircd.conf, *NOT* your Anope config!
- *     <link name="services.localhost.net"
+ *     <module name="hidechans">
+ *     <module name="services_account">
+ *     <module name="spanningtree">
+ *     <bind address="127.0.0.1" port="7000" type="servers">
+ *     <link name="services.example.com"
  *           ipaddr="127.0.0.1"
  *           port="7000"
  *           sendpass="mypassword"
  *           recvpass="mypassword">
- *     <uline server="services.localhost.net" silent="yes">
- *     <bind address="127.0.0.1" port="7000" type="servers">
+ *     <uline server="services.example.com" silent="yes">
  *
  * An example configuration for UnrealIRCd that is compatible with the below uplink
  * and serverinfo configuration would look like:
@@ -146,14 +149,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 +209,7 @@ serverinfo
 	 * other server names on the rest of your IRC network. Note that it does not have
 	 * to be an existing hostname, just one that isn't on your network already.
 	 */
-	name = "services.localhost.net"
+	name = "services.example.com"
 
 	/*
 	 * The text which should appear as the server's information in /WHOIS and similar
@@ -491,7 +494,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.
@@ -660,6 +663,8 @@ log
 	 *   - a channel name
 	 *   - a filename
 	 *   - globops
+	 *
+	 * If you specify a filename the current date in the format ".YYYYMMDD" will be appended to the path.
 	 */
 	target = "services.log"
 
@@ -969,7 +974,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
@@ -992,6 +997,14 @@ mail
 	 */
 	#dontquoteaddresses = yes
 
+	/*
+	 * The content type to use when sending emails.
+	 *
+	 * This directive is optional, and is generally only needed if you want to
+	 * use HTML or non UTF-8 text in your services emails.
+	 */
+	#content_type = "text/plain; charset=UTF-8"
+
 	/*
 	 * The subject and message of emails sent to users when they register accounts.
 	 *

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

data/modules.example.conf

@@ -403,10 +403,19 @@ module { name = "help" }
 /*
  * m_regex_pcre [EXTRA]
  *
- * Provides the regex engine regex/pcre, which uses the Perl Compatible Regular Expressions library.
+ * Provides the regex engine regex/pcre, which uses version 1 of the Perl Compatible Regular
+ * Expressions library. This can not be loaded at the same time as the m_regex_pcre2 module.
  */
 #module { name = "m_regex_pcre" }
 
+/*
+ * m_regex_pcre2 [EXTRA]
+ *
+ * Provides the regex engine regex/pcre, which uses version 2 of the Perl Compatible Regular
+ * Expressions library. This can not be loaded at the same time as the m_regex_pcre module.
+ */
+#module { name = "m_regex_pcre2" }
+
 /*
  * m_regex_posix [EXTRA]
  *

data/nickserv.example.conf

@@ -110,7 +110,6 @@ module
 	 * -           msg: Services messages will be sent as PRIVMSGs instead of NOTICEs, requires
 	 *                    options:useprivmsg to be enabled as well
 	 * - ns_keep_modes: Enables keepmodes, which retains user modes across sessions
-	 * -  ns_no_expire: Enables no expire. Unconfirmed expire overrules this.
 	 *
 	 * This directive is optional, if left blank, the options will default to ns_secure, memo_signon, and
 	 * memo_receive. If you really want no defaults, use "none" by itself as the option.
@@ -594,12 +593,13 @@ command { service = "NickServ"; name = "SASET NOEXPIRE"; command = "nickserv/sas
 module { name = "ns_set_misc" }
 command { service = "NickServ"; name = "SET URL"; command = "nickserv/set/misc"; misc_description = _("Associate a URL with your account"); }
 command { service = "NickServ"; name = "SASET URL"; command = "nickserv/saset/misc"; misc_description = _("Associate a URL with this account"); permission = "nickserv/saset/url"; group = "nickserv/admin"; }
-#command { service = "NickServ"; name = "SET ICQ"; command = "nickserv/set/misc"; misc_description = _("Associate an ICQ account with your account"); }
-#command { service = "NickServ"; name = "SASET ICQ"; command = "nickserv/saset/misc"; misc_description = _("Associate an ICQ account with this account"); permission = "nickserv/saset/icq"; group = "nickserv/admin"; }
-#command { service = "NickServ"; name = "SET TWITTER"; command = "nickserv/set/misc"; misc_description = _("Associate a Twitter account with your account"); }
-#command { service = "NickServ"; name = "SASET TWITTER"; command = "nickserv/saset/misc"; misc_description = _("Associate a Twitter account with this account"); permission = "nickserv/saset/twitter"; group = "nickserv/admin"; }
+#command { service = "NickServ"; name = "SET DISCORD"; command = "nickserv/set/misc"; misc_description = _("Associate a Discord account with your account"); }
+#command { service = "NickServ"; name = "SASET DISCORD"; command = "nickserv/saset/misc"; misc_description = _("Associate a Discord account with this account"); permission = "nickserv/saset/discord"; group = "nickserv/admin"; }
 #command { service = "NickServ"; name = "SET FACEBOOK"; command = "nickserv/set/misc"; misc_description = _("Associate a Facebook URL with your account"); }
 #command { service = "NickServ"; name = "SASET FACEBOOK"; command = "nickserv/saset/misc"; misc_description = _("Associate a Facebook URL with this account"); permission = "nickserv/saset/facebook"; group = "nickserv/admin"; }
+#command { service = "NickServ"; name = "SET MASTODON"; command = "nickserv/set/misc"; misc_description = _("Associate a Mastodon account with your account"); }
+#command { service = "NickServ"; name = "SASET MASTODON"; command = "nickserv/saset/misc"; misc_description = _("Associate a Mastodon account with this account"); permission = "nickserv/saset/mastodon"; group = "nickserv/admin"; }
+
 
 /*
  * ns_status

data/operserv.example.conf

@@ -559,7 +559,7 @@ module
 	 *
 	 * This directive is required if os_session is loaded.
 	 */
-	defaultsessionlimit = 3
+	defaultsessionlimit = 5
 
 	/*
 	 * The maximum session limit that may be set for a host in an exception.

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

docs/BUGS

@@ -1 +1 @@
-For all bug reports / updates please see https://bugs.anope.org/
+For all bug reports / updates please see https://github.com/anope/anope/issues

docs/Changes

@@ -1,3 +1,61 @@
+Anope Version 2.0.15
+--------------------
+Fixed a race condition in changing the nick of a user.
+Fixed being able to reset the password of suspended accounts.
+Fixed chanserv/suspend info not being visible to regular users.
+Fixed removing entries by an alias in chanserv/access and chanserv/xop.
+Fixed various grammar issues in messages.
+Made the SASL PLAIN implementation more robust.
+Updated the Dutch translation.
+Updated the French translation.
+Updated the Turkish translation.
+
+Anope Version 2.0.14
+--------------------
+Added support for sqlining channels on UnrealIRCd.
+Fixed a crash when trying to access config for non-loaded modules.
+Fixed detection of the InspIRCd nopartmsg module.
+Fixed not getting memo notifications when authing with SASL.
+Fixed not serialising dontkickops/dontkickvoices in botserv/kick.
+Fixed sending emails with the wrong kind of line terminator.
+Fixed sending log messages from a renamed pseudoclient.
+Fixed telling users their passcode is incorrect when they need to authenticate in nickserv/confirm.
+Fixed the Config script freezing on some versions of util-linux.
+Updated the Windows packaging scripts to use dependencies from Conan.
+
+Anope Version 2.0.13
+--------------------
+Fixed a crash on some compilers when trying to call methods on a null pointer
+Fixed a crash when encountering an unterminated commented config block
+Fixed erroneously rejecting spaces in fantasy:name
+Fixed marking services pseudoclients as an oper on InspIRCd
+Fixed not checking user@ip as well as user@host when logging into an operator account
+Fixed setting the vhost/vident during SASL on UnrealIRCd
+Updated the German translation
+Updated the Italian translation
+
+Anope Version 2.0.12
+--------------------
+Added account confirmation to the web panel
+Added the regex_pcre2 module which provides regex/pcre with PCRE2
+Documented the cs_no_expire channel default
+Fixed config validation mistakenly allowing spaces in some fields
+Fixed the bahamut protocol module not knowing about halfops
+Fixed writing a flatfile database not being atomic
+Updated the hybrid protocol module for recent protocol changes
+
+Anope Version 2.0.11
+--------------------
+Fixed ldap on OpenLDAP 2.5+
+Fixed not using utf-8 encoding for outgoing email
+Fixed ns_resetpass not returning a response for XMLRPC
+Fixed some message params being sent as <middle> instead of <trailing>
+Fixed unsetting vhosts on unreal4
+Fixed username validity checking on ircd-hybrid
+Send the oper mode for services pseudoclients on InspIRCd
+Updated the pl_PL translation
+Updated unreal4 for various protocol changes
+
 Anope Version 2.0.10
 --------------------
 Add support for channel SQLines on InspIRCd
@@ -109,7 +167,7 @@ Show memo notify settings in ms_info
 Fix some actions bumping channels last used time that shouldn't have
 Add maxlogins configuration directive to limit the number of concurrent logins to one account
 Fix race with auto svsnick on ghost sometimes causing nick collisions instead
-Fix saset langauge reply
+Fix saset language reply
 Show akill/sxlines ids in VIEW
 Fix crash when an oper is configured in both the configuration and via os_oper
 Fix m_ldap reconnect logic not properly setting protocol and network timeout settings
@@ -176,7 +234,7 @@ A Added SQL logging support
 A Added Redis database support
 A Added ability to configure what privileges XOP commands give
 U Updated Dutch language file, from Robby <robby@chat.be>
-U Updated Spanish langauge file, from Isaac Fontal <i_fontal@hotmail.com>
+U Updated Spanish language file, from Isaac Fontal <i_fontal@hotmail.com>
 F Fix build on Solaris and OSX
 F Fixed setting BotServ's default settings in the config
 F Fixed some names of config items, including NickServ's kill protect

docs/Changes.conf

@@ -1,3 +1,23 @@
+Anope Version 2.0.15
+--------------------
+No significant changes.
+
+Anope Version 2.0.14
+--------------------
+Added mail:content_type to allow customizing the content type of emails.
+
+Anope Version 2.0.13
+--------------------
+No significant changes.
+
+Anope Version 2.0.12
+--------------------
+Added the regex_pcre2 module
+
+Anope Version 2.0.11
+--------------------
+No significant changes.
+
 Anope Version 2.0.10
 --------------------
 No significant changes.

docs/INSTALL

@@ -88,10 +88,6 @@ Note: You should also read the README and FAQ files!
 
     Don't forget to /rehash your IRCd to apply changes.
 
-    You may also try our interactive link maker, which is located at:
-
-        https://www.anope.org/ilm.php
-
 4) Starting Anope
 
     Go into the directory where binaries were installed (by default, this is

docs/INSTALL.fr

@@ -96,11 +96,6 @@ Note : Vous devrez également lire les fichiers README et FAQ !
 
     Souvenez-vous de /rehash votre IRCd pour appliquer les changements.
 
-    Vous pouvez également essayer notre créateur de bloc link interactif
-    situé ici :
-
-        https://www.anope.org/ilm.php
-
 4) Mettre en route Anope
 
     Allez dans le répertoire où les fichiers binaires ont été installés

docs/LANGUAGE

@@ -4,6 +4,7 @@ Anope Multi Language Support
 1) Building Anope with gettext support
 2) Adding a new language
 3) Using languages with modules
+4) Updating a language file
 
 1) Building Anope with gettext support
 
@@ -51,3 +52,14 @@ Anope Multi Language Support
 
     All .po and .pot files should be placed in modules/third/language. Additionally an update script is provided there
     that will create .pot files and merge any changes to it with existing .po files.
+
+4) Updating a language file
+
+    Poedit (https://poedit.net/) is a popular po file editor, and we recommend using it or another editor designed to edit
+    po files (especially on Windows).
+
+    Before editing the relevant file in languages/, run `update.sh` in the languages/ folder, i.e. `cd` to it and run
+        ./update.sh
+    This will update the language file to contain all strings that need a translation.
+
+    Then commit only the changed .po files in git.

docs/README

@@ -1,7 +1,7 @@
 Anope -- a set of IRC services for IRC networks
 -----------------------------------------------
 
-Anope is          2003-2021 Anope Team    <team@anope.org>.
+Anope is          2003-2024 Anope Team    <team@anope.org>.
 Based on Epona    2000-2002 PegSoft       <epona@pegsoft.net>.
 Based on Services 1996-1999 Andrew Church <achurch@achurch.org>.
 
@@ -92,7 +92,7 @@ Table of Contents
         * Lee Holmes <lethality@anope.org>
         * Lucas Nussbaum <lucas@lucas-nussbaum.net>
         * Mark Summers <mark@goopler.net>
-        * Matthew Beeching <jobe@invictachat.net>
+        * Matthew Beeching <jobe@mdbnet.co.uk>
         * Naram Qashat <cyberbotx@anope.org>
         * Phil Lavin <phil@anope.org>
         * Pieter Bootsma <geniusdex@anope.org>
@@ -252,7 +252,7 @@ Table of Contents
     The more precise you are the sooner you'll be likely to get an answer.
 
     If you think you found a bug, add it to the bug tracking system
-    (https://bugs.anope.org/) and - again - be as precise as possible. Also say
-    whether the bug happens always or under what circumstances, and anything
+    (https://github.com/anope/anope/issues) and - again - be as precise as possible.
+    Also say whether the bug happens always or under what circumstances, and anything
     that could be useful to track your bug down. If you wrote a patch, send
     it over. :)

docs/XMLRPC/xmlrpc.php

@@ -3,7 +3,7 @@
 /**
  * XMLRPC Functions
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  */
 

include/CMakeLists.txt

@@ -6,8 +6,8 @@ set_target_properties(version-bin PROPERTIES LINKER_LANGUAGE CXX LINK_FLAGS "${L
 get_target_property(version_BINARY version-bin LOCATION)
 # Modify version.h from the above executable, with dependencies to version.cpp
 # and all of the source files in the main build
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_build
-  COMMAND ${version_BINARY} ${Anope_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h
+  COMMAND version-bin ${Anope_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h
   DEPENDS version-bin ${SRC_SRCS}
 )
 # Add version-bin to list of files for CPack to ignore
@@ -61,4 +61,4 @@ if(USE_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 endif(USE_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 
 # Add a custom target to the above file
-add_custom_target(headers DEPENDS version-bin ${CMAKE_CURRENT_BINARY_DIR}/version_build ${PCH_SOURCES_GCH})
+add_custom_target(headers DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h ${PCH_SOURCES_GCH})

include/access.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/account.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/anope.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -54,6 +54,9 @@ namespace Anope
 		string(const ci::string &_str) : _string(_str.c_str()) { }
 		string(const string &_str, size_type pos, size_type n = npos) : _string(_str._string, pos, n) { }
 		template <class InputIterator> string(InputIterator first, InputIterator last) : _string(first, last) { }
+#if __cplusplus >= 201103L
+		string(const string &) = default;
+#endif
 
 		/**
 		 * Assignment operators, so any type of string can be assigned to this class.
@@ -545,6 +548,13 @@ namespace Anope
 	 */
 	extern Anope::string Resolve(const Anope::string &host, int type);
 
+	/** Does a blocking dns query and returns all IPs.
+	 * @param host host to look up
+	 * @param type inet addr type
+	 * @return A list of all IPs that the host resolves to
+	 */
+	extern std::vector<Anope::string> ResolveMultiple(const Anope::string &host, int type);
+
 	/** Generate a string of random letters and numbers
 	 * @param len The length of the string returned
 	 */
@@ -562,7 +572,7 @@ class CoreExport sepstream
 	/** Original string.
 	 */
 	Anope::string tokens;
-	/** Seperator value
+	/** Separator value
 	 */
 	char sep;
 	/** Current string position

include/base.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Adam <Adam@anope.org>
- * (C) 2008-2021 Anope Team <team@anope.org>
+ * (C) 2008-2024 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/bots.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2008-2021 Anope Team <team@anope.org>
+ * (C) 2008-2024 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/channels.h

@@ -1,6 +1,6 @@
 /* Channel support
  *
- * (C) 2008-2021 Anope Team
+ * (C) 2008-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -289,6 +289,11 @@ class CoreExport Channel : public Base, public Extensible
 	 */
 	bool CheckKick(User *user);
 
+	/** Find which bot should send mode/topic/etc changes for this channel
+	 * @return The bot
+	 */
+	BotInfo *WhoSends() const;
+
 	/** Finds a channel
 	 * @param name The channel to find
 	 * @return The channel, if found

include/commands.h

@@ -1,6 +1,6 @@
 /* Declarations for command data.
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/config.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -20,9 +20,11 @@
 
 namespace Configuration
 {
+	namespace Internal
+	{
 	class CoreExport Block
 	{
-		friend struct Conf;
+		friend struct Configuration::Conf;
 
 	 public:
 		typedef Anope::map<Anope::string> item_map;
@@ -34,13 +36,17 @@ namespace Configuration
 		block_map blocks;
 		int linenum;
 
+		/* Represents a missing tag. */
+		static Block EmptyBlock;
+
 	 public:
 		Block(const Anope::string &);
 		const Anope::string &GetName() const;
-		int CountBlock(const Anope::string &name);
-		Block* GetBlock(const Anope::string &name, int num = 0);
+		int CountBlock(const Anope::string &name) const;
+		const Block* GetBlock(const Anope::string &name, int num = 0) const;
+		Block* GetMutableBlock(const Anope::string &name, int num = 0);
 
-		template<typename T> inline T Get(const Anope::string &tag)
+		template<typename T> inline T Get(const Anope::string &tag) const
 		{
 			return this->Get<T>(tag, "");
 		}
@@ -66,6 +72,10 @@ namespace Configuration
 	template<> CoreExport const Anope::string Block::Get(const Anope::string &tag, const Anope::string& def) const;
 	template<> CoreExport time_t Block::Get(const Anope::string &tag, const Anope::string &def) const;
 	template<> CoreExport bool Block::Get(const Anope::string &tag, const Anope::string &def) const;
+	} // namespace Internal
+
+	typedef const Internal::Block Block;
+	typedef Internal::Block MutableBlock;
 
 	/** Represents a configuration file
 	 */
@@ -140,7 +150,7 @@ namespace Configuration
 
 		BotInfo *GetClient(const Anope::string &name);
 
-		Block *GetCommand(CommandSource &);
+		const Block *GetCommand(CommandSource &);
 	};
 
 	struct Uplink

include/defs.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/extensible.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/hashcomp.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2002-2011 InspIRCd Development Team
- * (C) 2009-2021 Anope Team <team@anope.org>
+ * (C) 2009-2024 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/language.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2008-2021 Anope Team
+ * (C) 2008-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/lists.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/logger.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/mail.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -32,6 +32,7 @@ namespace Mail
 		Anope::string addr;
 		Anope::string subject;
 		Anope::string message;
+		Anope::string content_type;
 		bool dont_quote_addresses;
 
 		bool success;

include/memo.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/messages.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modes.h

@@ -1,7 +1,7 @@
 /* Mode support
  *
  * (C) 2008-2011 Adam <Adam@anope.org>
- * (C) 2008-2021 Anope Team <team@anope.org>
+ * (C) 2008-2024 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */
@@ -160,7 +160,7 @@ class CoreExport ChannelModeList : public ChannelMode
 	virtual void OnDel(Channel *chan, const Anope::string &mask) { }
 };
 
-/** This is a mode with a paramater, eg +k/l. These modes should use/inherit from this
+/** This is a mode with a parameter, eg +k/l. These modes should use/inherit from this
 */
 class CoreExport ChannelModeParam : public ChannelMode
 {

include/module.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules.h

@@ -1,6 +1,6 @@
 /* Modular support
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -402,7 +402,6 @@ class CoreExport Module : public Extensible
 	virtual EventReturn OnLoadDatabase() { throw NotImplementedException(); }
 
 	/** Called when anope needs to check passwords against encryption
-	 *  see src/encrypt.c for detailed informations
 	 */
 	virtual EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest) { throw NotImplementedException(); }
 	virtual EventReturn OnDecrypt(const Anope::string &hashm, const Anope::string &src, Anope::string &dest) { throw NotImplementedException(); }
@@ -1066,7 +1065,7 @@ class CoreExport Module : public Extensible
 	/** Called when a nickserv/set command is used.
 	 * @param source The source of the command
 	 * @param cmd The command
-	 * @param nc The nickcore being modifed
+	 * @param nc The nickcore being modified
 	 * @param setting The setting passed to the command. Probably ON/OFF.
 	 * @return EVENT_STOP to halt immediately
 	 */
@@ -1100,6 +1099,13 @@ class CoreExport Module : public Extensible
 	 * @return EVENT_STOP to force the user off of the nick
 	 */
 	virtual EventReturn OnNickValidate(User *u, NickAlias *na) { throw NotImplementedException(); }
+
+	/** Called when a certain user has to be unbanned on a certain channel.
+	 * May be used to send protocol-specific messages.
+	 * @param u The user to be unbanned
+	 * @param c The channel that user has to be unbanned on
+	 */
+	virtual void OnChannelUnban(User *u, ChannelInfo *ci) { throw NotImplementedException(); }
 };
 
 enum Implementation
@@ -1125,7 +1131,7 @@ enum Implementation
 	I_OnPrivmsg, I_OnLog, I_OnLogMessage, I_OnDnsRequest, I_OnCheckModes, I_OnChannelSync, I_OnSetCorrectModes,
 	I_OnSerializeCheck, I_OnSerializableConstruct, I_OnSerializableDestruct, I_OnSerializableUpdate,
 	I_OnSerializeTypeCreate, I_OnSetChannelOption, I_OnSetNickOption, I_OnMessage, I_OnCanSet, I_OnCheckDelete,
-	I_OnExpireTick, I_OnNickValidate,
+	I_OnExpireTick, I_OnNickValidate, I_OnChannelUnban,
 	I_SIZE
 };
 

include/modules/bs_badwords.h

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/bs_kick.h

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/cs_entrymsg.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/cs_log.h

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/cs_mode.h

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/dns.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/encryption.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/httpd.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2012-2021 Anope Team
+ * (C) 2012-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/ldap.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2021 Anope Team
+ * (C) 2011-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/ns_cert.h

@@ -1,6 +1,6 @@
 /* NickServ core functions
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/os_forbid.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2021 Anope Team
+ * (C) 2011-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/os_ignore.h

@@ -1,6 +1,6 @@
 /* OperServ ignore interface
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/os_news.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2021 Anope Team
+ * (C) 2011-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/os_session.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2021 Anope Team
+ * (C) 2011-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/pseudoclients/chanserv.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2021 Anope Team
+ * (C) 2011-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/pseudoclients/global.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2021 Anope Team
+ * (C) 2011-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/pseudoclients/memoserv.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2021 Anope Team
+ * (C) 2011-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/pseudoclients/nickserv.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2021 Anope Team
+ * (C) 2011-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/redis.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/sasl.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2014-2021 Anope Team
+ * (C) 2014-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/set_misc.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/sql.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -149,7 +149,7 @@ namespace SQL
 
 		inline operator bool() const { return this->error.empty(); }
 
-		inline const unsigned int GetID() const { return this->id; }
+		inline unsigned int GetID() const { return this->id; }
 		inline const Query &GetQuery() const { return this->query; }
 		inline const Anope::string &GetError() const { return this->error; }
 

include/modules/ssl.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2010-2021 Anope Team
+ * (C) 2010-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/suspend.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/xmlrpc.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2010-2021 Anope Team
+ * (C) 2010-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/opertype.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2008-2021 Anope Team <team@anope.org>
+ * (C) 2008-2024 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/protocol.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/regchannel.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2008-2021 Anope Team
+ * (C) 2008-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/regexpr.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/serialize.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/servers.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/service.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -128,6 +128,10 @@ class ServiceReference : public Reference<T>
 	{
 	}
 
+	const Anope::string &GetServiceName() const { return name; }
+
+	const Anope::string &GetServiceType() const { return type; }
+
 	inline void operator=(const Anope::string &n)
 	{
 		this->name = n;

include/services.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/socketengine.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/sockets.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/threadengine.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/timers.h

@@ -1,6 +1,6 @@
 /* Timer include stuff.
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/uplink.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/users.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2003-2021 Anope Team <team@anope.org>
+ * (C) 2003-2024 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  *

include/version.cpp

@@ -1,6 +1,6 @@
 /* Build bumper
  *
- * (C) 2003-2021 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/xline.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2008-2021 Anope Team
+ * (C) 2008-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.