From eb1b33c5a455c7922d5b32d8884f41e2f69fd042 Mon Sep 17 00:00:00 2001 From: Alexey Shchepin Date: Thu, 3 Nov 2005 19:58:58 +0000 Subject: [PATCH] * src/mod_disco.erl: Fixed extra_domains option processing SVN Revision: 431 --- ChangeLog | 2 ++ src/mod_disco.erl | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3587ad0ee..e645ccd88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-11-03 Alexey Shchepin + * src/mod_disco.erl: Fixed extra_domains option processing + * src/ejabberd_s2s_out.erl: Support for STARTTLS+SASL EXTERNAL (not well-tested yet) * src/ejabberd_s2s_in.erl: Likewise diff --git a/src/mod_disco.erl b/src/mod_disco.erl index d938db7bf..14df47ca2 100644 --- a/src/mod_disco.erl +++ b/src/mod_disco.erl @@ -223,7 +223,8 @@ get_local_services(Acc, _From, To, [], _Lang) -> lists:usort( lists:map(fun domain_to_xml/1, get_vh_services(Host) ++ - ets:tab2list(disco_extra_domains)) + ets:select(disco_extra_domains, + [{{{'$1', Host}}, [], ['$1']}])) ) ++ Items}; get_local_services({result, _} = Acc, _From, _To, _Node, _Lang) ->