[asterisk-commits] tilghman: branch 1.6.1 r213096 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Aug 19 15:34:38 2009
New Revision: 213096

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=213096
Log:
Merged revisions 213093 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r213093 | tilghman | 2009-08-19 15:29:41 -0500 (Wed, 19 Aug 2009) | 7 lines
  
  If we have realtime caching enabled, 'sip reload' must purge users/peers, even if the config files haven't changed.
  (closes issue #12869)
   Reported by: bcnit
   Patches: 
         20090819__issue12869__2.diff.txt uploaded by tilghman (license 14)
   Tested by: lasko
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=213096&r1=213095&r2=213096
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Wed Aug 19 15:34:38 2009
@@ -22507,7 +22507,7 @@
 	char *cat, *stringp, *context, *oldregcontext;
 	char newcontexts[AST_MAX_CONTEXT], oldcontexts[AST_MAX_CONTEXT];
 	struct ast_flags dummy[2];
-	struct ast_flags config_flags = { reason == CHANNEL_MODULE_LOAD ? 0 : CONFIG_FLAG_FILEUNCHANGED };
+	struct ast_flags config_flags = { reason == CHANNEL_MODULE_LOAD ? 0 : ast_test_flag(&global_flags[1], SIP_PAGE2_RTCACHEFRIENDS) ? 0 : CONFIG_FLAG_FILEUNCHANGED };
 	int auto_sip_domains = FALSE;
 	struct sockaddr_in old_bindaddr = bindaddr;
 	int registry_count = 0, peer_count = 0;