--- a/usr/src/cmd/rad/daemon/mapfile-vers	Tue May 15 15:37:20 2012 -0400
+++ b/usr/src/cmd/rad/daemon/mapfile-vers	Thu May 17 13:58:30 2012 -0400
@@ -20,7 +20,21 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
 #
 
 $mapfile_version 2
@@ -81,8 +95,8 @@
 		rad_locale_parse;
 		rad_locale_free;
 
-		rad_isproxy { ASSERT { TYPE=data; } };
-		rad_container { ASSERT { TYPE=data; } };
+		rad_isproxy { ASSERT { TYPE=data; SIZE=4 } };
+		rad_container { ASSERT { TYPE=data; SIZE=addrsize } };
 
 		# Lists
 		list_create;
@@ -118,9 +132,9 @@
 		rad_subject_unref;
 
 		# Protocol API
-		rad_container_auth { ASSERT { TYPE=data; } };
-		rad_container_unauth { ASSERT { TYPE=data; } };
-		rad_container_control { ASSERT { TYPE=data; } };
+		rad_container_auth { ASSERT { TYPE=data; SIZE=72 } };
+		rad_container_unauth { ASSERT { TYPE=data; SIZE=72 } };
+		rad_container_control { ASSERT { TYPE=data; SIZE=72 } };
 		rad_tpool_hold;
 		rad_tpool_rele;
 		rad_slave_get;

--- a/usr/src/cmd/rad/mod/mapfile.module	Tue May 15 15:37:20 2012 -0400
+++ b/usr/src/cmd/rad/mod/mapfile.module	Thu May 17 13:58:30 2012 -0400
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 # The only symbol modules need export is _rad_init.
@@ -29,7 +29,7 @@
 
 $mapfile_version 2
 
-SYMBOL_SCOPE {
+SYMBOL_VERSION SUNWprivate {
 	global:
 		_rad_init;
 

--- a/usr/src/cmd/rad/mod/mapfile.private	Tue May 15 15:37:20 2012 -0400
+++ b/usr/src/cmd/rad/mod/mapfile.private	Thu May 17 13:58:30 2012 -0400
@@ -20,14 +20,14 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 # Special mapfile for modules that need access to additional rad symbols
 
 $mapfile_version 2
 
-SYMBOL_SCOPE {
+SYMBOL_VERSION SUNWprivate {
 	global:
 		# Transport API
 		rad_proto_find		{ FLAGS = PARENT };

--- a/usr/src/lib/libadr/common/mapfile-vers	Tue May 15 15:37:20 2012 -0400
+++ b/usr/src/lib/libadr/common/mapfile-vers	Thu May 17 13:58:30 2012 -0400
@@ -19,43 +19,76 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
 #
 
 $mapfile_version 2
 
-SYMBOL_VERSION SUNWprivate_1.1 {
+STUB_OBJECT;
+
+SYMBOL_VERSION SUNWprivate {
     global:
     	# adr.h
-	t_void { ASSERT { TYPE=data; } };
-	t_string { ASSERT { TYPE=data; } };
-	t_integer { ASSERT { TYPE=data; } };
-	t_uinteger { ASSERT { TYPE=data; } };
-	t_long { ASSERT { TYPE=data; } };
-	t_ulong { ASSERT { TYPE=data; } };
-	t_time { ASSERT { TYPE=data; } };
-	t_name { ASSERT { TYPE=data; } };
-	t_boolean { ASSERT { TYPE=data; } };
-	t_opaque { ASSERT { TYPE=data; } };
-	t_secret { ASSERT { TYPE=data; } };
-	t_float { ASSERT { TYPE=data; } };
-	t_double { ASSERT { TYPE=data; } };
+	t_void { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_string { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_integer { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_uinteger { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_long { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_ulong { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_time { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_name { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_boolean { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_opaque { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_secret { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_float { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_double { ASSERT { TYPE=data; SIZE=addrsize[6] } };
 
-	t_array_string { ASSERT { TYPE=data; } };
-	t_array_integer { ASSERT { TYPE=data; } };
-	t_array_uinteger { ASSERT { TYPE=data; } };
-	t_array_long { ASSERT { TYPE=data; } };
-	t_array_ulong { ASSERT { TYPE=data; } };
-	t_array_time { ASSERT { TYPE=data; } };
-	t_array_name { ASSERT { TYPE=data; } };
-	t_array_boolean { ASSERT { TYPE=data; } };
-	t_array_opaque { ASSERT { TYPE=data; } };
-	t_array_secret { ASSERT { TYPE=data; } };
-	t_array_float { ASSERT { TYPE=data; } };
-	t_array_double { ASSERT { TYPE=data; } };
+	t_array_string { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_array_integer { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_array_uinteger { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_array_long { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_array_ulong { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_array_time { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_array_name { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_array_boolean { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_array_opaque { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_array_secret { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_array_float { ASSERT { TYPE=data; SIZE=addrsize[6] } };
+	t_array_double { ASSERT { TYPE=data; SIZE=addrsize[6] } };
 
-	d_true { ASSERT { TYPE=data; } };
-	d_false { ASSERT { TYPE=data; } };
+$if _sparc
+$if _ELF32
+	d_true { ASSERT { TYPE=data; SIZE=addrsize[10] } };
+	d_false { ASSERT { TYPE=data; SIZE=addrsize[10] } };
+$elif _ELF64
+	d_true { ASSERT { TYPE=data; SIZE=addrsize[5] } };
+	d_false { ASSERT { TYPE=data; SIZE=addrsize[5] } };
+$endif
+$endif
+
+$if _x86 
+$if _ELF32
+	d_true { ASSERT { TYPE=data; SIZE=addrsize[8] } };
+	d_false { ASSERT { TYPE=data; SIZE=addrsize[8] } };
+$elif _ELF64
+	d_true { ASSERT { TYPE=data; SIZE=addrsize[5] } };
+	d_false { ASSERT { TYPE=data; SIZE=addrsize[5] } };
+$endif
+$endif
 
 	array_add;
 	array_addall;

--- a/usr/src/lib/libradproto/common/mapfile-vers	Tue May 15 15:37:20 2012 -0400
+++ b/usr/src/lib/libradproto/common/mapfile-vers	Thu May 17 13:58:30 2012 -0400
@@ -19,12 +19,28 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# MAPFILE HEADER START
+#
+# WARNING:  STOP NOW.  DO NOT MODIFY THIS FILE.
+# Object versioning must comply with the rules detailed in
+#
+#	usr/src/lib/README.mapfiles
+#
+# You should not be making modifications here until you've read the most current
+# copy of that file. If you need help, contact a gatekeeper for guidance.
+#
+# MAPFILE HEADER END
 #
 
 $mapfile_version 2
 
-SYMBOL_VERSION SUNWprivate_1.1 {
+STUB_OBJECT;
+
+SYMBOL_VERSION SUNWprivate {
     global:
 	# radclient.h
 	rc_arraytype;