6617821 adt_export_data_t needs to avoid using variable-sized types

7 files changed, 16 insertions, 20 deletions

diff --git a/usr/src/cmd/auditreduce/token.c b/usr/src/cmd/auditreduce/token.c
index a507780cf5..0304828072 100644
--- a/usr/src/cmd/auditreduce/token.c
+++ b/usr/src/cmd/auditreduce/token.c
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -1946,7 +1946,7 @@ int
 label_token(adr_t *adr)
 {
 	static m_label_t *label = NULL;
-	static size_t l_size;
+	static size32_t l_size;
 	int len;
 
 	if (label == NULL) {
diff --git a/usr/src/cmd/praudit/token.c b/usr/src/cmd/praudit/token.c
index d4a53b4e8e..4c1c0ba02b 100644
--- a/usr/src/cmd/praudit/token.c
+++ b/usr/src/cmd/praudit/token.c
@@ -19,11 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <ctype.h>
 #include <dirent.h>
@@ -2195,7 +2194,7 @@ int
 label_token(pr_context_t *context)
 {
 	static m_label_t *label = NULL;
-	static size_t l_size;
+	static size32_t l_size;
 	int	len;
 	int	returnstat;
 	uval_t	uval;
diff --git a/usr/src/lib/libbsm/common/adt.c b/usr/src/lib/libbsm/common/adt.c
index 681f5acccc..cfee74ae8f 100644
--- a/usr/src/lib/libbsm/common/adt.c
+++ b/usr/src/lib/libbsm/common/adt.c
@@ -1074,7 +1074,7 @@ adt_from_export_format(adt_internal_state_t *internal,
 		adrm_int32(&context, (int *)&label_len, 1);
 		if (label_len > 0) {
 			/* read in and deal with different sized labels. */
-			size_t	my_label_len = blabel_size();
+			size32_t my_label_len = blabel_size();
 
 			if ((internal->as_label =
 			    m_label_alloc(MAC_LABEL)) == NULL) {
@@ -1110,7 +1110,7 @@ adt_to_export_format(adt_export_data_t *external,
 	struct export_header	head;
 	struct export_link	tail;
 	adr_t			context;
-	size_t			label_len = 0;
+	size32_t		label_len = 0;
 
 	adrm_start(&context, (char *)external);
 
@@ -1368,7 +1368,7 @@ size_t
 adt_export_session_data(const adt_session_data_t *internal,
     adt_export_data_t **external)
 {
-	size_t			length = 0;
+	size32_t		length = 0;
 
 	if ((internal != NULL) &&
 	    ((adt_internal_state_t *)internal)->as_label != NULL) {
diff --git a/usr/src/lib/libbsm/common/adt_xlate.h b/usr/src/lib/libbsm/common/adt_xlate.h
index c593898ad1..c260dc3158 100644
--- a/usr/src/lib/libbsm/common/adt_xlate.h
+++ b/usr/src/lib/libbsm/common/adt_xlate.h
@@ -21,7 +21,7 @@
 /*
  * adt_xlate.h
  *
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  */
@@ -237,7 +237,7 @@ struct adt_export_v2 {
 	uint32_t	ax_asid;
 	int		ax_audit_enabled;
 	pid_t		ax_pid;
-	size_t		ax_label_len;	/* 0, unlabeled */
+	size32_t	ax_label_len;	/* 0, unlabeled */
 /*	char		ax_label[ax_label_len];	if, is_system_labeled */
 };
 struct adt_export_v1 {
diff --git a/usr/src/lib/libbsm/common/au_to.c b/usr/src/lib/libbsm/common/au_to.c
index 45fa932b66..d3e9cb0885 100644
--- a/usr/src/lib/libbsm/common/au_to.c
+++ b/usr/src/lib/libbsm/common/au_to.c
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -1414,7 +1414,7 @@ au_to_label(m_label_t *label)
 	token_t *token;			/* local token */
 	adr_t adr;			/* adr memory stream header */
 	char data_header = AUT_LABEL;	/* header for this token */
-	size_t llen = blabel_size();
+	size32_t llen = blabel_size();
 
 	token = get_token(sizeof (char) + llen);
 	if (token == NULL) {
diff --git a/usr/src/lib/libtsol/common/label.h b/usr/src/lib/libtsol/common/label.h
index ed397f5fa3..a6639c8339 100644
--- a/usr/src/lib/libtsol/common/label.h
+++ b/usr/src/lib/libtsol/common/label.h
@@ -19,15 +19,14 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #ifndef	_TSOL_LABEL_H
 #define	_TSOL_LABEL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
+#include <sys/types32.h>
 #include <sys/tsol/label.h>
 #include <priv.h>
 
@@ -123,7 +122,7 @@ extern m_label_t *getlabelbypath(const char *);
 
 extern m_label_t *blabel_alloc(void);
 extern void	blabel_free(m_label_t *);
-extern size_t   blabel_size(void);
+extern size32_t blabel_size(void);
 extern char	*bsltoh(const m_label_t *);
 extern char	*bcleartoh(const m_label_t *);
 
diff --git a/usr/src/lib/libtsol/common/misc.c b/usr/src/lib/libtsol/common/misc.c
index 4384b42a14..daf9fd2377 100644
--- a/usr/src/lib/libtsol/common/misc.c
+++ b/usr/src/lib/libtsol/common/misc.c
@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 
 /*
  *	Miscellaneous user interfaces to trusted label functions.
@@ -407,7 +405,7 @@ blabel_free(blevel_t *label_p)
 	free(label_p);
 }
 
-size_t
+size32_t
 blabel_size(void)
 {
 	return (sizeof (blevel_t));