From: Mickaël Rémond <mickael.remond@process-one.net>
Date: Sun, 28 Dec 2008 12:23:20 +0000 (+0000)
Subject: * src/ejabberd_c2s.erl: Add resource to the from packet attribute if missing (EJAB... 
X-Git-Tag: v2.0.3~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0cc236196c0707b7cb6716ed0bfc36dffc919db;p=ejabberd

* src/ejabberd_c2s.erl: Add resource to the from packet attribute if missing (EJAB-812).

SVN Revision: 1760
---

diff --git a/ChangeLog b/ChangeLog
index 1b33d3d51..b7e5aa176 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-28  Mickael Remond  <mremond@process-one.net>
+
+	* src/ejabberd_c2s.erl: Add resource to the from packet attribute
+	if missing (EJAB-812).
+
 2008-12-24  Badlop  <badlop@process-one.net>
 
 	* src/aclocal.m4: Fixes in configure script: fix
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 46020ee84..44b05f51e 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -1980,7 +1980,14 @@ check_from(El, FromJID) ->
 		    %% Matching JID: The stanza is ok
 		    if JIDEl#jid.luser == FromJID#jid.luser andalso
 		       JIDEl#jid.lserver == FromJID#jid.lserver ->
-			    El;
+			    %% We force the resource on the from attribute in the packet.
+			    %% This is strictly needed only for IQ (to
+			    %% reply to the client), but I do not see
+			    %% any good reason for now not to do it on
+			    %% all packets.
+			    %% Need to be changed to support multiple
+			    %% resource binding per connection.
+			    jlib:replace_from(FromJID, El);
 		       true ->
 			    'invalid-from'
 		    end;