From 21ae72d02ecef9df116e95030afe3448d710b0ed Mon Sep 17 00:00:00 2001 From: Badlop Date: Thu, 6 Feb 2025 11:00:32 +0100 Subject: [PATCH] Result of running "make doap options" --- ejabberd.doap | 4 ++-- src/ejabberd_option.erl | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ejabberd.doap b/ejabberd.doap index 28a68863c..c17c89ca7 100644 --- a/ejabberd.doap +++ b/ejabberd.doap @@ -767,10 +767,10 @@ - 0.3.0 + 0.4.0 24.02 complete - + , 0.4.0 since 25.xx diff --git a/src/ejabberd_option.erl b/src/ejabberd_option.erl index 68e959288..2677cf42f 100644 --- a/src/ejabberd_option.erl +++ b/src/ejabberd_option.erl @@ -38,7 +38,7 @@ -export([cluster_nodes/0]). -export([default_db/0, default_db/1]). -export([default_ram_db/0, default_ram_db/1]). --export([define_macro/0, define_macro/1]). +-export([define_macro/0]). -export([disable_sasl_mechanisms/0, disable_sasl_mechanisms/1]). -export([disable_sasl_scram_downgrade_protection/0, disable_sasl_scram_downgrade_protection/1]). -export([domain_balancing/0]). @@ -374,10 +374,7 @@ default_ram_db(Host) -> -spec define_macro() -> any(). define_macro() -> - define_macro(global). --spec define_macro(global | binary()) -> any(). -define_macro(Host) -> - ejabberd_config:get_option({define_macro, Host}). + ejabberd_config:get_option({define_macro, global}). -spec disable_sasl_mechanisms() -> [binary()]. disable_sasl_mechanisms() ->