From 8caff612fb1be562af163b14fe2d58b61ddfe7f5 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 18 Jan 2023 13:35:01 +0000 Subject: Fix the nicklock module sending a notice instead of ERR_NOSUCHNICK. --- src/modules/m_nicklock.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index 1d2843e08..c261f50c6 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -53,7 +53,7 @@ class CommandNicklock : public Command if ((!target) || (target->registered != REG_ALL)) { - user->WriteNotice("*** No such nickname: '" + parameters[0] + "'"); + user->WriteNumeric(Numerics::NoSuchNick(parameters[0])); return CMD_FAILURE; } @@ -113,7 +113,7 @@ class CommandNickunlock : public Command if (!target) { - user->WriteNotice("*** No such nickname: '" + parameters[0] + "'"); + user->WriteNumeric(Numerics::NoSuchNick(parameters[0])); return CMD_FAILURE; } -- cgit v1.3.1-10-gc9f91 From 1f6f478772668ecbff964f7dc746198fed0d94a2 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 19 Jan 2023 15:01:54 +0000 Subject: Fix PackageInfo directives in extra modules. --- src/modules/extra/m_ldap.cpp | 1 + src/modules/extra/m_mysql.cpp | 6 +++--- src/modules/extra/m_pgsql.cpp | 3 ++- src/modules/extra/m_regex_pcre.cpp | 1 + src/modules/extra/m_regex_pcre2.cpp | 1 + src/modules/extra/m_sqlite3.cpp | 3 ++- src/modules/extra/m_ssl_gnutls.cpp | 1 + src/modules/extra/m_ssl_mbedtls.cpp | 4 ++-- src/modules/extra/m_ssl_openssl.cpp | 1 + 9 files changed, 14 insertions(+), 7 deletions(-) (limited to 'src/modules') diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp index 6b49ffbdc..5d7baf93f 100644 --- a/src/modules/extra/m_ldap.cpp +++ b/src/modules/extra/m_ldap.cpp @@ -26,6 +26,7 @@ /// $PackageInfo: require_system("arch") libldap /// $PackageInfo: require_system("centos") openldap-devel /// $PackageInfo: require_system("debian") libldap2-dev +/// $PackageInfo: require_system("rocky") openldap-devel /// $PackageInfo: require_system("ubuntu") libldap2-dev #include "inspircd.h" diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 0307a25fe..2ec2e6984 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -30,10 +30,10 @@ /// $LinkerFlags: execute("mysql_config --libs_r" "MYSQL_LDFLAGS" "-lmysqlclient") /// $PackageInfo: require_system("arch") mariadb-libs -/// $PackageInfo: require_system("centos" "6.0" "6.99") mysql-devel -/// $PackageInfo: require_system("centos" "7.0") mariadb-devel -/// $PackageInfo: require_system("darwin") mysql-connector-c +/// $PackageInfo: require_system("centos") mysql-devel +/// $PackageInfo: require_system("darwin") mysql-client /// $PackageInfo: require_system("debian") libmysqlclient-dev +/// $PackageInfo: require_system("rocky") mysql-devel /// $PackageInfo: require_system("ubuntu") libmysqlclient-dev #ifdef __GNUC__ diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index 6bae8c38f..ecc036416 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -31,8 +31,9 @@ /// $PackageInfo: require_system("arch") postgresql-libs /// $PackageInfo: require_system("centos") postgresql-devel -/// $PackageInfo: require_system("darwin") postgresql +/// $PackageInfo: require_system("darwin") libpq /// $PackageInfo: require_system("debian") libpq-dev +/// $PackageInfo: require_system("rocky") postgresql-devel /// $PackageInfo: require_system("ubuntu") libpq-dev diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp index 8e6094331..dd146b02a 100644 --- a/src/modules/extra/m_regex_pcre.cpp +++ b/src/modules/extra/m_regex_pcre.cpp @@ -28,6 +28,7 @@ /// $PackageInfo: require_system("centos") pcre-devel /// $PackageInfo: require_system("darwin") pcre /// $PackageInfo: require_system("debian") libpcre3-dev +/// $PackageInfo: require_system("rocky") pcre-devel /// $PackageInfo: require_system("ubuntu") libpcre3-dev diff --git a/src/modules/extra/m_regex_pcre2.cpp b/src/modules/extra/m_regex_pcre2.cpp index 305aced9d..ca8cc968a 100644 --- a/src/modules/extra/m_regex_pcre2.cpp +++ b/src/modules/extra/m_regex_pcre2.cpp @@ -24,6 +24,7 @@ /// $PackageInfo: require_system("centos") pcre2-devel /// $PackageInfo: require_system("darwin") pcre2 /// $PackageInfo: require_system("debian") libpcre2-dev +/// $PackageInfo: require_system("rocky") pcre2-devel /// $PackageInfo: require_system("ubuntu") libpcre2-dev diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index 932d427d2..e36623065 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -30,8 +30,9 @@ /// $PackageInfo: require_system("arch") pkgconf sqlite /// $PackageInfo: require_system("centos") pkgconfig sqlite-devel -/// $PackageInfo: require_system("darwin") pkg-config sqlite3 +/// $PackageInfo: require_system("darwin") pkg-config sqlite /// $PackageInfo: require_system("debian") libsqlite3-dev pkg-config +/// $PackageInfo: require_system("rocky") pkgconfig sqlite-devel /// $PackageInfo: require_system("ubuntu") libsqlite3-dev pkg-config #include "inspircd.h" diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 34f0f3ad4..2c469c4b8 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -39,6 +39,7 @@ /// $PackageInfo: require_system("centos") gnutls-devel pkgconfig /// $PackageInfo: require_system("darwin") gnutls pkg-config /// $PackageInfo: require_system("debian") gnutls-bin libgnutls28-dev pkg-config +/// $PackageInfo: require_system("rocky") gnutls-devel pkgconfig /// $PackageInfo: require_system("ubuntu") gnutls-bin libgnutls28-dev pkg-config #include "inspircd.h" diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp index 01ba4c88e..a2529dcb3 100644 --- a/src/modules/extra/m_ssl_mbedtls.cpp +++ b/src/modules/extra/m_ssl_mbedtls.cpp @@ -22,8 +22,8 @@ /// $PackageInfo: require_system("arch") mbedtls /// $PackageInfo: require_system("darwin") mbedtls -/// $PackageInfo: require_system("debian" "9.0") libmbedtls-dev -/// $PackageInfo: require_system("ubuntu" "16.04") libmbedtls-dev +/// $PackageInfo: require_system("debian") libmbedtls-dev +/// $PackageInfo: require_system("ubuntu") libmbedtls-dev #include "inspircd.h" diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 11e258924..b3aed3896 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -36,6 +36,7 @@ /// $PackageInfo: require_system("centos") openssl-devel pkgconfig /// $PackageInfo: require_system("darwin") openssl pkg-config /// $PackageInfo: require_system("debian") libssl-dev openssl pkg-config +/// $PackageInfo: require_system("rocky") openssl-devel pkgconfig /// $PackageInfo: require_system("ubuntu") libssl-dev openssl pkg-config -- cgit v1.3.1-10-gc9f91 From dede5e9bf14e14cbcc5c6916a3eb6941813fe051 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 25 Jan 2023 00:08:04 +0000 Subject: Work around a bug in reading the config for the Argon2 module. ProviderConfig::version is set to an argon2 version not a base 10 version so using it as a default for the config may result in the default being ignored. Luckily 0x10 and 0x12 are 16 and 18 respectively so we can just allow them as valid values until v4 where we can eradicate the SanitiseArgon2Version function and use getEnum instead. --- src/modules/extra/m_argon2.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/modules') diff --git a/src/modules/extra/m_argon2.cpp b/src/modules/extra/m_argon2.cpp index f2b564a92..9e803a0d6 100644 --- a/src/modules/extra/m_argon2.cpp +++ b/src/modules/extra/m_argon2.cpp @@ -54,8 +54,11 @@ class ProviderConfig // match better. switch (version) { + case ARGON2_VERSION_10: case 10: return ARGON2_VERSION_10; + + case ARGON2_VERSION_13: case 13: return ARGON2_VERSION_13; } -- cgit v1.3.1-10-gc9f91