PERFORCE change 21383 for review

[Brian Feldman]

http://perforce.freebsd.org/chv.cgi?CH=21383

Change 21383 by green at green_laptop_2 on 2002/11/22 14:24:06

	Start getting ntpd(8) policy correct; modulo /dev warnings,
	there are just a few files left that need access permissions
	(possibly resolver-related).

Affected files ...

.. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/ntpd.te#3 edit
.. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ntpd.fc#4 edit

Differences ...

==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/ntpd.te#3 (text+ko) ====

@@ -11,13 +11,18 @@
 type var_log_ntp_t, file_type, sysadmfile;
 type var_run_ntp_t, file_type, sysadmfile;
 type etc_ntp_t, file_type, sysadmfile;
+type tmp_ntpd_t, file_type, sysadmfile, tmpfile;
 
+file_type_auto_trans(ntpd_t, etc_t, etc_ntp_t)
+file_type_auto_trans(ntpd_t, tmp_t, tmp_ntpd_t)
 file_type_auto_trans(ntpd_t, var_log_t, var_log_ntp_t)
+file_type_auto_trans(ntpd_t, var_run_t, var_run_ntpd_t)
 
 allow ntpd_t var_lib_t:dir r_dir_perms;
 allow ntpd_t usr_t:file r_file_perms;
 allow ntpd_t { var_lib_ntp_t var_log_ntp_t var_run_ntp_t }:dir rw_dir_perms;
-allow ntpd_t { var_lib_ntp_t var_log_ntp_t var_run_ntp_t }:file create_file_perms;
+allow ntpd_t { var_lib_ntp_t var_log_ntp_t var_run_ntp_t var_run_ntpd_t }:file create_file_perms;
+allow ntpd_t var_run_ntpd_t:file rw_file_perms;
 
 allow ntpd_t self:capability { sys_time net_bind_service ipc_lock };
 dontaudit ntpd_t self:capability fsetid;
@@ -27,6 +32,7 @@
 allow ntpd_t etc_t:dir r_dir_perms;
 allow ntpd_t etc_t:lnk_file r_file_perms;
 allow ntpd_t etc_ntp_t:file rw_file_perms;
+allow ntpd_t resolv_conf_t:file r_file_perms;
 
 # Use the network.
 can_network(ntpd_t)

==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ntpd.fc#4 (text+ko) ====

@@ -1,8 +1,9 @@
 /var/lib/ntp(/.*)?              system_u:object_r:var_lib_ntp_t
-/etc/ntp\..*                    system_u:object_r:etc_ntp_t
-/var/db/ntp\..*			system_u:object_r:etc_ntp_t
+/etc/ntp.*			system_u:object_r:etc_ntp_t
+/var/db/ntp.*			system_u:object_r:etc_ntp_t
 /usr/sbin/ntpd                  system_u:object_r:ntpd_exec_t
 /var/log/ntpstats(/.*)?         system_u:object_r:var_log_ntp_t
 /var/log/ntpd                   system_u:object_r:var_log_ntp_t
-/var/run/(ntpd\.pid|ntp/.*)	system_u:object_r:var_run_ntp_t
+/var/run/ntpd\.pid		system_u:object_r:var_run_ntpd_t
+/var/run/ntp/.*			system_u:object_r:var_run_ntp_t
 /etc/cron\.(daily|weekly)/ntp-simple system_u:object_r:ntpd_exec_t
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message