diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-11 00:12:35 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-11 00:12:35 +0000 |
| commit | a5e941b56ea72044c4dadd9bdb8221cb919bea85 (patch) | |
| tree | 938a7378ae06da558d7c6b35c4597db2a14162cf /asterisk.c | |
| parent | 894fdbaf3ff8e922f2872750383d2f3b34914ba0 (diff) | |
Merge res_odbc and res_config
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3186 f38db490-d61c-443f-a65b-d21fe96a405b
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(); |