[asterisk-commits] jrose: branch 10 r333410 - in /branches/10: ./ res/res_jabber.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Fri Aug 26 11:28:03 2011
New Revision: 333410

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=333410
Log:
Merged revisions 333378 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r333378 | jrose | 2011-08-26 11:19:07 -0500 (Fri, 26 Aug 2011) | 13 lines
  
  [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
........

Modified:
    branches/10/   (props changed)
    branches/10/res/res_jabber.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/res/res_jabber.c?view=diff&rev=333410&r1=333409&r2=333410
==============================================================================
--- branches/10/res/res_jabber.c (original)
+++ branches/10/res/res_jabber.c Fri Aug 26 11:28:03 2011
@@ -3058,10 +3058,12 @@
 			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) {