]> granicus.if.org Git - ejabberd/commitdiff
Minimal auth_method ordering fix
authorElias Rohrer <rohrer@informatik.hu-berlin.de>
Thu, 10 Mar 2016 16:46:15 +0000 (17:46 +0100)
committerElias Rohrer <rohrer@informatik.hu-berlin.de>
Thu, 10 Mar 2016 16:52:55 +0000 (17:52 +0100)
src/ejabberd_config.erl

index c500ee4ea3656fb9082af6fa5069e354a213de31..eb06b98f616bb8e20b50ccafa0fb26bf68f03b18 100644 (file)
@@ -408,7 +408,7 @@ maps_to_lists(IMap) ->
               end, [], IMap).
 
 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, #{}),
                         New = lists:foldl(fun(SVal, OMap) ->
                                                   NVal = if Name == host_config orelse Name == append_host_config ->