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

@@ -747,7 +747,7 @@ static int load_config(void)
/* Read in the config file */
cfg = ast_load(ALMRCV_CONFIG);
cfg = ast_config_load(ALMRCV_CONFIG);
if(!cfg){
@@ -817,7 +817,7 @@ static int load_config(void)
strncpy(db_family, p, sizeof(db_family) - 1);
db_family[sizeof(db_family) - 1] = '\0';
}
ast_destroy(cfg);
ast_config_destroy(cfg);
}
return 0;