diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-15 16:19:23 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-15 16:19:23 +0000 |
| commit | ffdd73758e20259854948081484125724fb908ff (patch) | |
| tree | 8058784299137d25b27588fb51c389774b2d2550 /pbx | |
| parent | eb85ac3e1325ce05564277952aabda05bde9d415 (diff) | |
Merged revisions 164272 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r164272 | russell | 2008-12-15 10:17:55 -0600 (Mon, 15 Dec 2008) | 8 lines
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/branches/1.6.1@164276 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/pbx_dundi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index b505690e0..da2fcf089 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -4637,7 +4637,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; @@ -4649,8 +4649,7 @@ static int set_config(char *config_file, struct sockaddr_in* sin, int reload) if (!(cfg = ast_config_load(config_file, config_flags))) { 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; |