diff options
author | Alexey Shchepin <alexey@process-one.net> | 2006-06-19 02:32:57 +0000 |
---|---|---|
committer | Alexey Shchepin <alexey@process-one.net> | 2006-06-19 02:32:57 +0000 |
commit | 2b46e3eaa78223ba04f3a30a9a35064efe52827e (patch) | |
tree | c476e3a5aaacd31cfa196c9e992dfe35140f8e58 /src | |
parent | * src/web/ejabberd_http_poll.erl: Bugfix: using tuple instead of a Pid (diff) |
* src/ejabberd_s2s_in.erl: Removed needless check for xmlns:db
when starttls is enabled
SVN Revision: 581
Diffstat (limited to 'src')
-rw-r--r-- | src/ejabberd_s2s_in.erl | 3 |
1 files changed, 1 insertions, 2 deletions
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 = |