mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
Merge trift2.:/MySQL/M50/bug12676-5.0
into trift2.:/MySQL/M50/push-5.0 configure.in: Auto merged
This commit is contained in:
unknown
commit
30b9028280
5 changed files with 184 additions and 3 deletions
|
|
@ -2873,7 +2873,8 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
|
|||
include/Makefile sql-bench/Makefile dnl
|
||||
server-tools/Makefile server-tools/instance-manager/Makefile dnl
|
||||
tests/Makefile Docs/Makefile support-files/Makefile dnl
|
||||
support-files/MacOSX/Makefile mysql-test/Makefile dnl
|
||||
support-files/MacOSX/Makefile support-files/RHEL4-SElinux/Makefile dnl
|
||||
mysql-test/Makefile dnl
|
||||
netware/Makefile dnl
|
||||
include/mysql_version.h dnl
|
||||
cmd-line-utils/Makefile dnl
|
||||
|
|
|
|||
|
|
@ -30,13 +30,13 @@ EXTRA_DIST = mysql.spec.sh \
|
|||
MySQL-shared-compat.spec.sh \
|
||||
ndb-config-2-node.ini.sh
|
||||
|
||||
SUBDIRS = MacOSX
|
||||
SUBDIRS = MacOSX RHEL4-SElinux
|
||||
|
||||
pkgdata_DATA = my-small.cnf \
|
||||
my-medium.cnf \
|
||||
my-large.cnf \
|
||||
my-huge.cnf \
|
||||
my-innodb-heavy-4G.cnf \
|
||||
my-innodb-heavy-4G.cnf \
|
||||
mysql-log-rotate \
|
||||
binary-configure \
|
||||
ndb-config-2-node.ini
|
||||
|
|
|
|||
23
support-files/RHEL4-SElinux/Makefile.am
Normal file
23
support-files/RHEL4-SElinux/Makefile.am
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
# Copyright (C) 2000-2001, 2003-2006 MySQL AB
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Library General Public
|
||||
# License as published by the Free Software Foundation; version 2
|
||||
# of the License.
|
||||
#
|
||||
# This library is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# Library General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Library General Public
|
||||
# License along with this library; if not, write to the Free
|
||||
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
||||
# MA 02111-1307, USA
|
||||
|
||||
## Process this file with automake to create Makefile.in
|
||||
|
||||
EXTRA_DIST = mysql.fc mysql.te
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
25
support-files/RHEL4-SElinux/mysql.fc
Normal file
25
support-files/RHEL4-SElinux/mysql.fc
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
# MySQL Database Server
|
||||
|
||||
#
|
||||
# /etc
|
||||
#
|
||||
/etc/my\.cnf -- gen_context(system_u:object_r:mysqld_etc_t,s0)
|
||||
/etc/mysql(/.*)? gen_context(system_u:object_r:mysqld_etc_t,s0)
|
||||
|
||||
#
|
||||
# /usr
|
||||
# Red Hat compatibility
|
||||
/usr/libexec/mysqld -- gen_context(system_u:object_r:mysqld_exec_t,s0)
|
||||
|
||||
# MySQL AB compatibility
|
||||
/usr/sbin/mysqld(-max)? -- gen_context(system_u:object_r:mysqld_exec_t,s0)
|
||||
|
||||
#
|
||||
# /var
|
||||
#
|
||||
/var/lib/mysql(/.*)? gen_context(system_u:object_r:mysqld_db_t,s0)
|
||||
/var/lib/mysql/mysql\.sock -s gen_context(system_u:object_r:mysqld_var_run_t,s0)
|
||||
|
||||
/var/log/mysql.* -- gen_context(system_u:object_r:mysqld_log_t,s0)
|
||||
|
||||
/var/run/mysqld(/.*)? gen_context(system_u:object_r:mysqld_var_run_t,s0)
|
||||
132
support-files/RHEL4-SElinux/mysql.te
Normal file
132
support-files/RHEL4-SElinux/mysql.te
Normal file
|
|
@ -0,0 +1,132 @@
|
|||
|
||||
policy_module(mysql,1.0.0)
|
||||
|
||||
########################################
|
||||
#
|
||||
# Declarations
|
||||
#
|
||||
|
||||
type mysqld_t;
|
||||
type mysqld_exec_t;
|
||||
init_daemon_domain(mysqld_t,mysqld_exec_t)
|
||||
|
||||
type mysqld_var_run_t;
|
||||
files_pid_file(mysqld_var_run_t)
|
||||
|
||||
type mysqld_db_t;
|
||||
files_type(mysqld_db_t)
|
||||
|
||||
type mysqld_etc_t alias etc_mysqld_t;
|
||||
files_config_file(mysqld_etc_t)
|
||||
|
||||
type mysqld_log_t;
|
||||
logging_log_file(mysqld_log_t)
|
||||
|
||||
type mysqld_tmp_t;
|
||||
files_tmp_file(mysqld_tmp_t)
|
||||
|
||||
########################################
|
||||
#
|
||||
# Local policy
|
||||
#
|
||||
|
||||
allow mysqld_t self:capability { dac_override setgid setuid sys_resource net_bind_service };
|
||||
dontaudit mysqld_t self:capability sys_tty_config;
|
||||
allow mysqld_t self:process { setsched getsched setrlimit signal_perms rlimitinh };
|
||||
allow mysqld_t self:fifo_file { read write };
|
||||
allow mysqld_t self:unix_stream_socket create_stream_socket_perms;
|
||||
allow mysqld_t self:tcp_socket create_stream_socket_perms;
|
||||
allow mysqld_t self:udp_socket create_socket_perms;
|
||||
|
||||
allow mysqld_t mysqld_db_t:dir create_dir_perms;
|
||||
allow mysqld_t mysqld_db_t:file create_file_perms;
|
||||
allow mysqld_t mysqld_db_t:lnk_file create_lnk_perms;
|
||||
files_var_lib_filetrans(mysqld_t,mysqld_db_t,{ dir file })
|
||||
|
||||
allow mysqld_t mysqld_etc_t:file { getattr read };
|
||||
allow mysqld_t mysqld_etc_t:lnk_file { getattr read };
|
||||
allow mysqld_t mysqld_etc_t:dir list_dir_perms;
|
||||
|
||||
allow mysqld_t mysqld_log_t:file create_file_perms;
|
||||
logging_log_filetrans(mysqld_t,mysqld_log_t,file)
|
||||
|
||||
allow mysqld_t mysqld_tmp_t:dir create_dir_perms;
|
||||
allow mysqld_t mysqld_tmp_t:file create_file_perms;
|
||||
files_tmp_filetrans(mysqld_t, mysqld_tmp_t, { file dir })
|
||||
|
||||
allow mysqld_t mysqld_var_run_t:dir rw_dir_perms;
|
||||
allow mysqld_t mysqld_var_run_t:sock_file create_file_perms;
|
||||
allow mysqld_t mysqld_var_run_t:file create_file_perms;
|
||||
files_pid_filetrans(mysqld_t,mysqld_var_run_t,file)
|
||||
|
||||
kernel_read_system_state(mysqld_t)
|
||||
kernel_read_kernel_sysctls(mysqld_t)
|
||||
|
||||
corenet_non_ipsec_sendrecv(mysqld_t)
|
||||
corenet_tcp_sendrecv_all_if(mysqld_t)
|
||||
corenet_udp_sendrecv_all_if(mysqld_t)
|
||||
corenet_tcp_sendrecv_all_nodes(mysqld_t)
|
||||
corenet_udp_sendrecv_all_nodes(mysqld_t)
|
||||
corenet_tcp_sendrecv_all_ports(mysqld_t)
|
||||
corenet_udp_sendrecv_all_ports(mysqld_t)
|
||||
corenet_tcp_bind_all_nodes(mysqld_t)
|
||||
corenet_tcp_bind_mysqld_port(mysqld_t)
|
||||
corenet_tcp_connect_mysqld_port(mysqld_t)
|
||||
corenet_sendrecv_mysqld_client_packets(mysqld_t)
|
||||
corenet_sendrecv_mysqld_server_packets(mysqld_t)
|
||||
|
||||
dev_read_sysfs(mysqld_t)
|
||||
|
||||
fs_getattr_all_fs(mysqld_t)
|
||||
fs_search_auto_mountpoints(mysqld_t)
|
||||
|
||||
term_dontaudit_use_console(mysqld_t)
|
||||
|
||||
domain_use_interactive_fds(mysqld_t)
|
||||
|
||||
files_getattr_var_lib_dirs(mysqld_t)
|
||||
files_read_etc_runtime_files(mysqld_t)
|
||||
files_read_etc_files(mysqld_t)
|
||||
files_read_usr_files(mysqld_t)
|
||||
files_search_var_lib(mysqld_t)
|
||||
|
||||
auth_use_nsswitch(mysqld_t)
|
||||
|
||||
init_use_fds(mysqld_t)
|
||||
init_use_script_ptys(mysqld_t)
|
||||
|
||||
libs_use_ld_so(mysqld_t)
|
||||
libs_use_shared_libs(mysqld_t)
|
||||
|
||||
logging_send_syslog_msg(mysqld_t)
|
||||
|
||||
miscfiles_read_localization(mysqld_t)
|
||||
|
||||
sysnet_read_config(mysqld_t)
|
||||
|
||||
userdom_dontaudit_use_unpriv_user_fds(mysqld_t)
|
||||
# for /root/.my.cnf - should not be needed:
|
||||
userdom_read_sysadm_home_content_files(mysqld_t)
|
||||
|
||||
ifdef(`distro_redhat',`
|
||||
# because Fedora has the sock_file in the database directory
|
||||
type_transition mysqld_t mysqld_db_t:sock_file mysqld_var_run_t;
|
||||
')
|
||||
|
||||
ifdef(`targeted_policy',`
|
||||
term_dontaudit_use_unallocated_ttys(mysqld_t)
|
||||
term_dontaudit_use_generic_ptys(mysqld_t)
|
||||
files_dontaudit_read_root_files(mysqld_t)
|
||||
')
|
||||
|
||||
optional_policy(`
|
||||
daemontools_service_domain(mysqld_t, mysqld_exec_t)
|
||||
')
|
||||
|
||||
optional_policy(`
|
||||
seutil_sigchld_newrole(mysqld_t)
|
||||
')
|
||||
|
||||
optional_policy(`
|
||||
udev_read_db(mysqld_t)
|
||||
')
|
||||
Loading…
Reference in a new issue