From owner-p4-projects@FreeBSD.ORG  Thu Sep 25 06:35:55 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 04C2F16A4C4; Thu, 25 Sep 2003 06:35:55 -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 CF25216A4C0
	for <perforce@freebsd.org>; Thu, 25 Sep 2003 06:35:54 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2F1AA4402F
	for <perforce@freebsd.org>; Thu, 25 Sep 2003 06:35:54 -0700 (PDT)
	(envelope-from cvance@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 h8PDZrXJ096662
	for <perforce@freebsd.org>; Thu, 25 Sep 2003 06:35:53 -0700 (PDT)
	(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8PDZqhp096659
	for perforce@freebsd.org; Thu, 25 Sep 2003 06:35:53 -0700 (PDT)
	(envelope-from cvance@nailabs.com)
Date: Thu, 25 Sep 2003 06:35:53 -0700 (PDT)
Message-Id: <200309251335.h8PDZqhp096659@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 38572 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: Thu, 25 Sep 2003 13:35:55 -0000

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

Change 38572 by cvance@cvance_korben on 2003/09/25 06:35:22

	Clean up references to flask.h

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc_ss.h#4 edit
.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/flask.h#2 delete
.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask/Makefile#3 edit
.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/security.h#4 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc_ss.h#4 (text+ko) ====

@@ -8,7 +8,7 @@
 
 #include <security/sebsd/flask_types.h>
 #include <security/sebsd/linux-compat.h>
-#include <security/sebsd/flask/flask.h>
+#include <security/sebsd/flask.h>
 
 int avc_ss_grant(security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms, u32 seqno);
 

==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/flask/Makefile#3 (text+ko) ====

@@ -7,18 +7,19 @@
 FLASK_H_DEPEND = security_classes initial_sids
 AV_H_DEPEND = access_vectors
 
-FLASK_H_FILES = av_inherit.h av_perm_to_string.h av_permissions.h class_to_string.h common_perm_to_string.h flask.h initial_sid_to_string.h
+FLASK_H_FILES = av_inherit.h av_perm_to_string.h av_permissions.h class_to_string.h common_perm_to_string.h initial_sid_to_string.h
 
 all: flask.h av_permissions.h
 
 flask.h: $(FLASK_H_DEPEND)
-	./mkflask.sh $(AWK) $(FLASK_H_DEPEND)
+	/bin/sh ./mkflask.sh $(AWK) $(FLASK_H_DEPEND)
 
 av_permissions.h: $(AV_H_DEPEND)
-	./mkaccess_vector.sh $(AWK) $(AV_H_DEPEND)
+	/bin/sh ./mkaccess_vector.sh $(AWK) $(AV_H_DEPEND)
 
 install: flask.h av_permissions.h
 	install -C -m0644 $(FLASK_H_FILES) ../avc
+	install -C -m0644 flask.h ..
 
 clean:  
 	rm -f $(FLASK_H_FILES)

==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/security.h#4 (text+ko) ====

@@ -7,7 +7,7 @@
 #define _SELINUX_SECURITY_H_
 
 #include <security/sebsd/flask_types.h>
-#include <security/sebsd/avc/flask.h>
+#include <security/sebsd/flask.h>
 #include <security/sebsd/ss/fileutils.h>
 
 #define SECSID_NULL			0x00000000 /* unspecified SID */