diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_admin_extra.erl | 9 | ||||
| -rw-r--r-- | src/mod_proxy65_service.erl | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl index b0216b461..a8f33b51f 100644 --- a/src/mod_admin_extra.erl +++ b/src/mod_admin_extra.erl @@ -1575,14 +1575,13 @@ send_stanza_c2s(Username, Host, Resource, Stanza) -> end. privacy_set(Username, Host, QueryS) -> - From = jid:make(Username, Host), - To = jid:make(Host), + Jid = jid:make(Username, Host), QueryEl = fxml_stream:parse_element(QueryS), SubEl = xmpp:decode(QueryEl), IQ = #iq{type = set, id = <<"push">>, sub_els = [SubEl], - from = From, to = To}, - mod_privacy:process_iq(IQ), - ok. + from = Jid, to = Jid}, + Result = mod_privacy:process_iq(IQ), + Result#iq.type == result. %%% %%% Stats diff --git a/src/mod_proxy65_service.erl b/src/mod_proxy65_service.erl index fb34ba554..721ebabe3 100644 --- a/src/mod_proxy65_service.erl +++ b/src/mod_proxy65_service.erl @@ -252,8 +252,9 @@ transform_module_options(Opts) -> -spec get_streamhost(binary(), binary()) -> streamhost(). get_streamhost(Host, ServerHost) -> {Port, IP} = get_port_ip(ServerHost), - HostName = gen_mod:get_module_opt(ServerHost, mod_proxy65, hostname, + HostName0 = gen_mod:get_module_opt(ServerHost, mod_proxy65, hostname, misc:ip_to_list(IP)), + HostName = misc:expand_keyword(<<"@HOST@">>, HostName0, ServerHost), Resource = ejabberd_cluster:node_id(), #streamhost{jid = jid:make(<<"">>, Host, Resource), host = HostName, |