13487 want mapfile-based assertions about symbol properties

Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Reviewed by: Jason King <jason.brian.king@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>

6 files changed, 88 insertions, 22 deletions

diff --git a/usr/src/lib/krb5/kadm5/srv/mapfile-vers b/usr/src/lib/krb5/kadm5/srv/mapfile-vers
index 20f09393f0..0fc042bc22 100644
--- a/usr/src/lib/krb5/kadm5/srv/mapfile-vers
+++ b/usr/src/lib/krb5/kadm5/srv/mapfile-vers
@@ -55,10 +55,30 @@ SYMBOL_VERSION SUNWprivate_1.1 {
 	destroy_dict;
 	find_word;
 	handle_chpw;
-	hist_db;
-	hist_key;
-	hist_kvno;
-	hist_princ;
+	hist_db		{
+			  ASSERT = {
+				  TYPE = OBJECT;
+				  SIZE = 68;
+				};
+			};
+	hist_key	{
+			  ASSERT = {
+				  TYPE = OBJECT;
+				  SIZE = 28;
+				};
+			};
+	hist_kvno	{
+			  ASSERT = {
+				  TYPE = OBJECT;
+				  SIZE = 4;
+				};
+			};
+	hist_princ	{
+			  ASSERT = {
+				  TYPE = OBJECT;
+				  SIZE = 4;
+				};
+			};
 	init_dict;
 	kadm5_check_min_life;
 	kadm5_chpass_principal;
@@ -142,8 +162,18 @@ SYMBOL_VERSION SUNWprivate_1.1 {
 	krb5_read_realm_params;
 	krb5_string_to_flags;
 	krb5_string_to_keysalts;
-	master_db;
-	master_princ;
+	master_db	{
+			  ASSERT = {
+				  TYPE = OBJECT;
+				  SIZE = 68;
+				};
+			};
+	master_princ	{
+			  ASSERT = {
+				  TYPE = OBJECT;
+				  SIZE = 4;
+				};
+			};
 	osa_free_princ_ent;
 	passwd_check;
 	trunc_name;
diff --git a/usr/src/lib/krb5/kdb/mapfile-vers b/usr/src/lib/krb5/kdb/mapfile-vers
index da493e0dfa..fdf1ffa70a 100644
--- a/usr/src/lib/krb5/kdb/mapfile-vers
+++ b/usr/src/lib/krb5/kdb/mapfile-vers
@@ -43,12 +43,12 @@
 $mapfile_version 2
 
 SYMBOL_VERSION SUNW_1.1 {
-	global:
+    global:
 	SUNW_1.1;
 };
 
 SYMBOL_VERSION SUNWprivate_1.1 {
-	global:
+    global:
 	krb5_db_alloc;
 	krb5_db_create;
 	krb5_db_create_policy;
@@ -95,13 +95,28 @@ SYMBOL_VERSION SUNWprivate_1.1 {
 	krb5_dbekd_decrypt_key_data;
 	krb5_dbekd_encrypt_key_data;
 	krb5_def_store_mkey;
-	krb5_kt_kdb_ops;
+	krb5_kt_kdb_ops		{
+				  ASSERT = {
+					  TYPE = OBJECT;
+					  SIZE = 48;
+					};
+				};
 	krb5_ktkdb_close;
 	krb5_ktkdb_get_entry;
 	krb5_ktkdb_resolve;
 	krb5_ktkdb_set_context;
-	krb5_mkey_pwd_prompt1;
-	krb5_mkey_pwd_prompt2;
+	krb5_mkey_pwd_prompt1	{
+				  ASSERT = {
+					  TYPE = OBJECT;
+					  SIZE = 4;
+					};
+				};
+	krb5_mkey_pwd_prompt2	{
+				  ASSERT = {
+					  TYPE = OBJECT;
+					  SIZE = 4;
+					};
+				};
 	ulog_add_update;
 	ulog_conv_2logentry;
 	ulog_delete_update;
@@ -111,6 +126,6 @@ SYMBOL_VERSION SUNWprivate_1.1 {
 	ulog_map;
 	ulog_replay;
 	ulog_set_role;
-	local:
+    local:
 	*;
 };
diff --git a/usr/src/lib/krb5/plugins/kdb/db2/mapfile-vers b/usr/src/lib/krb5/plugins/kdb/db2/mapfile-vers
index d2b91c0614..d5be91cf83 100644
--- a/usr/src/lib/krb5/plugins/kdb/db2/mapfile-vers
+++ b/usr/src/lib/krb5/plugins/kdb/db2/mapfile-vers
@@ -36,15 +36,16 @@
 # MAPFILE HEADER END
 #
 
-# Due to mistakes made early in the history of this library, there are
-# no SUNW_1.1 symbols, but the version is now kept as a placeholder.
-# Don't add any symbols to this version.
-
 $mapfile_version 2
 
 SYMBOL_VERSION SUNWprivate_1.1 {
     global:
-        kdb_function_table;
+	kdb_function_table	{
+				  ASSERT = {
+					  TYPE = OBJECT;
+					  SIZE = addrsize[39];
+					};
+				};
     local:
 	*;
 };
diff --git a/usr/src/lib/krb5/plugins/kdb/ldap/mapfile-vers b/usr/src/lib/krb5/plugins/kdb/ldap/mapfile-vers
index 35851d60b1..d5be91cf83 100644
--- a/usr/src/lib/krb5/plugins/kdb/ldap/mapfile-vers
+++ b/usr/src/lib/krb5/plugins/kdb/ldap/mapfile-vers
@@ -40,7 +40,12 @@ $mapfile_version 2
 
 SYMBOL_VERSION SUNWprivate_1.1 {
     global:
-        kdb_function_table;
+	kdb_function_table	{
+				  ASSERT = {
+					  TYPE = OBJECT;
+					  SIZE = addrsize[39];
+					};
+				};
     local:
 	*;
 };
diff --git a/usr/src/lib/krb5/plugins/preauth/pkinit/mapfile-vers b/usr/src/lib/krb5/plugins/preauth/pkinit/mapfile-vers
index 352586b973..91dc7f4027 100644
--- a/usr/src/lib/krb5/plugins/preauth/pkinit/mapfile-vers
+++ b/usr/src/lib/krb5/plugins/preauth/pkinit/mapfile-vers
@@ -45,8 +45,18 @@ $mapfile_version 2
 
 SYMBOL_VERSION SUNWprivate_1.1 {
     global:
-	preauthentication_client_1;
-	preauthentication_server_1;
+	preauthentication_client_1	{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize[11];
+						};
+					};
+	preauthentication_server_1	{
+					  ASSERT = {
+						  TYPE = OBJECT;
+						  SIZE = addrsize[9];
+						};
+					};
     local:
-        *;
+	*;
 };
diff --git a/usr/src/lib/krb5/ss/mapfile-vers b/usr/src/lib/krb5/ss/mapfile-vers
index a92c5d4731..149d376991 100644
--- a/usr/src/lib/krb5/ss/mapfile-vers
+++ b/usr/src/lib/krb5/ss/mapfile-vers
@@ -62,7 +62,12 @@ SYMBOL_VERSION SUNWprivate_1.1 {
 	ss_quit;
 	ss_self_identify;
 	ss_set_prompt;
-	ss_std_requests;
+	ss_std_requests	{
+			  ASSERT = {
+				  TYPE = OBJECT;
+				  SIZE = 8;
+				};
+			};
 	ss_subsystem_name;
 	ss_subsystem_version;
 	ss_unimplemented;