aboutsummaryrefslogtreecommitdiffstats
path: root/pbx
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-12-15 16:17:55 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-12-15 16:17:55 +0000
commitd5b82ec44461b7a903a88e153c8233a473252efb (patch)
tree68ebb47547bcabfb505f1fda0f0aaaa273480274 /pbx
parent5267c784dbcc31acc5b1cf824de3fc2b5ae6b161 (diff)
When a reload is issued, always process the configuration for dundi.conf.
The reason is that a reload can be used to refresh DNS lookups for defined peers. Even if the config file hasn't changed, we want to process it for that purpose. (closes issue #13776) Reported by: kombjuder git-svn-id: http://svn.digium.com/svn/asterisk/trunk@164272 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
-rw-r--r--pbx/pbx_dundi.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 7211fc955..ed4d20e07 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -4585,7 +4585,7 @@ static int set_config(char *config_file, struct sockaddr_in* sin, int reload)
struct ast_variable *v;
char *cat;
int x;
- struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
+ struct ast_flags config_flags = { 0 };
char hn[MAXHOSTNAMELEN] = "";
struct ast_hostent he;
struct hostent *hp;
@@ -4597,8 +4597,7 @@ static int set_config(char *config_file, struct sockaddr_in* sin, int reload)
if (!(cfg = ast_config_load(config_file, config_flags)) || cfg == CONFIG_STATUS_FILEINVALID) {
ast_log(LOG_ERROR, "Unable to load config %s\n", config_file);
return -1;
- } else if (cfg == CONFIG_STATUS_FILEUNCHANGED)
- return 0;
+ }
dundi_ttl = DUNDI_DEFAULT_TTL;
dundi_cache_time = DUNDI_DEFAULT_CACHE_TIME;