PERFORCE change 38572 for review

[Chris Vance]

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

Change 38572 by cvance at 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 */
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message