* src/ejabberd_s2s_in.erl: Removed needless check for xmlns:db

when starttls is enabled

SVN Revision: 581

diff --git a/ChangeLog b/ChangeLog
index e191c9204968083b8f7e4c614566e67200e7f03c..f88ea59038c6bef2c1c996c266adb38ea93fe449 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 ec6b4ddea014e5f48aad32150c4971347e65ab0e..725421d1d06a9ce1809c40a19c6602b859218938 100644 (file)
--- 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 =