[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/

[Sven Vermeulen]

commit:     8584ffef08418a34cfbdc36a6521082f8f54299b
Author:     Dominick Grift <dominick.grift <AT> gmail <DOT> com>
AuthorDate: Fri Sep 28 09:51:05 2012 +0000
Commit:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
CommitDate: Fri Sep 28 17:42:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=8584ffef

Changes tothe dictd policy module

Ported from Fedora with changes

Signed-off-by: Dominick Grift <dominick.grift <AT> gmail.com>

---
 policy/modules/contrib/dictd.fc |    6 +++---
 policy/modules/contrib/dictd.if |    8 ++++----
 policy/modules/contrib/dictd.te |   39 +++++++++++----------------------------
 3 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/policy/modules/contrib/dictd.fc b/policy/modules/contrib/dictd.fc
index 54f88c8..8a5f235 100644
--- a/policy/modules/contrib/dictd.fc
+++ b/policy/modules/contrib/dictd.fc
@@ -1,9 +1,9 @@
-/etc/rc\.d/init\.d/dictd --	gen_context(system_u:object_r:dictd_initrc_exec_t,s0)
+/etc/rc\.d/init\.d/dictd	--	gen_context(system_u:object_r:dictd_initrc_exec_t,s0)
 
 /etc/dictd\.conf	--	gen_context(system_u:object_r:dictd_etc_t,s0)
 
-/usr/sbin/dictd		--	gen_context(system_u:object_r:dictd_exec_t,s0)
+/usr/sbin/dictd	--	gen_context(system_u:object_r:dictd_exec_t,s0)
 
-/var/lib/dictd(/.*)?		gen_context(system_u:object_r:dictd_var_lib_t,s0)
+/var/lib/dictd(/.*)?	gen_context(system_u:object_r:dictd_var_lib_t,s0)
 
 /var/run/dictd\.pid	--	gen_context(system_u:object_r:dictd_var_run_t,s0)

diff --git a/policy/modules/contrib/dictd.if b/policy/modules/contrib/dictd.if
index a0d23ce..3cc3494 100644
--- a/policy/modules/contrib/dictd.if
+++ b/policy/modules/contrib/dictd.if
@@ -1,4 +1,4 @@
-## <summary>Dictionary daemon</summary>
+## <summary>Dictionary daemon.</summary>
 
 ########################################
 ## <summary>
@@ -17,8 +17,8 @@ interface(`dictd_tcp_connect',`
 
 ########################################
 ## <summary>
-##	All of the rules required to administrate 
-##	an dictd environment
+##	All of the rules required to
+##	administrate an dictd environment.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -27,7 +27,7 @@ interface(`dictd_tcp_connect',`
 ## </param>
 ## <param name="role">
 ##	<summary>
-##	The role to be allowed to manage the dictd domain.
+##	Role allowed access.
 ##	</summary>
 ## </param>
 ## <rolecap/>

diff --git a/policy/modules/contrib/dictd.te b/policy/modules/contrib/dictd.te
index d2d9359..fd4a602 100644
--- a/policy/modules/contrib/dictd.te
+++ b/policy/modules/contrib/dictd.te
@@ -1,4 +1,4 @@
-policy_module(dictd, 1.7.0)
+policy_module(dictd, 1.7.1)
 
 ########################################
 #
@@ -29,12 +29,10 @@ files_pid_file(dictd_var_run_t)
 allow dictd_t self:capability { setuid setgid };
 dontaudit dictd_t self:capability sys_tty_config;
 allow dictd_t self:process { signal_perms setpgid };
-allow dictd_t self:unix_stream_socket create_stream_socket_perms;
-allow dictd_t self:tcp_socket create_stream_socket_perms;
-allow dictd_t self:udp_socket create_socket_perms;
+allow dictd_t self:unix_stream_socket { accept listen };
+allow dictd_t self:tcp_socket { accept listen };
 
 allow dictd_t dictd_etc_t:file read_file_perms;
-files_search_etc(dictd_t)
 
 allow dictd_t dictd_var_lib_t:dir list_dir_perms;
 allow dictd_t dictd_var_lib_t:file read_file_perms;
@@ -48,48 +46,33 @@ kernel_read_kernel_sysctls(dictd_t)
 corenet_all_recvfrom_unlabeled(dictd_t)
 corenet_all_recvfrom_netlabel(dictd_t)
 corenet_tcp_sendrecv_generic_if(dictd_t)
-corenet_raw_sendrecv_generic_if(dictd_t)
-corenet_udp_sendrecv_generic_if(dictd_t)
 corenet_tcp_sendrecv_generic_node(dictd_t)
-corenet_udp_sendrecv_generic_node(dictd_t)
-corenet_raw_sendrecv_generic_node(dictd_t)
-corenet_tcp_sendrecv_all_ports(dictd_t)
-corenet_udp_sendrecv_all_ports(dictd_t)
 corenet_tcp_bind_generic_node(dictd_t)
-corenet_tcp_bind_dict_port(dictd_t)
+
 corenet_sendrecv_dict_server_packets(dictd_t)
+corenet_tcp_bind_dict_port(dictd_t)
+corenet_tcp_sendrecv_dict_port(dictd_t)
 
 dev_read_sysfs(dictd_t)
 
-fs_getattr_xattr_fs(dictd_t)
-fs_search_auto_mountpoints(dictd_t)
-
 domain_use_interactive_fds(dictd_t)
 
-files_read_etc_files(dictd_t)
 files_read_etc_runtime_files(dictd_t)
 files_read_usr_files(dictd_t)
 files_search_var_lib(dictd_t)
-# for checking for nscd
-files_dontaudit_search_pids(dictd_t)
+
+fs_getattr_xattr_fs(dictd_t)
+fs_search_auto_mountpoints(dictd_t)
+
+auth_use_nsswitch(dictd_t)
 
 logging_send_syslog_msg(dictd_t)
 
 miscfiles_read_localization(dictd_t)
 
-sysnet_read_config(dictd_t)
-
 userdom_dontaudit_use_unpriv_user_fds(dictd_t)
 
 optional_policy(`
-	nis_use_ypbind(dictd_t)
-')
-
-optional_policy(`
-	nscd_socket_use(dictd_t)
-')
-
-optional_policy(`
 	seutil_sigchld_newrole(dictd_t)
 ')