From: Tilghman Lesher Date: Wed, 19 Aug 2009 20:34:38 +0000 (+0000) Subject: Merged revisions 213093 via svnmerge from X-Git-Tag: 1.6.1.7-rc1~99 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8be21262e930ea9e4afa365a76d6bdac1a4d06c0;p=thirdparty%2Fasterisk.git 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.1@213096 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index b346322a01..847ccde7f8 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -22507,7 +22507,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;