diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-08-15 10:49:59 +0400 |
|---|---|---|
| committer | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-08-15 10:49:59 +0400 |
| commit | 9484b11383c59632e83ae91bb7aac18166004d3f (patch) | |
| tree | 755110be9803ad31b0cd0abf859fde353f8da933 /src | |
| parent | Merge pull request #269 from Iperity/master (diff) | |
| parent | XEP-0198: Gracefully handle broken 'previd' (diff) | |
Merge pull request #276 from weiss/xep-0198
XEP-0198: Don't crash if the resume ID is incorrect
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_c2s.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 1e07be859..66f9db507 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -2936,7 +2936,9 @@ inherit_session_state(#state{user = U, server = S} = StateData, ResumeID) -> {error, <<"Cannot grab session state">>} end end; - error -> + {term, {_WrongU, _WrongS, _R, _Time}} -> + {error, <<"Previous JID doesn't match authenticated JID">>}; + _ -> {error, <<"Invalid 'previd' value">>} end. |