From 8b03c0a3856fc067ae1d16e9e2a93dfd39981d62 Mon Sep 17 00:00:00 2001
From: Elias Rohrer <rohrer@informatik.hu-berlin.de>
Date: Thu, 10 Mar 2016 17:46:15 +0100
Subject: [PATCH] Minimal auth_method ordering fix

---
 src/ejabberd_config.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl
index c500ee4ea..eb06b98f6 100644
--- a/src/ejabberd_config.erl
+++ b/src/ejabberd_config.erl
@@ -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 ->