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

@@ -82,7 +82,7 @@ privacy_exec (struct ast_channel *chan, void *data)
}
}
/*Read in the config file*/
cfg = ast_load(PRIV_CONFIG);
cfg = ast_config_load(PRIV_CONFIG);
/*Play unidentified call*/
@@ -144,7 +144,7 @@ privacy_exec (struct ast_channel *chan, void *data)
chan->priority+=100;
}
if (cfg)
ast_destroy(cfg);
ast_config_destroy(cfg);
}
LOCAL_USER_REMOVE (u);