kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge res_odbc and res_config

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3186 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-06-11 00:12:35 +00:00
parent 758f246390
commit c96b39a960
11 changed files with 1176 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
asterisk.c
View File

@@ -48,6 +48,7 @@
#include "editline/histedit.h"
#include "asterisk.h"
#include <asterisk/config.h>
#include <asterisk/config_pvt.h>
#if defined(__FreeBSD__)
#include <netdb.h>
@@ -1556,6 +1557,13 @@ int main(int argc, char *argv[])
ast_verbose("[ Reading Master Configuration ]");
ast_readconfig();
if (option_console && !option_verbose)
ast_verbose("[ Initializing Custom Configuration Options]");
/* custom config setup */
register_config_cli();
read_ast_cust_config();
if (option_console) {
if (el_hist == NULL || el == NULL)
ast_el_initialize();