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

@@ -1728,7 +1728,7 @@ int reload_config(void)
char *cat;
char *utype;
cfg = ast_load(config);
cfg = ast_config_load(config);
/* We *must* have a config file otherwise stop immediately */
if (!cfg) {
@@ -1867,7 +1867,7 @@ int reload_config(void)
}
cat = ast_category_browse(cfg, cat);
}
ast_destroy(cfg);
ast_config_destroy(cfg);
/* Register our H.323 aliases if any*/
while (alias) {