From owner-p4-projects Fri Nov 22 14:27:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D482A37B404; Fri, 22 Nov 2002 14:27:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 80BDD37B401 for ; Fri, 22 Nov 2002 14:27:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FF9443EA9 for ; Fri, 22 Nov 2002 14:27:43 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAMMOSmV088878 for ; Fri, 22 Nov 2002 14:24:28 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAMMORHv088875 for perforce@freebsd.org; Fri, 22 Nov 2002 14:24:27 -0800 (PST) Date: Fri, 22 Nov 2002 14:24:27 -0800 (PST) Message-Id: <200211222224.gAMMORHv088875@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21383 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21383 Change 21383 by green@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@FreeBSD.org with "unsubscribe p4-projects" in the body of the message