database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

mcol-943

Browse Source
This commit is contained in:
david hill
2017-10-19 15:48:39 -05:00
parent 9f8c57e2de
commit 5c34be958b
17 changed files with 155 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
oam/oamcpp/liboamcpp.cpp
View File

@ -1260,10 +1260,10 @@ namespace oam
*
********************************************************************/
void Oam::addModule(DeviceNetworkList devicenetworklist, const std::string password, const std::string mysqlpw)
void Oam::addModule(DeviceNetworkList devicenetworklist, const std::string password)
{
// build and send msg
int returnStatus = sendMsgToProcMgr2(ADDMODULE, devicenetworklist, FORCEFUL, ACK_YES, password, mysqlpw);
int returnStatus = sendMsgToProcMgr2(ADDMODULE, devicenetworklist, FORCEFUL, ACK_YES, password);
if (returnStatus != API_SUCCESS)
exceptionControl("addModule", returnStatus);
@ -8550,22 +8550,10 @@ namespace oam
* purpose: check and get mysql user password
*
******************************************************************************************/
std::string Oam::getMySQLPassword(bool bypassConfig)
std::string Oam::getMySQLPassword()
{
if ( !bypassConfig )
{
string MySQLPasswordConfig;
try {
getSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
}
catch(...) {
MySQLPasswordConfig = "n";
}
string mysqlUser = "root";
if ( MySQLPasswordConfig == "n" )
return oam::UnassignedName;
}
string USER = "root";
char* p= getenv("USER");
if (p && *p)
@ -8578,10 +8566,15 @@ namespace oam
string fileName = HOME + "/.my.cnf";
writeLog("getMySQLPassword: checking: " + fileName, LOG_TYPE_DEBUG);
ifstream file (fileName.c_str());
if (!file)
{
writeLog("getMySQLPassword: doesn't exist: " + fileName, LOG_TYPE_DEBUG);
exceptionControl("getMySQLPassword", API_FILE_OPEN_ERROR);
}
char line[400];
string buf;
@ -8589,8 +8582,8 @@ namespace oam
while (file.getline(line, 400))
{
buf = line;
string::size_type pos = buf.find(USER,0);
string::size_type pos = buf.find(mysqlUser,0);
if (pos != string::npos)
{
file.getline(line, 400);
@ -8602,24 +8595,23 @@ namespace oam
string::size_type pos1 = buf.find("=",pos);
if (pos1 != string::npos) {
//password found
if ( bypassConfig )
{
try {
setSystemConfig("MySQLPasswordConfig", "y");
}
catch(...) {}
}
string password = buf.substr(pos1+2, 80);
string password = buf.substr(pos1+1, 80);
password.erase(remove_if(password.begin(), password.end(), ::isspace), password.end());
writeLog("getMySQLPassword: password found", LOG_TYPE_DEBUG);
return password;
}
}
break;
}
}
file.close();
writeLog("getMySQLPassword: no password found", LOG_TYPE_DEBUG);
exceptionControl("getMySQLPassword", API_FAILURE);
return oam::UnassignedName;
}

4
oam/oamcpp/liboamcpp.h
View File

@ -1468,7 +1468,7 @@ namespace oam
* @param DeviceNetworkConfig the Modules added
* @param password Host Root Password
*/
EXPORT void addModule(DeviceNetworkList devicenetworklist, const std::string password, const std::string mysqlpw);
EXPORT void addModule(DeviceNetworkList devicenetworklist, const std::string password);
/** @brief remove Module
*
@ -2449,7 +2449,7 @@ namespace oam
/** @brief check and get mysql user password
*/
EXPORT std::string getMySQLPassword(bool bypassConfig = false);
EXPORT std::string getMySQLPassword();
/** @brief update fstab with dbroot mounts
*/