From 78b2952b1201314dde44f70900ec00c667859b9a Mon Sep 17 00:00:00 2001 From: Dan Breslau Date: Fri, 27 Jan 2017 11:30:03 -0500 Subject: [PATCH] Upstream freeradius had a slightly different calling sequence for opening the sqlite database and setting the busy_timeout. I think upstream is correct. --- src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c index 4b89d86..0b76d9a 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c @@ -536,9 +536,7 @@ static sql_rcode_t sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *c INFO("rlm_sql_sqlite: Opening SQLite database \"%s\"", driver->filename); #ifdef HAVE_SQLITE3_OPEN_V2 status = sqlite3_open_v2(driver->filename, &(conn->db), SQLITE_OPEN_READWRITE | SQLITE_OPEN_NOMUTEX, NULL); - sqlite3_busy_timeout( conn->db, 200); /*wait up to 200 ms for db locks*/ #else - status = sqlite3_open(driver->filename, &(conn->db)); #endif -- 2.1.4