From: Jonathan Rose Date: Fri, 26 Aug 2011 16:19:07 +0000 (+0000) Subject: [patch] Buddies are always auto-registered when processing the roster X-Git-Tag: 1.8.7.0-rc1~18 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f1ca011555a41b817a16e51bd540e8d21552b50;p=thirdparty%2Fasterisk.git [patch] Buddies are always auto-registered when processing the roster Reporter said autoregister flag was ignored for registering 'buddies' which had a subscription to us. Verified that this was the case and observed how the patch addressed this and made sure it didn't break anything. (closes issue ASTERISK-14233) Reported by: Simon Arlott Patches: asterisk-0015229.patch (license #5756) patch uploaded by Simon Arlott Tested by: Jonathan Rose git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@333378 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/res_jabber.c b/res/res_jabber.c index b1c94d9a45..bc4f0ad251 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -2992,10 +2992,12 @@ static int aji_filter_roster(void *data, ikspak *pak) if (ast_test_flag(&client->flags, AJI_AUTOPRUNE)) { ast_set_flag(&buddy->flags, AJI_AUTOPRUNE); ASTOBJ_MARK(buddy); - } else if (!iks_strcmp(iks_find_attrib(x, "subscription"), "none") || !iks_strcmp(iks_find_attrib(x, "subscription"), "from")) { - /* subscribe to buddy's presence only - if we really need to */ - ast_set_flag(&buddy->flags, AJI_AUTOREGISTER); + } else if (ast_test_flag(&client->flags, AJI_AUTOREGISTER)) { + if (!iks_strcmp(iks_find_attrib(x, "subscription"), "none") || !iks_strcmp(iks_find_attrib(x, "subscription"), "from")) { + /* subscribe to buddy's presence only + if we really need to */ + ast_set_flag(&buddy->flags, AJI_AUTOREGISTER); + } } ASTOBJ_UNLOCK(buddy); if (buddy) {