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

Merge branch '2.4.0' into 2.4

Browse Source
This commit is contained in:
Esa Korhonen
2019-06-28 17:47:55 +03:00
parent eb73268cec 3939fdec5b
commit 5dca53f877
24 changed files with 305 additions and 830 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

@ -112,7 +112,7 @@ PamClientSession* PamClientSession::create(const PamInstance& inst)
}
PamClientSession* rval = NULL;
if (!error && ((rval = new(std::nothrow) PamClientSession(dbhandle, inst)) == NULL))
if (!error && ((rval = new (std::nothrow) PamClientSession(dbhandle, inst)) == NULL))
{
error = true;
}

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

@ -56,8 +56,8 @@ PamInstance* PamInstance::create(char** options)
bool error = false;
/* This handle may be used from multiple threads, set full mutex. */
sqlite3* dbhandle = NULL;
int db_flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE
| SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_FULLMUTEX;
int db_flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE |
SQLITE_OPEN_SHAREDCACHE | SQLITE_OPEN_FULLMUTEX;
const char* filename = pam_db_fname.c_str();
if (sqlite3_open_v2(filename, &dbhandle, db_flags, NULL) != SQLITE_OK)
{
@ -74,7 +74,7 @@ PamInstance* PamInstance::create(char** options)
error = true;
}
char* err = NULL;
char *err = NULL;
if (!error && sqlite3_exec(dbhandle, drop_sql.c_str(), NULL, NULL, &err) != SQLITE_OK)
{
MXS_ERROR("Failed to drop table: '%s'", err);
@ -88,9 +88,9 @@ PamInstance* PamInstance::create(char** options)
error = true;
}
PamInstance* instance = NULL;
if (!error
&& ((instance = new(std::nothrow) PamInstance(dbhandle, pam_db_fname, pam_table_name)) == NULL))
PamInstance *instance = NULL;
if (!error &&
((instance = new (std::nothrow) PamInstance(dbhandle, pam_db_fname, pam_table_name)) == NULL))
{
error = true;
}