[asterisk-commits] russell: branch 1.6.1 r164276 - in /branches/1.6.1: ./ pbx/pbx_dundi.c

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Dec 15 10:19:23 2008
New Revision: 164276

URL: http://svn.digium.com/view/asterisk?view=rev&rev=164276
Log:
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

........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/pbx/pbx_dundi.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/pbx/pbx_dundi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/pbx/pbx_dundi.c?view=diff&rev=164276&r1=164275&r2=164276
==============================================================================
--- branches/1.6.1/pbx/pbx_dundi.c (original)
+++ branches/1.6.1/pbx/pbx_dundi.c Mon Dec 15 10:19:23 2008
@@ -4637,7 +4637,7 @@
 	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 @@
 	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;