database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-05 16:15:50 +03:00
Code Activity

MCOL-1498 - add prompt for password on non-distibute installs

Browse Source
This commit is contained in:
David Hill
2018-08-02 11:51:27 -05:00
parent 5d245c8932
commit 0837f9a520
1 changed files with 33 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
oamapps/postConfigure/postConfigure.cpp
View File

@@ -3104,57 +3104,53 @@ int main(int argc, char *argv[])
} }
if ( IserverTypeInstall != oam::INSTALL_COMBINE_DM_UM_PM || if ( IserverTypeInstall != oam::INSTALL_COMBINE_DM_UM_PM ||
pmNumber > 1 ) { pmNumber > 1 )
{
if ( password.empty() ) if ( password.empty() )
{ {
cout << endl; cout << endl;
cout << "Next step is to enter the password to access the other Servers." << endl; cout << "Next step is to enter the password to access the other Servers." << endl;
cout << "This is either your password or you can default to using a ssh key" << endl; cout << "This is either your password or you can default to using a ssh key" << endl;
cout << "If using a password, the password needs to be the same on all Servers." << endl << endl; cout << "If using a password, the password needs to be the same on all Servers." << endl << endl;
}
while(true)
{
char *pass1, *pass2;
if ( noPrompting ) { if ( noPrompting ) {
cout << "Enter password, hit 'enter' to default to using a ssh key, or 'exit' > " << endl; cout << "Enter password, hit 'enter' to default to using a ssh key, or 'exit' > " << endl;
if ( password.empty() )
password = "ssh";
break;
}
//check for command line option password
//if ( !password.empty() )
// break;
pass1=getpass("Enter password, hit 'enter' to default to using a ssh key, or 'exit' > ");
if ( strcmp(pass1, "") == 0 ) {
password = "ssh"; password = "ssh";
break;
} }
else
{
while(true)
{
char *pass1, *pass2;
string p1 = pass1; pass1=getpass("Enter password, hit 'enter' to default to using a ssh key, or 'exit' > ");
if ( p1 == "exit") if ( strcmp(pass1, "") == 0 ) {
exit(0); password = "ssh";
break;
}
pass2=getpass("Confirm password > "); string p1 = pass1;
string p2 = pass2; if ( p1 == "exit")
if ( p1 == p2 ) { exit(0);
password = p2;
break;
}
else
cout << "Password mismatch, please re-enter" << endl;
}
//add single quote for special characters pass2=getpass("Confirm password > ");
if ( password != "ssh" ) string p2 = pass2;
{ if ( p1 == p2 ) {
password = "'" + password + "'"; password = p2;
} break;
}
else
cout << "Password mismatch, please re-enter" << endl;
}
//add single quote for special characters
if ( password != "ssh" )
{
password = "'" + password + "'";
}
}
}
} }
int thread_id = 0; int thread_id = 0;
@@ -3229,67 +3225,8 @@ int main(int argc, char *argv[])
if( !pkgCheck(columnstorePackage) ) if( !pkgCheck(columnstorePackage) )
exit(1); exit(1);
/* if ( password.empty() )
{
cout << endl;
cout << "Next step is to enter the password to access the other Servers." << endl;
cout << "This is either your password or you can default to using a ssh key" << endl;
cout << "If using a password, the password needs to be the same on all Servers." << endl << endl;
}
while(true)
{
char *pass1, *pass2;
if ( noPrompting ) {
cout << "Enter password, hit 'enter' to default to using a ssh key, or 'exit' > " << endl;
if ( password.empty() )
password = "ssh";
break;
}
//check for command line option password
if ( !password.empty() )
break;
pass1=getpass("Enter password, hit 'enter' to default to using a ssh key, or 'exit' > ");
if ( strcmp(pass1, "") == 0 ) {
password = "ssh";
break;
}
if ( pass1 == "exit")
exit(0);
string p1 = pass1;
pass2=getpass("Confirm password > ");
string p2 = pass2;
if ( p1 == p2 ) {
password = p2;
break;
}
else
cout << "Password mismatch, please re-enter" << endl;
}
//add single quote for special characters
if ( password != "ssh" )
{
password = "'" + password + "'";
}
*/
checkSystemMySQLPort(mysqlPort, sysConfig, USER, password, childmodulelist, IserverTypeInstall, pmwithum); checkSystemMySQLPort(mysqlPort, sysConfig, USER, password, childmodulelist, IserverTypeInstall, pmwithum);
/* if ( ( IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM ) ||
( (IserverTypeInstall != oam::INSTALL_COMBINE_DM_UM_PM) && pmwithum ) )
{
cout << endl << "===== Running the MariaDB ColumnStore MariaDB ColumnStore setup scripts =====" << endl << endl;
// call the mysql setup scripts
mysqlSetup();
sleep(5);
}
*/
string AmazonInstall = "0"; string AmazonInstall = "0";
if ( amazonInstall ) if ( amazonInstall )
AmazonInstall = "1"; AmazonInstall = "1";
@@ -3467,19 +3404,7 @@ int main(int argc, char *argv[])
cout << " DONE" << endl; cout << " DONE" << endl;
} }
} }
/* else
{
if ( ( IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM ) ||
( (IserverTypeInstall != oam::INSTALL_COMBINE_DM_UM_PM) && pmwithum ) )
{
cout << endl << "===== Running the MariaDB ColumnStore MariaDB ColumnStore setup scripts =====" << endl << endl;
// call the mysql setup scripts
mysqlSetup();
sleep(5);
}
}
*/
//configure data redundancy //configure data redundancy
if (DataRedundancy) if (DataRedundancy)
{ {