diff options
| author | Mark Spencer <markster@digium.com> | 2004-06-11 00:12:35 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2004-06-11 00:12:35 +0000 |
| commit | c96b39a960d89638ef0fd94f622bee9cb7875429 (patch) | |
| tree | 938a7378ae06da558d7c6b35c4597db2a14162cf /asterisk.c | |
| parent | 758f246390f1c9353c0d79766d7f59dcb39ca60e (diff) | |
Merge res_odbc and res_config
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3186 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'asterisk.c')
| -rwxr-xr-x | asterisk.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/asterisk.c b/asterisk.c index 5894da1a8..76636ae43 100755 --- a/asterisk.c +++ b/asterisk.c @@ -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(); |