From 120a0e33855c6eadeb828340c6ef45bb8778b83a Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 22 Jan 2013 10:26:51 -0600 Subject: [PATCH] make it back-compat as possible instead --- src/mod/languages/mod_lua/freeswitch_lua.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/mod/languages/mod_lua/freeswitch_lua.cpp b/src/mod/languages/mod_lua/freeswitch_lua.cpp index 9158969e01..316ddf30a9 100644 --- a/src/mod/languages/mod_lua/freeswitch_lua.cpp +++ b/src/mod/languages/mod_lua/freeswitch_lua.cpp @@ -335,9 +335,17 @@ switch_status_t Session::run_dtmf_callback(void *input, switch_input_type_t ityp Dbh::Dbh(char *dsn, char *user, char *pass) { dbh = NULL; - + char *tmp = NULL; + if (!zstr(user) || !zstr(pass)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "user and pass params have been removed. Please specify the user and pass in the DSN.\n"); + tmp = switch_mprintf("%s%s%s%s%s", dsn, + zstr(user) ? "" : ",uid=", + zstr(user) ? "" : user, + zstr(pass) ? "" : ",pwd=", + zstr(pass) ? "" : pass + ); + + dsn = tmp; } if (switch_cache_db_get_db_handle_dsn(&dbh, dsn) == SWITCH_STATUS_SUCCESS) { @@ -345,6 +353,9 @@ Dbh::Dbh(char *dsn, char *user, char *pass) } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Connection failed. DBH NOT Connected.\n"); } + + switch_safe_free(tmp); + } Dbh::~Dbh()