]> granicus.if.org Git - ejabberd/commitdiff
Fix validator of option ejabberd_service->hosts
authorEvgeny Khramtsov <ekhramtsov@process-one.net>
Sat, 6 Jul 2019 07:38:25 +0000 (10:38 +0300)
committerEvgeny Khramtsov <ekhramtsov@process-one.net>
Sat, 6 Jul 2019 07:38:25 +0000 (10:38 +0300)
Fixes #2929

src/ejabberd_service.erl

index 8e29577c89c141b506eac7d492f630e851102f21..45903a01a0d34e0998e46ddb42eef2703a75ae9f 100644 (file)
@@ -264,14 +264,12 @@ listen_opt_type(check_from) ->
 listen_opt_type(password) ->
     econf:binary();
 listen_opt_type(hosts) ->
-    econf:and_then(
-      econf:map(
-       econf:domain(),
+    econf:map(
+      econf:domain(),
+      econf:and_then(
        econf:options(
-         #{password => econf:binary()})),
-      fun({Host, Opts}) ->
-             {Host, proplists:get_value(password, Opts)}
-      end);
+         #{password => econf:binary()}),
+       fun(Opts) -> proplists:get_value(password, Opts) end));
 listen_opt_type(global_routes) ->
     econf:bool().