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

@@ -876,7 +876,7 @@ static int read_agent_config(void)
autologoff = 0;
wrapuptime = 0;
ackcall = 1;
cfg = ast_load(config);
cfg = ast_config_load(config);
if (!cfg) {
ast_log(LOG_NOTICE, "No agent configuration found -- agent support disabled\n");
return 0;
@@ -988,7 +988,7 @@ static int read_agent_config(void)
p = pn;
}
ast_mutex_unlock(&agentlock);
ast_destroy(cfg);
ast_config_destroy(cfg);
return 0;
}