From owner-p4-projects Tue May 14 7:41:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D89D437B40A; Tue, 14 May 2002 07:39:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 49F4237B41D for ; Tue, 14 May 2002 07:38:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4EEcM275699 for perforce@freebsd.org; Tue, 14 May 2002 07:38:22 -0700 (PDT) (envelope-from cvance@tislabs.com) Date: Tue, 14 May 2002 07:38:22 -0700 (PDT) Message-Id: <200205141438.g4EEcM275699@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 11317 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://people.freebsd.org/~peter/p4db/chv.cgi?CH=11317 Change 11317 by cvance@cvance_korben on 2002/05/14 07:37:37 Make SEBSD a kernel module: Remove option from MAC and entries in conf/files Add sys/modules/sebsd/Makefile Uncomment entry in sample loader.conf Remove conf/options entry Don't include opt_mac.h anymore (unused) Affected files ... ... //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#8 edit ... //depot/projects/trustedbsd/mac/sys/conf/files#29 edit ... //depot/projects/trustedbsd/mac/sys/conf/options#18 edit ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#28 edit ... //depot/projects/trustedbsd/mac/sys/modules/Makefile#19 edit ... //depot/projects/trustedbsd/mac/sys/modules/sebsd/Makefile#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#8 (text+ko) ==== @@ -269,7 +269,7 @@ mac_none_load="NO" # Null MAC policy mac_seeotheruids_load="NO" # UID visbility MAC policy mac_te_load="NO" # Type Enforcement policy -#sebsd_load="NO" # Security-Enhanced BSD module +sebsd_load="NO" # Security-Enhanced BSD module ############################################################## ### Module loading syntax example ########################## ==== //depot/projects/trustedbsd/mac/sys/conf/files#29 (text+ko) ==== @@ -1299,20 +1299,6 @@ posix4/posix4_mib.c standard security/mac_none/mac_none.c optional mac_none -security/sebsd/sebsd.c optional sebsd -security/sebsd/sebsd_sysctl.c optional sebsd -security/sebsd/avc/avc.c optional sebsd -security/sebsd/ss/avtab.c optional sebsd -security/sebsd/ss/ebitmap.c optional sebsd -security/sebsd/ss/hashtab.c optional sebsd -security/sebsd/ss/init.c optional sebsd -security/sebsd/ss/policydb.c optional sebsd -security/sebsd/ss/queue.c optional sebsd -security/sebsd/ss/services.c optional sebsd -security/sebsd/ss/sidtab.c optional sebsd -security/sebsd/ss/symtab.c optional sebsd -security/sebsd/ss/fileutils.c optional sebsd - ufs/ffs/ffs_alloc.c optional ffs ufs/ffs/ffs_alloc.c optional ifs ufs/ffs/ffs_balloc.c optional ffs ==== //depot/projects/trustedbsd/mac/sys/conf/options#18 (text+ko) ==== @@ -108,7 +108,6 @@ CAPABILITIES opt_cap.h MAC opt_mac.h MAC_NONE opt_dontuse.h -SEBSD opt_dontuse.h # Do we want the config file compiled into the kernel? INCLUDE_CONFIG_FILE opt_config.h ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#28 (text+ko) ==== @@ -32,7 +32,6 @@ options MAC options UFS_EXTATTR options UFS_EXTATTR_AUTOSTART -options SEBSD options INET #InterNETworking options INET6 #IPv6 communications protocols ==== //depot/projects/trustedbsd/mac/sys/modules/Makefile#19 (text+ko) ==== @@ -78,6 +78,7 @@ ${_random} \ rl \ rp \ + sebsd \ sf \ sis \ sk \ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#6 (text+ko) ==== @@ -34,7 +34,6 @@ * $FreeBSD$ */ -#include "opt_mac.h" #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message