diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-06-06 02:43:01 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-06-06 02:43:01 +0000 |
| commit | 42b7c567777aacf352bdf359cd7b27e8f1a644a9 (patch) | |
| tree | 99debb5668c65adad0a0082a7afd3d6972bdfa95 /cdr | |
| parent | 7b1b9f53ef47abd82c6faba12f4adcf721e622da (diff) | |
let ODBC username/password default to the ones in odbc.ini (bug #4470)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5854 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr')
| -rwxr-xr-x | cdr/cdr_odbc.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c index c31fb63f3..b654f6bd6 100755 --- a/cdr/cdr_odbc.c +++ b/cdr/cdr_odbc.c @@ -284,9 +284,6 @@ static int odbc_load_module(void) res = -1; goto out; } - } else { - ast_log(LOG_WARNING,"cdr_odbc: username not specified. Assuming root\n"); - username = "root"; } tmp = ast_variable_retrieve(cfg,"global","password"); @@ -301,9 +298,6 @@ static int odbc_load_module(void) res = -1; goto out; } - } else { - ast_log(LOG_WARNING,"cdr_odbc: database password not specified. Assuming blank\n"); - password = ""; } tmp = ast_variable_retrieve(cfg,"global","loguniqueid"); @@ -352,8 +346,13 @@ static int odbc_load_module(void) ast_config_destroy(cfg); if (option_verbose > 2) { ast_verbose( VERBOSE_PREFIX_3 "cdr_odbc: dsn is %s\n",dsn); - ast_verbose( VERBOSE_PREFIX_3 "cdr_odbc: username is %s\n",username); - ast_verbose( VERBOSE_PREFIX_3 "cdr_odbc: password is [secret]\n"); + if (username) + { + ast_verbose( VERBOSE_PREFIX_3 "cdr_odbc: username is %s\n",username); + ast_verbose( VERBOSE_PREFIX_3 "cdr_odbc: password is [secret]\n"); + } + else + ast_verbose( VERBOSE_PREFIX_3 "cdr_odbc: retreiving username and password from odbc config\n"); ast_verbose( VERBOSE_PREFIX_3 "cdr_odbc: table is %s\n",table); } |