aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/ejabberd_s2s_in.erl3
-rw-r--r--src/ejabberd_s2s_out.erl3
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2bdb62970..f7fd224ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-02 Alexey Shchepin <alexey@sevcom.net>
+
+ * src/ejabberd_s2s_in.erl: Temporary hack for "id" attribute
+ processing
+ * src/ejabberd_s2s_out.erl: Likewise
+
2003-08-30 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_listener.erl: Fixed SSL options
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
index a7e18540c..97a67e3eb 100644
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -46,7 +46,8 @@
"<stream:stream "
"xmlns:stream='http://etherx.jabber.org/streams' "
"xmlns='jabber:server' "
- "xmlns:db='jabber:server:dialback'>"
+ "xmlns:db='jabber:server:dialback' "
+ "id='todo'>"
).
-define(STREAM_TRAILER, "</stream:stream>").
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index e49a00e6e..4313354f1 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -167,7 +167,8 @@ wait_for_stream({xmlstreamstart, Name, Attrs}, StateData) ->
{xmlelement,
"db:verify",
[{"from", StateData#state.myname},
- {"to", StateData#state.server}],
+ {"to", StateData#state.server},
+ {"id", "todo"}],
[{xmlcdata, Key2}]})
end,
{next_state, wait_for_validation,