From ea7dd7e5683834c70f3b73ef7889f6add025f051 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Mon, 15 Dec 2008 16:19:23 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@164276 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- pbx/pbx_dundi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index b505690e08..da2fcf089c 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;