hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Esa Korhonen
2019-06-14 10:49:51 +03:00
parent 2accfad329 acfaae9d46
commit cf866a6a57
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/authenticator/PAM/PAMAuth/pam_client_session.cc
View File

@ -260,7 +260,7 @@ PamClientSession* PamClientSession::create(const PamInstance& inst)
{ {
// This handle is only used from one thread, can define no_mutex. // This handle is only used from one thread, can define no_mutex.
sqlite3* dbhandle = NULL; sqlite3* dbhandle = NULL;
int db_flags = SQLITE_OPEN_READONLY | SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_NOMUTEX; int db_flags = SQLITE_OPEN_URI | SQLITE_OPEN_READONLY | SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_NOMUTEX;
if (sqlite3_open_v2(inst.m_dbname.c_str(), &dbhandle, db_flags, NULL) == SQLITE_OK) if (sqlite3_open_v2(inst.m_dbname.c_str(), &dbhandle, db_flags, NULL) == SQLITE_OK)
{ {
sqlite3_busy_timeout(dbhandle, 1000); sqlite3_busy_timeout(dbhandle, 1000);

2
server/modules/authenticator/PAM/PAMAuth/pam_instance.cc
View File

@ -56,7 +56,7 @@ PamInstance* PamInstance::create(char** options)
bool error = false; bool error = false;
/* This handle may be used from multiple threads, set full mutex. */ /* This handle may be used from multiple threads, set full mutex. */
sqlite3* dbhandle = NULL; sqlite3* dbhandle = NULL;
int db_flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE int db_flags = SQLITE_OPEN_URI | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE
| SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_FULLMUTEX; | SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_FULLMUTEX;
if (sqlite3_open_v2(pam_db_name.c_str(), &dbhandle, db_flags, NULL) != SQLITE_OK) if (sqlite3_open_v2(pam_db_name.c_str(), &dbhandle, db_flags, NULL) != SQLITE_OK)
{ {