hhf/MySQLTuner-perl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #153 from 0xbsec/FixInfoAsk

Browse source 
Fixed asking for username/password when it's already passed.
This commit is contained in:
Jean-Marie Renouard 2016-02-14 12:38:50 +01:00
commit c6bee49dd7
1 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
mysqltuner.pl
View file

@ -492,9 +492,9 @@ sub mysql_setup {
} }
infoprint "Performing tests on $opt{host}:$opt{port}"; infoprint "Performing tests on $opt{host}:$opt{port}";
$remotestring = " -h $opt{host} -P $opt{port}"; $remotestring = " -h $opt{host} -P $opt{port}";
if (($opt{host} ne "127.0.0.1") && ($opt{host} ne "localhost")) { if (($opt{host} ne "127.0.0.1") && ($opt{host} ne "localhost")) {
$doremote = 1; $doremote = 1;
} }
} }
# Did we already get a username and password passed on the command line? # Did we already get a username and password passed on the command line?
@ -598,7 +598,7 @@ sub mysql_setup {
# Login went just fine # Login went just fine
$mysqllogin = " $remotestring "; $mysqllogin = " $remotestring ";
# Did this go well because of a .my.cnf file or is there no password set? # Did this go well because of a .my.cnf file or is there no password set?
my $userpath = `printenv HOME`; my $userpath = `printenv HOME`;
if ( length($userpath) > 0 ) { if ( length($userpath) > 0 ) {
chomp($userpath); chomp($userpath);
@ -615,13 +615,27 @@ sub mysql_setup {
badprint "Attempted to use login credentials, but they were invalid"; badprint "Attempted to use login credentials, but they were invalid";
exit 1; exit 1;
} }
my ($name, $password);
print STDERR "Please enter your MySQL administrative login: "; # If --user is defined no need to ask for username
my $name = <>; if( $opt{user} ne 0 )
print STDERR "Please enter your MySQL administrative password: "; {
system("stty -echo >$devnull 2>&1"); $name = $opt{user};
my $password = <>; }
system("stty echo >$devnull 2>&1"); else{
print STDERR "Please enter your MySQL administrative login: ";
$name = <STDIN>;
}
# If --pass is defined no need to ask for password
if( $opt{pass} ne 0 )
{
$password = $opt{pass};
}
else{
print STDERR "Please enter your MySQL administrative password: ";
system("stty -echo >$devnull 2>&1");
$password = <STDIN>;
system("stty echo >$devnull 2>&1");
}
chomp($password); chomp($password);
chomp($name); chomp($name);
$mysqllogin = "-u $name"; $mysqllogin = "-u $name";