diff options
| author | Elias Rohrer <rohrer@informatik.hu-berlin.de> | 2016-03-10 17:46:15 +0100 |
|---|---|---|
| committer | Elias Rohrer <rohrer@informatik.hu-berlin.de> | 2016-03-10 17:52:55 +0100 |
| commit | 8b03c0a3856fc067ae1d16e9e2a93dfd39981d62 (patch) | |
| tree | af441e33c310b0b597cef6af6173e00a5cd5c278 /src/ejabberd_config.erl | |
| parent | Add tests for MIX (diff) | |
Minimal auth_method ordering fix
Diffstat (limited to 'src/ejabberd_config.erl')
| -rw-r--r-- | src/ejabberd_config.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl index c500ee4e..eb06b98f 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 -> |