aboutsummaryrefslogtreecommitdiffstats
path: root/res/res_jabber.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-29 17:43:52 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-29 17:43:52 +0000
commitda7a6b7ba1d46a4884cb7365b6ed288fdd345d72 (patch)
treee801b40ee8e16a10130d095a682e0e98d979bdaf /res/res_jabber.c
parent9335980765ed276afb311780004c32feda74744e (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@59363 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_jabber.c')
-rw-r--r--res/res_jabber.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 2cda2d9ee..d8590980a 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -1324,7 +1324,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);