Merge 10.3 into 10.4

3 files changed, 4 insertions, 5 deletions

diff --git a/support-files/policy/apparmor/usr.sbin.mysqld b/support-files/policy/apparmor/usr.sbin.mysqld
index 05ec77414d2..6555c614889 100644
--- a/support-files/policy/apparmor/usr.sbin.mysqld
+++ b/support-files/policy/apparmor/usr.sbin.mysqld
@@ -101,13 +101,12 @@
     /usr/bin/cut rix,
     /usr/bin/dirname rix,
     /usr/bin/gawk rix,
-    /usr/bin/innobackupex rix,
     /usr/bin/mysql rix,
     /usr/bin/perl rix,
     /usr/bin/seq rix,
     /usr/bin/wsrep_sst* rix,
     /usr/bin/wsrep_sst_common r,
-    /usr/bin/xtrabackup* rix,
+    /usr/bin/mariabackup* rix,
     /var/lib/mysql/ r,
     /var/lib/mysql/** rw,
     /var/lib/mysql/*.log w,
diff --git a/support-files/policy/selinux/mariadb-server.fc b/support-files/policy/selinux/mariadb-server.fc
index 409f72923aa..e3f2b5015c7 100644
--- a/support-files/policy/selinux/mariadb-server.fc
+++ b/support-files/policy/selinux/mariadb-server.fc
@@ -6,5 +6,5 @@
 /var/lib/mysql/.*\.err --  gen_context(system_u:object_r:mysqld_log_t,s0)
 /var/lib/mysql/.*\.pid -- gen_context(system_u:object_r:mysqld_var_run_t,s0)
 /var/lib/mysql/.*\.cnf	--  gen_context(system_u:object_r:mysqld_etc_t,s0)
-/usr/bin/xtrabackup.* -- gen_context(system_u:object_r:mysqld_exec_t,s0)
+/usr/bin/mariabackup.* -- gen_context(system_u:object_r:mysqld_exec_t,s0)
 /usr/bin/wsrep.*  -- gen_context(system_u:object_r:mysqld_safe_exec_t,s0)
diff --git a/support-files/policy/selinux/mariadb-server.te b/support-files/policy/selinux/mariadb-server.te
index 45ef40f4153..71924012283 100644
--- a/support-files/policy/selinux/mariadb-server.te
+++ b/support-files/policy/selinux/mariadb-server.te
@@ -78,7 +78,7 @@ allow mysqld_t user_tmp_t:file create;
 allow mysqld_t bin_t:lnk_file read;
 allow mysqld_t tmp_t:file { append create read write open getattr unlink setattr };
 
-# Allows too much leeway - the xtrabackup/wsrep rules in fc should fix it, but
+# Allows too much leeway - the mariabackup/wsrep rules in fc should fix it, but
 # keep for the moment.
 allow mysqld_t shell_exec_t:file { execute_no_trans getattr read execute open };
 allow mysqld_t bin_t:file { getattr read execute open execute_no_trans ioctl };
@@ -93,7 +93,7 @@ allow mysqld_t tram_port_t:tcp_socket name_bind;
 # This rule allows port udp/4567 (see README)
 allow mysqld_t mysqld_port_t:udp_socket name_bind;
 
-# Rules related to XtraBackup
+# Rules related to mariabackup
 allow mysqld_t self:netlink_tcpdiag_socket { create nlmsg_read };
 allow mysqld_t sysctl_net_t:file { read getattr open };