Skip to content

Rather than calling end_login() directly, return an error when failin… #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Castaglia wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rather than calling end_login() directly, return an error when failin… #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions mod_sql_tds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,9 +349,9 @@ MODRET cmd_open(cmd_rec *cmd){
}

if(dbinit() == FAIL){
pr_log_pri(PR_LOG_ERR, MOD_SQL_TDS_VERSION ": failed to init database. Shutting down.");
sql_log(DEBUG_WARN, "%s", " failed to init tds database! Shutting down.");
end_login(1);
sql_log(DEBUG_WARN, "%s", " failed to initialize FreeTDS library");
sql_log(DEBUG_FUNC, "%s", " <<< tds cmd_open");
return PR_ERROR_MSG(cmd, MOD_SQL_TDS_VERSION, "failed to initialize FreeTDS library");
}

sql_log(DEBUG_FUNC, "%s", "Attempting to call dblogin ");
Expand Down Expand Up @@ -381,16 +381,17 @@ MODRET cmd_open(cmd_rec *cmd){
dbloginfree(login);
sql_log(DEBUG_FUNC, "%s", "freeing our loginrec");
if(!conn->dbproc){
pr_log_pri(PR_LOG_ERR, MOD_SQL_TDS_VERSION ": failed to Login to DB server! Shutting down.");
sql_log(DEBUG_WARN, "%s", " failed to Login to DB server. Shutting down.");
end_login(1);
/* If it didn't work, return an error. */
sql_log(DEBUG_WARN, "%s", " failed to Login to DB server");
sql_log(DEBUG_FUNC, "%s", " <<< tds cmd_open");
return PR_ERROR_MSG(cmd, MOD_SQL_TDS_VERSION, "failed to login to database server");
}

sql_log(DEBUG_FUNC, "attempting to switch to database: %s", conn->db);
if(dbuse(conn->dbproc, conn->db) == FAIL){
pr_log_pri(PR_LOG_ERR, MOD_SQL_TDS_VERSION ": failed to use database Shutting down.");
sql_log(DEBUG_WARN, "%s", " failed to use database Shutting down.");
end_login(1);
sql_log(DEBUG_WARN, "%s", " failed to use database");
sql_log(DEBUG_FUNC, "%s", " <<< tds cmd_open");
return PR_ERROR_MSG(cmd, MOD_SQL_TDS_VERSION, "failed to use database");
}


Expand Down