trunk: drop snmpd_etc_t.

diff --git a/Changelog b/Changelog
index 4145ecd394ebd3dae4c90142fd08f27da8f961e0..06da4908c39c0f07ddf9e83ab7b39e15734374b9 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,4 @@
+- Drop snmpd_etc_t.
 - Confine sendmail and logrotate on targeted.
 - Tunable connection to postgresql for users from KaiGai Kohei.
 - Memprotect support patch from Stephen Smalley.

diff --git a/policy/modules/kernel/files.te b/policy/modules/kernel/files.te
index 55a5908a0b730b6fad1ad8972dd9ead3415f0c52..0339a5d7a343595b7e0130dc458132fede3a7ac1 100644 (file)
--- a/policy/modules/kernel/files.te
+++ b/policy/modules/kernel/files.te
@@ -1,5 +1,5 @@
 
-policy_module(files,1.5.0)
+policy_module(files,1.5.1)
 
 ########################################
 #
@@ -54,6 +54,7 @@ type etc_t;
 files_type(etc_t)
 # compatibility aliases for removed types:
 typealias etc_t alias automount_etc_t;
+typealias etc_t alias snmpd_etc_t;
 
 #
 # etc_runtime_t is the type of various

diff --git a/policy/modules/services/snmp.fc b/policy/modules/services/snmp.fc
index 5ebade87d68dd0e96ae3cb7b1382715b1700286a..fbe30aa193083a03316f18f3a570db9f9988931a 100644 (file)
--- a/policy/modules/services/snmp.fc
+++ b/policy/modules/services/snmp.fc
@@ -1,10 +1,3 @@
-
-#
-# /etc
-#
-
-/etc/snmp/snmp(trap)?d\.conf -- gen_context(system_u:object_r:snmpd_etc_t,s0)
-
 #
 # /usr
 #

diff --git a/policy/modules/services/snmp.te b/policy/modules/services/snmp.te
index 40ebbd7aee75d2b3f6bcddc7a0a085174c2ddc43..f515d71cde7e1c9576900337f76161dbf1789f52 100644 (file)
--- a/policy/modules/services/snmp.te
+++ b/policy/modules/services/snmp.te
@@ -1,5 +1,5 @@
 
-policy_module(snmp,1.4.2)
+policy_module(snmp,1.4.3)
 
 ########################################
 #
@@ -9,9 +9,6 @@ type snmpd_t;
 type snmpd_exec_t;
 init_daemon_domain(snmpd_t,snmpd_exec_t)
 
-type snmpd_etc_t;
-files_config_file(snmpd_etc_t)
-
 type snmpd_log_t;
 logging_log_file(snmpd_log_t)
 
@@ -33,8 +30,6 @@ allow snmpd_t self:unix_stream_socket create_stream_socket_perms;
 allow snmpd_t self:tcp_socket create_stream_socket_perms;
 allow snmpd_t self:udp_socket connected_stream_socket_perms;
 
-allow snmpd_t snmpd_etc_t:file { getattr read };
-
 allow snmpd_t snmpd_log_t:file manage_file_perms;
 logging_log_filetrans(snmpd_t,snmpd_log_t,file)