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
........


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

channels/chan_sip.c

@@ -21678,7 +21678,7 @@ static int reload_config(enum channelreloadreason reason)
 	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, user_count = 0;