From 2b46e3eaa78223ba04f3a30a9a35064efe52827e Mon Sep 17 00:00:00 2001 From: Alexey Shchepin Date: Mon, 19 Jun 2006 02:32:57 +0000 Subject: [PATCH] * src/ejabberd_s2s_in.erl: Removed needless check for xmlns:db when starttls is enabled SVN Revision: 581 --- ChangeLog | 5 +++++ src/ejabberd_s2s_in.erl | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e191c9204..f88ea5903 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-19 Alexey Shchepin + + * src/ejabberd_s2s_in.erl: Removed needless check for xmlns:db + when starttls is enabled + 2006-06-15 Mickael Remond * 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 ec6b4ddea..725421d1d 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 = -- 2.50.0