From 9daeb19f802cea3dd8347154710fb876db60dd0f Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Wed, 21 May 2008 02:21:38 +0000 Subject: [PATCH] Merged revisions 117367 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r117367 | mmichelson | 2008-05-20 21:20:31 -0500 (Tue, 20 May 2008) | 19 lines Be sure that we cache included files for each source file which loads a configuration file. As it was, only the first did so. This led to a problem if the included file was changed (but not the configuration file which includes it) and the second source file attempted to reload the configuration. It would not see that the included file had changed. In this particular example, res_phoneprov and chan_sip both loaded sip.conf, which included a file call sip.peers.conf. Since res_phoneprov was the first to load sip.conf, only it cached the fact that sip.conf included sip.peers.conf. If sip.peers.conf were changed and sip.conf were not and a sip reload were issued (meaning that chan_sip attempts to reload sip.conf only if it and its included files have changed) the changes made to sip.peers.conf would not be seen and therefore no action would be taken. (closes issue #12693) Reported by: marsosa ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@117368 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/config.c b/main/config.c index db5167806e..76bbfac30a 100644 --- a/main/config.c +++ b/main/config.c @@ -864,7 +864,7 @@ static void config_cache_attribute(const char *configfile, enum config_cache_att /* Find our cached entry for this configuration file */ AST_LIST_LOCK(&cfmtime_head); AST_LIST_TRAVERSE(&cfmtime_head, cfmtime, list) { - if (!strcmp(cfmtime->filename, configfile)) + if (!strcmp(cfmtime->filename, configfile) && !strcmp(cfmtime->who_asked, who_asked)) break; } if (!cfmtime) {