Merge config updates (bug #3406)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-01-25 06:10:20 +00:00
parent a611ce04f1
commit 5f726ad8c7
49 changed files with 881 additions and 856 deletions

View File

@@ -4446,7 +4446,7 @@ static int set_config(char *config_file, struct sockaddr_in* sin)
dundi_eid testeid;
dundi_ttl = DUNDI_DEFAULT_TTL;
cfg = ast_load(config_file);
cfg = ast_config_load(config_file);
if (!cfg) {
@@ -4569,7 +4569,7 @@ static int set_config(char *config_file, struct sockaddr_in* sin)
cat = ast_category_browse(cfg, cat);
}
prune_peers();
ast_destroy(cfg);
ast_config_destroy(cfg);
load_password();
if (globalpcmodel & DUNDI_MODEL_OUTBOUND)
dundi_precache_full();