Merged revisions 59363 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r59363 | russell | 2007-03-29 12:43:52 -0500 (Thu, 29 Mar 2007) | 6 lines

When building a response to a subscription, the "from" must be the full Jabber
ID.  This fixes some problems where jabber users are not able to add their
Asterisk account to their user list, since they are unable to get Asterisk
to approve their subscription.  (issue #8210, reported by caspy, and verified
by bradtem)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59364 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_jabber.c b/res/res_jabber.c
index afad72c35e6f1bf97e9d3b1600c53ed7a3618c05..8d44b66ed35848dbe26a494576300ff3494cb584 100644 (file)
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -1328,7 +1328,7 @@ static void aji_handle_subscribe(struct aji_client *client, ikspak *pak)
                if(presence && status) {
                        iks_insert_attrib(presence, "type", "subscribed");
                        iks_insert_attrib(presence, "to", pak->from->full);
-                       iks_insert_attrib(presence, "from", iks_find_attrib(pak->x, "to"));
+                       iks_insert_attrib(presence, "from", client->jid->full);
                        if(pak->id)
                                iks_insert_attrib(presence, "id", pak->id);
                        iks_insert_cdata(status, "Asterisk has approved subscription", 0);