diff options
| author | Andreas Köhler <andreas.koehler@1und1.de> | 2010-11-08 23:09:14 +0100 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2010-11-17 12:57:05 +0100 |
| commit | 6eeb355a22ea0baf150e8f62e0c457431be7f9f4 (patch) | |
| tree | eeeccb4759aa7ade7db83145bb72f3e76c2aa05b /src | |
| parent | Do not start mod_proxy65 if it is unable to bind an address (EJAB-1336) (diff) | |
Use LFrom and LTo consistently in ejabberd_s2s_in:stream_established/2 (EJAB-1342)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index 56086c9ef..1bd1b6898 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -364,11 +364,11 @@ stream_established({xmlstreamelement, El}, StateData) -> LFrom = jlib:nameprep(From), %% Checks if the from domain is allowed and if the to %% domain is handled by this server: - case {ejabberd_s2s:allow_host(To, From), + case {ejabberd_s2s:allow_host(LTo, LFrom), lists:member(LTo, ejabberd_router:dirty_get_all_domains())} of {true, true} -> - ejabberd_s2s_out:terminate_if_waiting_delay(To, From), - ejabberd_s2s_out:start(To, From, + ejabberd_s2s_out:terminate_if_waiting_delay(LTo, LFrom), + ejabberd_s2s_out:start(LTo, LFrom, {verify, self(), Key, StateData#state.streamid}), Conns = ?DICT:store({LFrom, LTo}, wait_for_verification, |