PERFORCE change 110797 for review

[Robert Watson]

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

Change 110797 by rwatson at rwatson_zoo on 2006/12/01 13:00:46

	Revert additional branch-local changes in priv branch.

Affected files ...

.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_priv.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/jail.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/mac.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/mac_policy.h#8 integrate

Differences ...

==== //depot/projects/trustedbsd/priv/sys/security/mac/mac_priv.c#4 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac/mac_priv.c,v 1.1 2006/11/06 13:37:18 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/sys/sys/jail.h#5 (text+ko) ====

@@ -40,7 +40,6 @@
 #include <sys/_lock.h>
 #include <sys/_mutex.h>
 #include <sys/_task.h>
-#include <sys/priv.h>
 
 #define JAIL_MAX	999999
 

==== //depot/projects/trustedbsd/priv/sys/sys/mac.h#5 (text+ko) ====

@@ -47,6 +47,8 @@
 #ifndef _SYS_MAC_H_
 #define	_SYS_MAC_H_
 
+#include <sys/_label.h>
+
 #ifndef _POSIX_MAC
 #define	_POSIX_MAC
 #endif

==== //depot/projects/trustedbsd/priv/sys/sys/mac_policy.h#8 (text+ko) ====

@@ -55,7 +55,6 @@
  * Operations are sorted first by general class of operation, then
  * alphabetically.
  */
-#include <sys/_label.h>
 #include <sys/acl.h>	/* XXX acl_type_t */
 
 struct acl;