From owner-p4-projects@FreeBSD.ORG  Fri Dec 31 18:32:40 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C31A916A4D1; Fri, 31 Dec 2004 18:32:39 +0000 (GMT)
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 7D23B16A4CE
	for <perforce@freebsd.org>; Fri, 31 Dec 2004 18:32:39 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 644B343D39
	for <perforce@freebsd.org>; Fri, 31 Dec 2004 18:32:39 +0000 (GMT)
	(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBVIWdbH026658
	for <perforce@freebsd.org>; Fri, 31 Dec 2004 18:32:39 GMT
	(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBVIWd65026655
	for perforce@freebsd.org; Fri, 31 Dec 2004 18:32:39 GMT
	(envelope-from areisse@nailabs.com)
Date: Fri, 31 Dec 2004 18:32:39 GMT
Message-Id: <200412311832.iBVIWd65026655@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 68011 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Dec 2004 18:32:40 -0000

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

Change 68011 by areisse@areisse_tislabs on 2004/12/31 18:32:14

	sebsd policy: apache.fc had wrong types and paths.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/apache.fc#5 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/apache.fc#5 (text+ko) ====

@@ -3,14 +3,14 @@
 /usr/local/www/cgi-bin(/.*)?	system_u:object_r:httpd_sys_script_t
 /usr/local/www/icons(/.*)?	system_u:object_r:httpd_sys_content_t
 #/var/cache/httpd(/.*)?		system_u:object_r:httpd_cache_t
-/usr/local/etc/apache		system_u:object_r:httpd_config_t
+/usr/local/etc/apache(/.*)?	system_u:object_r:httpd_config_t
 /usr/local/libexec/apache(/.*)?	system_u:object_r:httpd_modules_t
 /usr/local/sbin/httpd		system_u:object_r:httpd_exec_t
 #/usr/sbin/suexec		system_u:object_r:httpd_suexec_exec_t
 #/usr/lib/cgi-bin/(nph-)?cgiwrap(d)? system_u:object_r:httpd_suexec_exec_t
 #/usr/lib/apache(2)?/suexec(2)?	system_u:object_r:httpd_suexec_exec_t
-/var/log/httpd-.*		system_u:object_r:httpd_log_files_t
-#/var/log/apache(2)?(/.*)?	system_u:object_r:httpd_log_files_t
-#/var/log/cgiwrap\.log.*	system_u:object_r:httpd_log_files_t
+/var/log/httpd-.*		system_u:object_r:httpd_log_t
+#/var/log/apache(2)?(/.*)?	system_u:object_r:httpd_log_t
+#/var/log/cgiwrap\.log.*	system_u:object_r:httpd_log_t
 #/var/cache/ssl.*\.sem		system_u:object_r:httpd_cache_t
 /var/run/apache(2)?.pid.*	system_u:object_r:httpd_var_run_t