Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-20 16:15:59 +01:00
Code Releases Activity

Merge pull request #997 from tnull/fix_auth_method_order

Browse Source 
Minimal auth_method ordering fix during configuration merge.
This commit is contained in:
Mickaël Rémond 2016-03-11 11:37:50 +01:00
commit 1336c6c9fa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ejabberd_config.erl
View File

@ -408,7 +408,7 @@ maps_to_lists(IMap) ->
end, [], IMap). end, [], IMap).
merge_configs(Terms, ResMap) -> merge_configs(Terms, ResMap) ->
lists:foldl(fun({Name, Val}, Map) when is_list(Val) -> lists:foldl(fun({Name, Val}, Map) when is_list(Val), Name =/= auth_method ->
Old = maps:get(Name, Map, #{}), Old = maps:get(Name, Map, #{}),
New = lists:foldl(fun(SVal, OMap) -> New = lists:foldl(fun(SVal, OMap) ->
NVal = if Name == host_config orelse Name == append_host_config -> NVal = if Name == host_config orelse Name == append_host_config ->