From owner-p4-projects@FreeBSD.ORG Fri Sep 26 10:12:22 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D3C216A4C1; Fri, 26 Sep 2003 10:12:22 -0700 (PDT) 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 F3D2716A4B3 for ; Fri, 26 Sep 2003 10:12:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7471843FE5 for ; Fri, 26 Sep 2003 10:12:20 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8QHCKXJ033163 for ; Fri, 26 Sep 2003 10:12:20 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8QHCJJn033160 for perforce@freebsd.org; Fri, 26 Sep 2003 10:12:19 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Fri, 26 Sep 2003 10:12:19 -0700 (PDT) Message-Id: <200309261712.h8QHCJJn033160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 38659 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Sep 2003 17:12:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=38659 Change 38659 by areisse@areisse_tislabs on 2003/09/26 10:11:56 apache policy modified for FreeBSD Affected files ... .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/apache.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/apache.fc#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/apache.te#2 (text+ko) ==== @@ -336,7 +336,7 @@ ################################################################ # Allow the web server to run scripts and serve pages ############################################################## -allow httpd_t httpd_sys_content_t:file r_file_perms; +allow httpd_t httpd_sys_content_t:{lnk_file file} r_file_perms; allow httpd_t httpd_sys_content_t:dir r_dir_perms; allow httpd_t httpd_sys_htaccess_t: file r_file_perms; ==== //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/apache.fc#2 (text+ko) ==== @@ -1,26 +1,16 @@ # apache -/var/www/html(/.*)? system_u:object_r:httpd_sys_content_t -/var/www/mrtg(/.*)? system_u:object_r:httpd_sys_content_t -/var/www/cgi-bin(/.*)? system_u:object_r:httpd_sys_script_t -/usr/lib/cgi-bin(/.*)? system_u:object_r:httpd_sys_script_t -/var/www/perl(/.*)? system_u:object_r:httpd_sys_script_t -/var/www/icons(/.*)? system_u:object_r:httpd_sys_content_t -/var/cache/httpd(/.*)? system_u:object_r:httpd_cache_t -/etc/httpd system_u:object_r:httpd_config_t -/etc/httpd/conf(/.*)? system_u:object_r:httpd_config_t -/etc/httpd/logs system_u:object_r:httpd_log_files_t -/etc/httpd/modules system_u:object_r:httpd_modules_t -/etc/apache(2)?(/.*)? system_u:object_r:httpd_config_t -/etc/vhosts system_u:object_r:httpd_config_t -/usr/lib/apache(/.*)? system_u:object_r:httpd_modules_t -/usr/lib/apache2/modules(/.*)? system_u:object_r:httpd_modules_t -/usr/sbin/httpd system_u:object_r:httpd_exec_t -/usr/sbin/apache(2)? 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 +/usr/local/www/data(/.*)? system_u:object_r:httpd_sys_content_t +/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/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/cache/ssl.*\.sem system_u:object_r:httpd_cache_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/cache/ssl.*\.sem system_u:object_r:httpd_cache_t /var/run/apache(2)?.pid.* system_u:object_r:httpd_var_run_t