From 8076bc899943bc803bbd7b55a23934a02b81c65d Mon Sep 17 00:00:00 2001
From: Alexey Shchepin <alexey@process-one.net>
Date: Wed, 24 Dec 2003 21:05:45 +0000
Subject: [PATCH] * src/ejabberd_c2s.erl: Presence probe now sended from full
 JID

* src/mod_roster.erl: Bugfix

SVN Revision: 189
---
 ChangeLog            | 6 ++++++
 TODO                 | 1 +
 src/ejabberd_c2s.erl | 2 +-
 src/mod_roster.erl   | 6 ++++--
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b2ce58e82..363e7abb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-24  Alexey Shchepin  <alexey@sevcom.net>
+
+	* src/ejabberd_c2s.erl: Presence probe now sended from full JID
+
+	* src/mod_roster.erl: Bugfix
+
 2003-12-23  Alexey Shchepin  <alexey@sevcom.net>
 
 	* src/ejabberd_c2s.erl: Bugfix
diff --git a/TODO b/TODO
index a66b50af2..5702938df 100644
--- a/TODO
+++ b/TODO
@@ -10,6 +10,7 @@ S2S:
 	rewrite S2S key validation
 	check "id" attributes in db:verify packets
 
+last presence
 more correctly work with SRV DNS records (priority, weight, etc...)
 TLS
 make roster set to work in one transaction
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 448ed7705..d7554ba65 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -1114,7 +1114,7 @@ presence_broadcast_to_trusted(StateData, From, T, A, Packet) ->
 presence_broadcast_first(From, StateData, Packet) ->
     ?SETS:fold(fun(JID, X) ->
 		       ejabberd_router:route(
-			 jlib:jid_replace_resource(From, ""),
+			 From,
 			 jlib:make_jid(JID),
 			 {xmlelement, "presence",
 			  [{"type", "probe"}],
diff --git a/src/mod_roster.erl b/src/mod_roster.erl
index 6f3234e62..cbb6085ab 100644
--- a/src/mod_roster.erl
+++ b/src/mod_roster.erl
@@ -193,7 +193,8 @@ process_item_set(From, To, {xmlelement, _Name, Attrs, Els}) ->
 				     end,
 			    if IsTo ->
 				    ejabberd_router:route(
-				      From, jlib:make_jid(OldItem#roster.jid),
+				      jlib:jid_remove_resource(From),
+				      jlib:make_jid(OldItem#roster.jid),
 				      {xmlelement, "presence",
 				       [{"type", "unsubscribe"}],
 				       []});
@@ -201,7 +202,8 @@ process_item_set(From, To, {xmlelement, _Name, Attrs, Els}) ->
 			    end,
 			    if IsFrom ->
 				    ejabberd_router:route(
-				      From, jlib:make_jid(OldItem#roster.jid),
+				      jlib:jid_remove_resource(From),
+				      jlib:make_jid(OldItem#roster.jid),
 				      {xmlelement, "presence",
 				       [{"type", "unsubscribed"}],
 				       []});