PERFORCE change 153994 for review

Robert Watson rwatson at FreeBSD.org
Wed Dec 3 06:15:36 PST 2008


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

Change 153994 by rwatson at rwatson_cinnamon_macosx on 2008/12/03 14:15:23

	Generify a few Darwin comments to be BSD comments; possibly we should
	be conditionally compiling this behavior as we may run on platforms
	where it's not true (presumably only Solaris).

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#82 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#82 (text+ko) ====

@@ -30,7 +30,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#81 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#82 $
  */
 
 #include <sys/types.h>
@@ -178,8 +178,8 @@
 	ADD_U_CHAR(dptr, AUT_ATTR32);
 
 	/*
-	 * Darwin defines the size for the file mode as 2 bytes; BSM defines
-	 * 4 so pad with 0.
+	 * BSD defines the size for the file mode as 2 bytes; BSM defines 4
+	 * so pad with 0.  XXXRW: Possibly should be conditionally compiled.
 	 */
 	ADD_U_INT16(dptr, pad0_16);
 	ADD_U_INT16(dptr, vni->vn_mode);
@@ -223,8 +223,8 @@
 	ADD_U_CHAR(dptr, AUT_ATTR64);
 
 	/*
-	 * Darwin defines the size for the file mode as 2 bytes; BSM defines
-	 * 4 so pad with 0.
+	 * BSD defines the size for the file mode as 2 bytes; BSM defines 4
+	 * so pad with 0.
 	 */
 	ADD_U_INT16(dptr, pad0_16);
 	ADD_U_INT16(dptr, vni->vn_mode);
@@ -482,8 +482,9 @@
 	ADD_U_CHAR(dptr, AUT_IPC_PERM);
 
 	/*
-	 * Darwin defines the sizes for ipc_perm members as 2 bytes; BSM
-	 * defines 4 so pad with 0.
+	 * BSD defines the sizes for ipc_perm members as 2 bytes; BSM defines
+	 * 4 so pad with 0.  XXXRW: Possibly shoulid be conditionally
+	 * compiled.
 	 */
 	ADD_U_INT16(dptr, pad0);
 	ADD_U_INT16(dptr, perm->uid);
@@ -1025,8 +1026,9 @@
 
 	ADD_U_CHAR(dptr, AUT_SOCKINET128);
 	/*
-	 * In Darwin, sin6_family is one octet, but BSM defines the token
-	 * to store two. So we copy in a 0 first.
+	 * In BSD, sin6_family is one octet, but BSM defines the token to
+	 * store two. So we copy in a 0 first.  XXXRW: Possibly should be
+	 * conditionally compiled.
 	 */
 	ADD_U_CHAR(dptr, 0);
 	ADD_U_CHAR(dptr, so->sin6_family);


More information about the p4-projects mailing list