From owner-trustedbsd-cvs@FreeBSD.ORG Mon Jan 22 20:24:05 2007 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8E79216A405 for ; Mon, 22 Jan 2007 20:24:05 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.freebsd.org (Postfix) with ESMTP id EDAD113C46A for ; Mon, 22 Jan 2007 20:24:03 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by cyrus.watson.org (Postfix) with ESMTP id 0EFA948A9E for ; Mon, 22 Jan 2007 15:24:02 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id D503057FDB; Mon, 22 Jan 2007 20:23:56 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 442A416A4FA; Mon, 22 Jan 2007 20:23:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 09C5816A4EA for ; Mon, 22 Jan 2007 20:23:53 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B4A9113C457 for ; Mon, 22 Jan 2007 20:23:53 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0MKNrsR095573 for ; Mon, 22 Jan 2007 20:23:53 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MKNraK095568 for perforce@freebsd.org; Mon, 22 Jan 2007 20:23:53 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:23:53 GMT Message-Id: <200701222023.l0MKNraK095568@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 113433 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jan 2007 20:24:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=113433 Change 113433 by millert@millert_macbook on 2007/01/22 20:23:26 Enable automount policy; right now most of it is unused. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules.conf#7 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/automount.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.te#10 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules.conf#7 (text+ko) ==== @@ -782,7 +782,7 @@ # # Filesystem automounter service. # -#automount = module +automount = module # Layer: services # Module: avahi ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/automount.fc#2 (text+ko) ==== @@ -1,10 +1,4 @@ # -# /etc -# -/etc/apm/event\.d/autofs -- gen_context(system_u:object_r:automount_exec_t,s0) -/etc/auto\..+ -- gen_context(system_u:object_r:automount_etc_t,s0) - -# # /usr # /usr/sbin/automount -- gen_context(system_u:object_r:automount_exec_t,s0) @@ -13,4 +7,4 @@ # /var # -/var/run/autofs(/.*)? gen_context(system_u:object_r:automount_var_run_t,s0) +/var/run/automount\..* gen_context(system_u:object_r:automount_var_run_t,s0) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.te#10 (text+ko) ==== @@ -20,7 +20,6 @@ type darwin_trash_t; type darwin_keychain_t; type darwin_network_t; -type automount_t; fs_associate(darwin_cache_t) fs_associate(darwin_keychain_t) @@ -69,8 +68,6 @@ allow unconfined_t configd_resource_t:file read; allow unconfined_t configd_resource_t:dir { read search }; - allow unconfined_t automount_t:dir search; - allow unconfined_t WindowServer_resource_t:file read; allow unconfined_t WindowServer_resource_t:dir { read search };