version 1.49, 2018/10/26 17:49:14
|
version 1.51, 2019/02/19 19:14:54
|
Line 2368 CREATE TABLE IF NOT EXISTS metadata (tit
|
Line 2368 CREATE TABLE IF NOT EXISTS metadata (tit
|
sub setup_mysql_permissions { |
sub setup_mysql_permissions { |
my ($dbh,$has_pass,@mysql_lc_commands) = @_; |
my ($dbh,$has_pass,@mysql_lc_commands) = @_; |
my ($mysqlversion,$mysqlsubver,$mysqlname) = &get_mysql_version(); |
my ($mysqlversion,$mysqlsubver,$mysqlname) = &get_mysql_version(); |
my ($usesauth,$hasauthcol,@mysql_commands); |
my ($usesauth,$is_mariadb,$hasauthcol,@mysql_commands); |
if ($mysqlname =~ /^MariaDB/i) { |
if ($mysqlname =~ /^MariaDB/i) { |
|
$is_mariadb = 1; |
if ($mysqlversion >= 10.2) { |
if ($mysqlversion >= 10.2) { |
$usesauth = 1; |
$usesauth = 1; |
} elsif ($mysqlversion >= 5.5) { |
} elsif ($mysqlversion >= 5.5) { |
Line 2383 sub setup_mysql_permissions {
|
Line 2384 sub setup_mysql_permissions {
|
} |
} |
} |
} |
if ($usesauth) { |
if ($usesauth) { |
@mysql_commands = ("INSERT user (Host, User, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www','','','','')", |
@mysql_commands = ("INSERT user (Host, User, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www','','','','')"); |
"ALTER USER 'www'\@'localhost' IDENTIFIED BY 'localhostkey'"); |
if ($is_mariadb) { |
|
push(@mysql_commands,"ALTER USER 'www'\@'localhost' IDENTIFIED BY 'localhostkey'"); |
|
} else { |
|
push(@mysql_commands,"ALTER USER 'www'\@'localhost' IDENTIFIED WITH mysql_native_password BY 'localhostkey'"); |
|
} |
} elsif ($hasauthcol) { |
} elsif ($hasauthcol) { |
@mysql_commands = ("INSERT user (Host, User, Password, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www',password('localhostkey'),'','','','');"); |
@mysql_commands = ("INSERT user (Host, User, Password, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www',password('localhostkey'),'','','','');"); |
} else { |
} else { |
Line 2439 INSERT db (Host,Db,User,Select_priv,Inse
|
Line 2444 INSERT db (Host,Db,User,Select_priv,Inse
|
} |
} |
} |
} |
if ($got_passwd) { |
if ($got_passwd) { |
my (@newpass_cmds) = &new_mysql_rootpasswd($newmysqlpass,$usesauth); |
my (@newpass_cmds) = &new_mysql_rootpasswd($newmysqlpass,$usesauth,$is_mariadb); |
push(@mysql_commands,@newpass_cmds); |
push(@mysql_commands,@newpass_cmds); |
} else { |
} else { |
print_and_log(&mt('Failed to get MySQL root password from user input.')."\n"); |
print_and_log(&mt('Failed to get MySQL root password from user input.')."\n"); |
Line 2469 INSERT db (Host,Db,User,Select_priv,Inse
|
Line 2474 INSERT db (Host,Db,User,Select_priv,Inse
|
} |
} |
|
|
sub new_mysql_rootpasswd { |
sub new_mysql_rootpasswd { |
my ($currmysqlpass,$usesauth) = @_; |
my ($currmysqlpass,$usesauth,$is_mariadb) = @_; |
if ($usesauth) { |
if ($usesauth) { |
return ("ALTER USER 'root'\@'localhost' IDENTIFIED BY '$currmysqlpass'", |
if ($is_mariadb) { |
"FLUSH PRIVILEGES;"); |
return ("ALTER USER 'root'\@'localhost' IDENTIFIED BY '$currmysqlpass'", |
|
"FLUSH PRIVILEGES;"); |
|
} else { |
|
return ("ALTER USER 'root'\@'localhost' IDENTIFIED WITH mysql_native_password BY '$currmysqlpass'", |
|
"FLUSH PRIVILEGES;"); |
|
} |
} else { |
} else { |
return ("SET PASSWORD FOR 'root'\@'localhost'=PASSWORD('$currmysqlpass')", |
return ("SET PASSWORD FOR 'root'\@'localhost'=PASSWORD('$currmysqlpass')", |
"FLUSH PRIVILEGES;"); |
"FLUSH PRIVILEGES;"); |