summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2009-10-12 22:51:19 +0000
committerBadlop <badlop@process-one.net>2009-10-12 22:51:19 +0000
commit355648dc7e54186856acdb5ebd89b6a81511e59e (patch)
treefa06dd38cc856621f3b1b51e1ddd1f067926bac9 /src
parentfix get_item issue on authorize access model (thanks to brian cully) (EJAB-1060) (diff)
If s2s fails due to namespace mismatch, show differences to help debugging the problem.
SVN Revision: 2662
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_s2s_out.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index 618bd6b4..66396e1e 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -293,10 +293,11 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
{next_state, wait_for_features, StateData, ?FSMTIMEOUT};
{"jabber:server", "", true} when StateData#state.use_v10 ->
{next_state, wait_for_features, StateData#state{db_enabled = false}, ?FSMTIMEOUT};
- _ ->
+ {NSProvided, _, _} ->
send_text(StateData, ?INVALID_NAMESPACE_ERR),
- ?INFO_MSG("Closing s2s connection: ~s -> ~s (invalid namespace)",
- [StateData#state.myname, StateData#state.server]),
+ ?INFO_MSG("Closing s2s connection: ~s -> ~s (invalid namespace).~n"
+ "Namespace provided: ~p~nNamespace expected: \"jabber:server\"",
+ [StateData#state.myname, StateData#state.server, NSProvided]),
{stop, normal, StateData}
end;