Skip to content

Commit 21ae72d

Browse files
committed
Result of running "make doap options"
1 parent d834a9c commit 21ae72d

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

ejabberd.doap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,10 +767,10 @@
767767
<implements>
768768
<xmpp:SupportedXep>
769769
<xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0474.html"/>
770-
<xmpp:version>0.3.0</xmpp:version>
770+
<xmpp:version>0.4.0</xmpp:version>
771771
<xmpp:since>24.02</xmpp:since>
772772
<xmpp:status>complete</xmpp:status>
773-
<xmpp:note></xmpp:note>
773+
<xmpp:note>, 0.4.0 since 25.xx</xmpp:note>
774774
</xmpp:SupportedXep>
775775
</implements>
776776
<implements>

src/ejabberd_option.erl

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
-export([cluster_nodes/0]).
3939
-export([default_db/0, default_db/1]).
4040
-export([default_ram_db/0, default_ram_db/1]).
41-
-export([define_macro/0, define_macro/1]).
41+
-export([define_macro/0]).
4242
-export([disable_sasl_mechanisms/0, disable_sasl_mechanisms/1]).
4343
-export([disable_sasl_scram_downgrade_protection/0, disable_sasl_scram_downgrade_protection/1]).
4444
-export([domain_balancing/0]).
@@ -374,10 +374,7 @@ default_ram_db(Host) ->
374374

375375
-spec define_macro() -> any().
376376
define_macro() ->
377-
define_macro(global).
378-
-spec define_macro(global | binary()) -> any().
379-
define_macro(Host) ->
380-
ejabberd_config:get_option({define_macro, Host}).
377+
ejabberd_config:get_option({define_macro, global}).
381378

382379
-spec disable_sasl_mechanisms() -> [binary()].
383380
disable_sasl_mechanisms() ->

0 commit comments

Comments
 (0)