diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 3 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2006-06-19 Alexey Shchepin <alexey@sevcom.net> + + * src/ejabberd_s2s_in.erl: Removed needless check for xmlns:db + when starttls is enabled + 2006-06-15 Mickael Remond <mickael.remond@process-one.net> * src/web/ejabberd_http_poll.erl: Bugfix: using tuple instead of a Pid diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index ec6b4dde..725421d1 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -8,7 +8,6 @@ -module(ejabberd_s2s_in). -author('alexey@sevcom.net'). --vsn('$Revision$ '). -behaviour(gen_fsm). @@ -150,7 +149,7 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) -> case {xml:get_attr_s("xmlns", Attrs), xml:get_attr_s("xmlns:db", Attrs), xml:get_attr_s("version", Attrs) == "1.0"} of - {"jabber:server", "jabber:server:dialback", true} when + {"jabber:server", _, true} when StateData#state.tls and (not StateData#state.authenticated) -> send_text(StateData, ?STREAM_HEADER(" version='1.0'")), SASL = |