Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

* src/mod_disco.erl: Fixed extra_domains option processing 

SVN Revision: 431
This commit is contained in:
Alexey Shchepin 2005-11-03 19:58:58 +00:00
parent f6343f01f7
commit eb1b33c5a4
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2005-11-03 Alexey Shchepin <alexey@sevcom.net> 2005-11-03 Alexey Shchepin <alexey@sevcom.net>
* src/mod_disco.erl: Fixed extra_domains option processing
* src/ejabberd_s2s_out.erl: Support for STARTTLS+SASL EXTERNAL * src/ejabberd_s2s_out.erl: Support for STARTTLS+SASL EXTERNAL
(not well-tested yet) (not well-tested yet)
* src/ejabberd_s2s_in.erl: Likewise * src/ejabberd_s2s_in.erl: Likewise

3
src/mod_disco.erl
View File

@ -223,7 +223,8 @@ get_local_services(Acc, _From, To, [], _Lang) ->
lists:usort( lists:usort(
lists:map(fun domain_to_xml/1, lists:map(fun domain_to_xml/1,
get_vh_services(Host) ++ get_vh_services(Host) ++
ets:tab2list(disco_extra_domains)) ets:select(disco_extra_domains,
[{{{'$1', Host}}, [], ['$1']}]))
) ++ Items}; ) ++ Items};
get_local_services({result, _} = Acc, _From, _To, _Node, _Lang) -> get_local_services({result, _} = Acc, _From, _To, _Node, _Lang) ->