kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

let ODBC username/password default to the ones in odbc.ini (bug #4470)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5854 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-06-06 02:43:01 +00:00
parent 1bac31d6bd
commit 236c05fc59
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cdr/cdr_odbc.c
View File

@@ -284,9 +284,6 @@ static int odbc_load_module(void)
res = -1; res = -1;
goto out; goto out;
} }
} else {
ast_log(LOG_WARNING,"cdr_odbc: username not specified. Assuming root\n");
username = "root";
} }
tmp = ast_variable_retrieve(cfg,"global","password"); tmp = ast_variable_retrieve(cfg,"global","password");
@@ -301,9 +298,6 @@ static int odbc_load_module(void)
res = -1; res = -1;
goto out; goto out;
} }
} else {
ast_log(LOG_WARNING,"cdr_odbc: database password not specified. Assuming blank\n");
password = "";
} }
tmp = ast_variable_retrieve(cfg,"global","loguniqueid"); tmp = ast_variable_retrieve(cfg,"global","loguniqueid");
@@ -352,8 +346,13 @@ static int odbc_load_module(void)
ast_config_destroy(cfg); ast_config_destroy(cfg);
if (option_verbose > 2) { if (option_verbose > 2) {
ast_verbose( VERBOSE_PREFIX_3 "cdr_odbc: dsn is %s\n",dsn); ast_verbose( VERBOSE_PREFIX_3 "cdr_odbc: dsn is %s\n",dsn);
ast_verbose( VERBOSE_PREFIX_3 "cdr_odbc: username is %s\n",username); if (username)
ast_verbose( VERBOSE_PREFIX_3 "cdr_odbc: password is [secret]\n"); {
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); ast_verbose( VERBOSE_PREFIX_3 "cdr_odbc: table is %s\n",table);
} }