PSARC/2002/762 Layered Trusted Solaris

PSARC/2005/060 TSNET: Trusted Networking with Security Labels
PSARC/2005/259 Layered Trusted Solaris Label Interfaces
PSARC/2005/573 Solaris Trusted Extensions for Printing
PSARC/2005/691 Trusted Extensions for Device Allocation
PSARC/2005/723 Solaris Trusted Extensions Filesystem Labeling
PSARC/2006/009 Labeled Auditing
PSARC/2006/155 Trusted Extensions RBAC Changes
PSARC/2006/191 is_system_labeled
6293271 Zone processes should use zone_kcred instead of kcred
6394554 integrate Solaris Trusted Extensions

--HG--
rename : usr/src/cmd/dminfo/Makefile => deleted_files/usr/src/cmd/dminfo/Makefile
rename : usr/src/cmd/dminfo/dminfo.c => usr/src/cmd/allocate/dminfo.c

1 files changed, 24 insertions, 5 deletions

diff --git a/usr/src/uts/common/netinet/ip6.h b/usr/src/uts/common/netinet/ip6.h
index e9a0d6bf00..cc218df372 100644
--- a/usr/src/uts/common/netinet/ip6.h
+++ b/usr/src/uts/common/netinet/ip6.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2003 Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -155,6 +153,10 @@ struct	ip6_opt {
 #define	IP6OPT_HOME_ADDRESS		0xc9	/* 11 0 01001 */
 #define	IP6OPT_EID			0x8a	/* 10 0 01010 */
 
+#define	IP6OPT_LS			0x0a	/* 00 0 01010 */
+
+#define	IP6_MAX_OPT_LENGTH	255
+
 /* Jumbo Payload Option */
 struct	ip6_opt_jumbo {
 	uint8_t	ip6oj_type;
@@ -242,6 +244,23 @@ struct	ip6_opt_home_address {
 	/* Followed by sub-options */
 };
 
+/* Labeled Security Option */
+struct	ip6_opt_labeled_security {
+	uint8_t ip6ol_type;
+	uint8_t ip6ol_len;	/* always even for defined values */
+	uint8_t ip6ol_doi[4];
+	/* Followed by sub-options */
+};
+
+#define	IP6LS_DOI_V4	0	/* IPv4 transition */
+
+#define	IP6LS_TT_LEVEL	1	/* level or classification; 2-octet value */
+#define	IP6LS_TT_VECTOR	2	/* compartments; bit vector (even # octets) */
+#define	IP6LS_TT_ENUM	3	/* set membership; list of 2-octet values */
+#define	IP6LS_TT_RANGES	4	/* set membership; pairs of 2-octet values */
+#define	IP6LS_TT_V4	5	/* IPv4 compatible option */
+#define	IP6LS_TT_DEST	6	/* destination-only data; per DOI */
+
 #ifdef	__cplusplus
 }
 #endif