--- rpms/smeserver-automysqlbackup/contribs9/smeserver-automysqlbackup-3.0.RC6-bz10806.errorsAndCreateUsers.patch	2019/11/26 17:18:49	1.2
+++ rpms/smeserver-automysqlbackup/contribs9/smeserver-automysqlbackup-3.0.RC6-bz10806.errorsAndCreateUsers.patch	2019/11/26 18:26:54	1.4
@@ -406,7 +406,7 @@ diff -Nur smeserver-automysqlbackup-3.0.
 diff -Nur smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init/automysqlbackup smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init/automysqlbackup
 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init/automysqlbackup	1969-12-31 19:00:00.000000000 -0500
 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init/automysqlbackup	2019-10-02 22:15:09.804000000 -0400
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,37 @@
 +{
 +my $user = $automysqlbackup{'DbUser'} || 'backupuser';
 +my $pass = $automysqlbackup{'DbPassword'} || 'automysqlbackup';
@@ -432,7 +432,9 @@ diff -Nur smeserver-automysqlbackup-3.0.
 +                     PASSWORD ('$pass'));
 +
 +
-+GRANT EVENT,SELECT,LOCK TABLES ON *.* TO 'backupuser'\@'localhost' ;
++REVOKE ALL PRIVILEGES ON *.* FROM '$user'\@'localhost';
++REVOKE GRANT OPTION ON *.* FROM '$user'\@'localhost';
++GRANT EVENT,SELECT,LOCK TABLES, SHOW VIEW ON *.* TO '$user'\@'localhost' ;
 +
 +
 +FLUSH PRIVILEGES;
@@ -445,7 +447,7 @@ diff -Nur smeserver-automysqlbackup-3.0.
 diff -Nur smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init55/automysqlbackup smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init55/automysqlbackup
 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init55/automysqlbackup	1969-12-31 19:00:00.000000000 -0500
 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init55/automysqlbackup	2019-10-02 22:15:59.323000000 -0400
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,37 @@
 +{
 +my $user = $automysqlbackup{'DbUser'} || 'backupuser';
 +my $pass = $automysqlbackup{'DbPassword'} || 'automysqlbackup';
@@ -471,7 +473,9 @@ diff -Nur smeserver-automysqlbackup-3.0.
 +                     PASSWORD ('$pass'));
 +
 +
-+GRANT EVENT,SELECT,LOCK TABLES ON *.* TO 'backupuser'\@'localhost' ;
++REVOKE ALL PRIVILEGES ON *.* FROM '$user'\@'localhost';
++REVOKE GRANT OPTION ON *.* FROM '$user'\@'localhost';
++GRANT EVENT,SELECT,LOCK TABLES, SHOW VIEW ON *.* TO '$user'\@'localhost' ;
 +
 +
 +FLUSH PRIVILEGES;
@@ -484,7 +488,7 @@ diff -Nur smeserver-automysqlbackup-3.0.
 diff -Nur smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init57/automysqlbackup smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init57/automysqlbackup
 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init57/automysqlbackup	1969-12-31 19:00:00.000000000 -0500
 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init57/automysqlbackup	2019-10-02 22:13:28.624000000 -0400
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,43 @@
 +{
 +my $user = $automysqlbackup{'DbUser'} || 'backupuser';
 +my $pass = $automysqlbackup{'DbPassword'} || 'automysqlbackup';
@@ -503,14 +507,22 @@ diff -Nur smeserver-automysqlbackup-3.0.
 +REPLACE INTO user (
 +                     host,
 +                     user,
-+                     authentication_string)
++                     authentication_string,
++                     ssl_cipher,
++                     x509_issuer,
++                     x509_subject)
 +            VALUES (
 +                     'localhost',
 +                     '$user',
-+                     PASSWORD ('$pass'));
++                     PASSWORD ('$pass'),
++                     '',
++                     '',
++                     '');
 +
 +
-+GRANT EVENT,SELECT,LOCK TABLES ON *.* TO 'backupuser'\@'localhost' ;
++REVOKE ALL PRIVILEGES ON *.* FROM '$user'\@'localhost';
++REVOKE GRANT OPTION ON *.* FROM '$user'\@'localhost';
++GRANT EVENT,SELECT,LOCK TABLES, SHOW VIEW ON *.* TO '$user'\@'localhost' ;
 +
 +
 +FLUSH PRIVILEGES;