diff options
| author | Radosław Szymczyszyn <radoslaw.szymczyszyn@erlang-solutions.com> | 2014-05-20 12:30:52 +0100 |
|---|---|---|
| committer | Radosław Szymczyszyn <radoslaw.szymczyszyn@erlang-solutions.com> | 2014-05-20 12:31:28 +0100 |
| commit | 5726636053fc711b1e9c94a4e42555d938cc77c5 (patch) | |
| tree | e1efa8db19c6b8b88f5e4d3eed840ab6ff60812f /src | |
| parent | Sanitize copy-pasted get_statustag/1 (diff) | |
Fix check_from/2 formatting
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_c2s.erl | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 0abb4a384..f3201ed0e 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -2458,23 +2458,27 @@ is_ip_blacklisted({IP, _Port}) -> %% returns invalid-from|NewElement check_from(El, FromJID) -> case xml:get_tag_attr(<<"from">>, El) of - false -> El; - {value, SJID} -> - JID = jlib:string_to_jid(SJID), - case JID of - error -> 'invalid-from'; - #jid{} -> - if (JID#jid.luser == FromJID#jid.luser) and - (JID#jid.lserver == FromJID#jid.lserver) - and (JID#jid.lresource == FromJID#jid.lresource) -> - El; - (JID#jid.luser == FromJID#jid.luser) and - (JID#jid.lserver == FromJID#jid.lserver) - and (JID#jid.lresource == <<"">>) -> - El; - true -> 'invalid-from' - end - end + false -> + El; + {value, SJID} -> + JID = jlib:string_to_jid(SJID), + case JID of + error -> + 'invalid-from'; + #jid{} -> + if + (JID#jid.luser == FromJID#jid.luser) and + (JID#jid.lserver == FromJID#jid.lserver) and + (JID#jid.lresource == FromJID#jid.lresource) -> + El; + (JID#jid.luser == FromJID#jid.luser) and + (JID#jid.lserver == FromJID#jid.lserver) and + (JID#jid.lresource == <<"">>) -> + El; + true -> + 'invalid-from' + end + end end. fsm_limit_opts(Opts) -> |