automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@45944 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-10-23 01:04:59 +00:00
parent ab1188c1f2
commit d7a7695b91

View File

@@ -341,7 +341,6 @@ static int odbc_load_module(void)
goto out; goto out;
} }
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);
if (username) if (username)
@@ -366,6 +365,8 @@ static int odbc_load_module(void)
ast_log(LOG_ERROR, "cdr_odbc: Unable to register ODBC CDR handling\n"); ast_log(LOG_ERROR, "cdr_odbc: Unable to register ODBC CDR handling\n");
} }
out: out:
if (cfg)
ast_config_destroy(cfg);
ast_mutex_unlock(&odbc_lock); ast_mutex_unlock(&odbc_lock);
return res; return res;
} }