diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 12 | ||||
| -rw-r--r-- | src/ejabberd_sm.erl | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index d8e124b52..76a844f87 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -164,7 +164,7 @@ handle_stream_start(_StreamStart, #{lserver := LServer} = State) -> case check_to(jid:make(LServer), State) of false -> send(State, xmpp:serr_host_unknown()); - true -> + true -> ServerHost = ejabberd_router:host_of_route(LServer), State#{server_host => ServerHost} end. @@ -186,7 +186,7 @@ handle_auth_success(RServer, Mech, _AuthModule, [SockMod:pp(Socket), Mech, RServer, LServer, ejabberd_config:may_hide_data(misc:ip_to_list(IP))]), State1 = case ejabberd_s2s:allow_host(ServerHost, RServer) of - true -> + true -> AuthDomains1 = sets:add_element(RServer, AuthDomains), change_shaper(State, RServer), State#{auth_domains => AuthDomains1}; @@ -310,13 +310,13 @@ code_change(_OldVsn, State, _Extra) -> -spec check_from_to(jid(), jid(), state()) -> ok | {error, stream_error()}. check_from_to(From, To, State) -> case check_from(From, State) of - true -> + true -> case check_to(To, State) of - true -> + true -> ok; - false -> + false -> {error, xmpp:serr_host_unknown()} - end; + end; false -> {error, xmpp:serr_invalid_from()} end. diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl index ea19f832f..344febb5d 100644 --- a/src/ejabberd_sm.erl +++ b/src/ejabberd_sm.erl @@ -321,7 +321,7 @@ get_offline_info(Time, User, Server, Resource) -> [#session{sid = {Time, _}, info = Info}] -> case proplists:get_bool(offline, Info) of true -> - Info; + Info; false -> none end; |