WHY??? git add -f bin/default/librpc/gen_ndr/packet-dcerpc-*

[metze/samba/wip.git] / bin / default / librpc / gen_ndr / packet-dcerpc-samr.c

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-samr.c b/bin/default/librpc/gen_ndr/packet-dcerpc-samr.c
index ee14ae1181c0742b405f36c8ccdd6025005b2db5..65f787e69b2dff76449d64cacb6260c055b100e7 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-samr.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-samr.c
@@ -119,10 +119,11 @@ static gint ett_samr_samr_ValidatePasswordReq = -1;
 
 /* Header field declarations */
 static gint hf_samr_samr_QueryDisplayInfo2_level = -1;
+static gint hf_samr_samr_UserInfo_val23_info23 = -1;
+static gint hf_samr_samr_UserInfo_val1_info1 = -1;
 static gint hf_samr_samr_Connect5_connect_handle = -1;
 static gint hf_samr_samr_Connect2_system_name = -1;
 static gint hf_samr_samr_AcctFlags_ACB_DONT_REQUIRE_PREAUTH = -1;
-static gint hf_samr_samr_DomainInfo_oem = -1;
 static gint hf_samr_samr_DispInfoAscii_entries = -1;
 static gint hf_samr_samr_QueryAliasInfo_level = -1;
 static gint hf_samr_samr_DispEntryFullGroup_idx = -1;
@@ -137,9 +138,12 @@ static gint hf_samr_samr_QueryDisplayInfo3_total_size = -1;
 static gint hf_samr_samr_GetDomPwInfo_info = -1;
 static gint hf_samr_samr_QuerySecurity_sdbuf = -1;
 static gint hf_samr_samr_UserInfo3_workstations = -1;
+static gint hf_samr_samr_GroupInfo_valGROUPINFODESCRIPTION_description = -1;
 static gint hf_samr_samr_QueryUserInfo2_info = -1;
 static gint hf_samr_samr_QueryDisplayInfo3_start_idx = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_PARAMETERS = -1;
+static gint hf_samr_samr_UserInfo_val3_info3 = -1;
+static gint hf_samr_samr_DomainInfo_val5_info5 = -1;
 static gint hf_samr_samr_DomGeneralInformation_num_users = -1;
 static gint hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_ALIAS = -1;
 static gint hf_samr_samr_UserInfo21_acct_flags = -1;
@@ -151,9 +155,7 @@ static gint hf_samr_samr_ValidatePasswordReq3_hash = -1;
 static gint hf_samr_samr_Connect2_access_mask = -1;
 static gint hf_samr_samr_SetUserInfo_user_handle = -1;
 static gint hf_samr_samr_QueryDomainInfo_info = -1;
-static gint hf_samr_samr_UserInfo_info16 = -1;
 static gint hf_samr_samr_SetBootKeyInformation_unknown1 = -1;
-static gint hf_samr_samr_GroupInfo_attributes = -1;
 static gint hf_samr_samr_DomInfo3_force_logoff_time = -1;
 static gint hf_samr_samr_ChangePasswordUser_new_nt_crypted = -1;
 static gint hf_samr_samr_ChangePasswordUser3_reject = -1;
@@ -171,6 +173,7 @@ static gint hf_samr_samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_BAD_PASSWORD_
 static gint hf_samr_samr_Connect5_access_mask = -1;
 static gint hf_samr_samr_Ids_ids = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_LAST_PWD_CHANGE = -1;
+static gint hf_samr_samr_UserInfo_val11_info11 = -1;
 static gint hf_samr_samr_UserInfo20_parameters = -1;
 static gint hf_samr_samr_UserInfo18_lm_pwd = -1;
 static gint hf_samr_samr_UserInfo1_account_name = -1;
@@ -183,6 +186,7 @@ static gint hf_samr_samr_UserInfo21_private_data_sensitive = -1;
 static gint hf_samr_samr_ChangePasswordUser_nt_cross = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_ACCOUNT_NAME = -1;
 static gint hf_samr_samr_UserInfo21_rid = -1;
+static gint hf_samr_samr_ValidatePasswordRep_val1_ctr1 = -1;
 static gint hf_samr_samr_OpenGroup_access_mask = -1;
 static gint hf_samr_samr_ValidatePasswordReq3_password = -1;
 static gint hf_samr_samr_UserInfo5_logon_script = -1;
@@ -191,24 +195,26 @@ static gint hf_samr_samr_AddGroupMember_group_handle = -1;
 static gint hf_samr_samr_ValidatePasswordInfo_pwd_history_len = -1;
 static gint hf_samr_samr_DispInfoFullGroups_entries = -1;
 static gint hf_samr_samr_UserInfo5_bad_password_count = -1;
-static gint hf_samr_samr_DomainInfo_info5 = -1;
 static gint hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_ADD_MEMBER = -1;
-static gint hf_samr_samr_UserInfo_info6 = -1;
 static gint hf_samr_samr_Connect5_info_out = -1;
 static gint hf_samr_samr_Connect_connect_handle = -1;
 static gint hf_samr_samr_UserInfo3_logon_script = -1;
 static gint hf_samr_samr_SetUserInfo_level = -1;
 static gint hf_samr_samr_UserInfo21_last_logon = -1;
+static gint hf_samr_samr_DomainInfo_val13_info13 = -1;
 static gint hf_samr_samr_GetBootKeyInformation_domain_handle = -1;
 static gint hf_samr_samr_QueryDisplayInfo3_returned_size = -1;
+static gint hf_samr_samr_UserInfo_val8_info8 = -1;
 static gint hf_samr_samr_ValidatePasswordReq3_account = -1;
+static gint hf_samr_samr_UserInfo_val12_info12 = -1;
 static gint hf_samr_samr_UserInfo7_account_name = -1;
 static gint hf_samr_samr_UserInfo23_info = -1;
 static gint hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_1 = -1;
 static gint hf_samr_samr_UserInfo3_last_logon = -1;
-static gint hf_samr_samr_UserInfo_info10 = -1;
+static gint hf_samr_samr_UserInfo_val26_info26 = -1;
 static gint hf_samr_samr_EnumDomainGroups_max_size = -1;
 static gint hf_samr_samr_PasswordProperties_DOMAIN_PASSWORD_NO_ANON_CHANGE = -1;
+static gint hf_samr_samr_DomainInfo_val8_info8 = -1;
 static gint hf_samr_samr_UserInfo3_full_name = -1;
 static gint hf_samr_samr_SetUserInfo2_user_handle = -1;
 static gint hf_samr_samr_DispEntryAscii_account_name = -1;
@@ -217,8 +223,6 @@ static gint hf_samr_samr_ChangePasswordUser_lm_present = -1;
 static gint hf_samr_samr_AddMultipleMembersToAlias_sids = -1;
 static gint hf_samr_samr_OpenDomain_domain_handle = -1;
 static gint hf_samr_samr_DomInfo13_sequence_num = -1;
-static gint hf_samr_samr_UserInfo_info21 = -1;
-static gint hf_samr_samr_ValidatePasswordReq_req1 = -1;
 static gint hf_samr_samr_GetAliasMembership_domain_handle = -1;
 static gint hf_samr_samr_AcctFlags_ACB_MNS = -1;
 static gint hf_samr_samr_DispEntryFullGroup_description = -1;
@@ -228,7 +232,7 @@ static gint hf_samr_samr_LookupNames_names = -1;
 static gint hf_samr_samr_PasswordProperties_DOMAIN_REFUSE_PASSWORD_CHANGE = -1;
 static gint hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_CHANGE_GROUP_MEMBERSHIP = -1;
 static gint hf_samr_samr_PwInfo_password_properties = -1;
-static gint hf_samr_samr_ValidatePasswordReq_req2 = -1;
+static gint hf_samr_samr_ValidatePasswordReq_val3_req3 = -1;
 static gint hf_samr_samr_DomGeneralInformation2_lockout_window = -1;
 static gint hf_samr_samr_QueryDisplayInfo2_returned_size = -1;
 static gint hf_samr_samr_SetBootKeyInformation_unknown2 = -1;
@@ -238,8 +242,8 @@ static gint hf_samr_samr_Ids_count = -1;
 static gint hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_SET_LOC_COM = -1;
 static gint hf_samr_samr_AcctFlags_ACB_SMARTCARD_REQUIRED = -1;
 static gint hf_samr_samr_ChangePasswordUser3_nt_verifier = -1;
-static gint hf_samr_samr_UserInfo_info17 = -1;
 static gint hf_samr_samr_LookupRids_types = -1;
+static gint hf_samr_samr_UserInfo_val20_info20 = -1;
 static gint hf_samr_samr_DeleteGroupMember_rid = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_PROFILE_PATH = -1;
 static gint hf_samr_samr_ChangePasswordUser3_lm_change = -1;
@@ -251,13 +255,15 @@ static gint hf_samr_samr_ValidatePasswordReq1_info = -1;
 static gint hf_samr_samr_UserInfo21_home_drive = -1;
 static gint hf_samr_samr_AcctFlags_ACB_PWNOEXP = -1;
 static gint hf_samr_samr_DomOEMInformation_oem_information = -1;
+static gint hf_samr_samr_DispInfo_val4_info4 = -1;
 static gint hf_samr_samr_SetBootKeyInformation_connect_handle = -1;
 static gint hf_samr_samr_EnumDomainAliases_num_entries = -1;
 static gint hf_samr_samr_AcctFlags_ACB_SVRTRUST = -1;
 static gint hf_samr_samr_OpenAlias_domain_handle = -1;
 static gint hf_samr_samr_DomGeneralInformation_oem_information = -1;
-static gint hf_samr_samr_UserInfo_info8 = -1;
 static gint hf_samr_samr_UserInfo25_info = -1;
+static gint hf_samr_samr_ValidatePasswordReq_val2_req2 = -1;
+static gint hf_samr_samr_DomainInfo_val12_info12 = -1;
 static gint hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_GROUP_MEMBERSHIP = -1;
 static gint hf_samr_samr_CreateDomainGroup_name = -1;
 static gint hf_samr_samr_DomGeneralInformation_num_groups = -1;
@@ -269,7 +275,8 @@ static gint hf_samr_samr_UserInfo21_full_name = -1;
 static gint hf_samr_samr_GetDomPwInfo_domain_name = -1;
 static gint hf_samr_samr_UserInfo3_primary_gid = -1;
 static gint hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_LOOKUP_INFO = -1;
-static gint hf_samr_samr_UserInfo_info5 = -1;
+static gint hf_samr_samr_GroupInfo_valGROUPINFOATTRIBUTES_attributes = -1;
+static gint hf_samr_samr_AliasInfo_valALIASINFODESCRIPTION_description = -1;
 static gint hf_samr_samr_RidWithAttribute_rid = -1;
 static gint hf_samr_samr_UserInfo3_home_directory = -1;
 static gint hf_samr_samr_ChangePasswordUser_cross2_present = -1;
@@ -280,19 +287,20 @@ static gint hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_REMOVE_MEMBER = -1;
 static gint hf_samr_samr_SetMemberAttributesOfGroup_unknown1 = -1;
 static gint hf_samr_samr_GetDisplayEnumerationIndex2_level = -1;
 static gint hf_samr_samr_AcctFlags_ACB_ENC_TXT_PWD_ALLOWED = -1;
-static gint hf_samr_samr_AliasInfo_description = -1;
 static gint hf_samr_samr_QueryDisplayInfo_info = -1;
 static gint hf_samr_samr_GroupInfoAll_num_members = -1;
 static gint hf_samr_samr_SetGroupInfo_group_handle = -1;
 static gint hf_samr_status = -1;
 static gint hf_samr_samr_UserInfo5_rid = -1;
 static gint hf_samr_samr_UserInfo12_profile_path = -1;
+static gint hf_samr_samr_UserInfo_val17_info17 = -1;
 static gint hf_samr_samr_LookupDomain_connect_handle = -1;
 static gint hf_samr_samr_UserInfo21_comment = -1;
 static gint hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_2 = -1;
-static gint hf_samr_samr_UserInfo_info14 = -1;
+static gint hf_samr_samr_DispInfo_val2_info2 = -1;
 static gint hf_samr_samr_CreateUser2_access_granted = -1;
 static gint hf_samr_samr_ConnectInfo1_client_version = -1;
+static gint hf_samr_samr_DispInfo_val3_info3 = -1;
 static gint hf_samr_samr_UserInfo5_acct_flags = -1;
 static gint hf_samr_samr_UserInfo24_password_expired = -1;
 static gint hf_samr_samr_AcctFlags_ACB_NOT_DELEGATED = -1;
@@ -312,17 +320,15 @@ static gint hf_samr_samr_CryptPasswordEx_data = -1;
 static gint hf_samr_samr_SetAliasInfo_alias_handle = -1;
 static gint hf_samr_samr_ValidatePasswordInfo_bad_password_time = -1;
 static gint hf_samr_samr_AcctFlags_ACB_USE_DES_KEY_ONLY = -1;
-static gint hf_samr_samr_DispInfo_info1 = -1;
 static gint hf_samr_samr_SetDomainInfo_level = -1;
-static gint hf_samr_samr_DispInfo_info4 = -1;
 static gint hf_samr_samr_DomInfo8_domain_create_time = -1;
+static gint hf_samr_samr_UserInfo_val7_info7 = -1;
 static gint hf_samr_samr_ChangePasswordUser_old_nt_crypted = -1;
 static gint hf_samr_samr_DomGeneralInformation_force_logoff_time = -1;
 static gint hf_samr_samr_DomInfo12_lockout_threshold = -1;
 static gint hf_samr_samr_GroupInfoAttributes_attributes = -1;
 static gint hf_samr_samr_CreateDomainGroup_domain_handle = -1;
 static gint hf_samr_samr_SamArray_entries = -1;
-static gint hf_samr_samr_UserInfo_info9 = -1;
 static gint hf_samr_samr_Connect3_access_mask = -1;
 static gint hf_samr_samr_ChangePasswordUser2_lm_password = -1;
 static gint hf_samr_samr_DispEntryGeneral_full_name = -1;
@@ -331,9 +337,9 @@ static gint hf_samr_samr_AliasInfoAll_num_members = -1;
 static gint hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_SET_INFO = -1;
 static gint hf_samr_samr_DispEntryFull_description = -1;
 static gint hf_samr_samr_LookupDomain_domain_name = -1;
-static gint hf_samr_samr_ValidatePasswordRep_ctr3 = -1;
 static gint hf_samr_samr_QueryDisplayInfo3_max_entries = -1;
 static gint hf_samr_samr_DomInfo6_primary = -1;
+static gint hf_samr_samr_ConnectInfo_val1_info1 = -1;
 static gint hf_samr_samr_PasswordProperties_DOMAIN_PASSWORD_COMPLEX = -1;
 static gint hf_samr_samr_DeleteGroupMember_group_handle = -1;
 static gint hf_samr_samr_Connect5_system_name = -1;
@@ -344,10 +350,12 @@ static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_ALLOW_PWD_CHANGE = -1;
 static gint hf_samr_samr_LookupNames_rids = -1;
 static gint hf_samr_samr_DomInfo1_min_password_length = -1;
 static gint hf_samr_samr_ValidatePasswordReq3_pwd_must_change_at_next_logon = -1;
+static gint hf_samr_samr_ValidatePasswordRep_val3_ctr3 = -1;
 static gint hf_samr_samr_QuerySecurity_handle = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_WORKSTATIONS = -1;
 static gint hf_samr_samr_GetDisplayEnumerationIndex_idx = -1;
 static gint hf_samr_samr_DomInfo9_domain_server_state = -1;
+static gint hf_samr_samr_DomainInfo_val4_oem = -1;
 static gint hf_samr_samr_Connect5_level_out = -1;
 static gint hf_samr_samr_CreateUser2_user_handle = -1;
 static gint hf_samr_samr_UserInfo5_last_logon = -1;
@@ -355,13 +363,15 @@ static gint hf_samr_samr_ChangePasswordUser2_server = -1;
 static gint hf_samr_samr_SetDomainInfo_info = -1;
 static gint hf_samr_samr_SamArray_count = -1;
 static gint hf_samr_samr_UserInfo24_password = -1;
+static gint hf_samr_samr_DomainInfo_val2_general = -1;
 static gint hf_samr_samr_DispEntryFull_idx = -1;
 static gint hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_INITIALIZE_SERVER = -1;
+static gint hf_samr_samr_ValidatePasswordReq_val1_req1 = -1;
 static gint hf_samr_samr_DispEntryFull_acct_flags = -1;
 static gint hf_samr_samr_DomInfo13_modified_count_at_last_promotion = -1;
 static gint hf_samr_samr_GetAliasMembership_sids = -1;
-static gint hf_samr_samr_UserInfo_info1 = -1;
 static gint hf_samr_samr_GroupAttrs_SE_GROUP_RESOURCE = -1;
+static gint hf_samr_samr_AliasInfo_valALIASINFOALL_all = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_DESCRIPTION = -1;
 static gint hf_samr_samr_UserInfo18_nt_pwd = -1;
 static gint hf_samr_samr_UserInfo21_nt_owf_password = -1;
@@ -369,13 +379,12 @@ static gint hf_samr_samr_OpenAlias_alias_handle = -1;
 static gint hf_samr_samr_SetMemberAttributesOfGroup_group_handle = -1;
 static gint hf_samr_samr_UserInfo23_password = -1;
 static gint hf_samr_samr_UserInfo21_last_logoff = -1;
-static gint hf_samr_samr_DispInfo_info2 = -1;
 static gint hf_samr_samr_EnumDomainUsers_resume_handle = -1;
 static gint hf_samr_samr_ValidatePasswordRepCtr_status = -1;
 static gint hf_samr_samr_SetMemberAttributesOfGroup_unknown2 = -1;
-static gint hf_samr_samr_DomainInfo_general2 = -1;
 static gint hf_samr_samr_UserInfo2_reserved = -1;
 static gint hf_samr_samr_DispInfoFull_count = -1;
+static gint hf_samr_samr_DomainInfo_val9_info9 = -1;
 static gint hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_GET_MEMBERS = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_COUNTRY_CODE = -1;
 static gint hf_samr_samr_ValidatePasswordReq2_password = -1;
@@ -391,14 +400,15 @@ static gint hf_samr_samr_UserInfo21_account_name = -1;
 static gint hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_SET_INFO = -1;
 static gint hf_samr_samr_UserInfo2_comment = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_RID = -1;
-static gint hf_samr_samr_UserInfo_info23 = -1;
 static gint hf_samr_samr_UserInfo18_password_expired = -1;
+static gint hf_samr_samr_UserInfo_val21_info21 = -1;
 static gint hf_samr_samr_QueryDisplayInfo2_total_size = -1;
 static gint hf_samr_samr_UserInfo25_password = -1;
 static gint hf_samr_samr_ChangePasswordUser2_lm_verifier = -1;
 static gint hf_samr_samr_SetDomainInfo_domain_handle = -1;
 static gint hf_samr_samr_UserInfo4_logon_hours = -1;
 static gint hf_samr_samr_UserInfo5_home_directory = -1;
+static gint hf_samr_samr_UserInfo_val9_info9 = -1;
 static gint hf_samr_samr_DomInfo12_lockout_duration = -1;
 static gint hf_samr_samr_CreateUser_account_name = -1;
 static gint hf_samr_samr_UserInfo9_primary_gid = -1;
@@ -421,12 +431,9 @@ static gint hf_samr_samr_ValidatePasswordReq2_password_matched = -1;
 static gint hf_samr_samr_CreateUser2_domain_handle = -1;
 static gint hf_samr_samr_QuerySecurity_sec_info = -1;
 static gint hf_samr_samr_AddGroupMember_rid = -1;
-static gint hf_samr_samr_DomainInfo_info12 = -1;
 static gint hf_samr_samr_OpenGroup_domain_handle = -1;
 static gint hf_samr_samr_QueryDisplayInfo_max_entries = -1;
 static gint hf_samr_samr_EnumDomains_resume_handle = -1;
-static gint hf_samr_samr_UserInfo_info7 = -1;
-static gint hf_samr_samr_GroupInfo_all2 = -1;
 static gint hf_samr_samr_UserInfo1_full_name = -1;
 static gint hf_samr_samr_QueryDisplayInfo3_domain_handle = -1;
 static gint hf_samr_samr_RemoveMemberFromForeignDomain_domain_handle = -1;
@@ -434,7 +441,9 @@ static gint hf_samr_samr_OpenGroup_group_handle = -1;
 static gint hf_samr_samr_EnumDomainGroups_resume_handle = -1;
 static gint hf_samr_samr_SetUserInfo2_info = -1;
 static gint hf_samr_samr_QueryGroupInfo_group_handle = -1;
+static gint hf_samr_samr_UserInfo_val13_info13 = -1;
 static gint hf_samr_samr_ChangePasswordUser3_nt_password = -1;
+static gint hf_samr_samr_UserInfo_val16_info16 = -1;
 static gint hf_samr_samr_UserInfo21_buf_count = -1;
 static gint hf_samr_samr_PwInfo_min_password_length = -1;
 static gint hf_samr_samr_UserInfo21_lm_owf_password = -1;
@@ -443,40 +452,40 @@ static gint hf_samr_samr_UserInfo26_password_expired = -1;
 static gint hf_samr_samr_ChangePasswordUser_old_lm_crypted = -1;
 static gint hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_GET_MEMBERS = -1;
 static gint hf_samr_samr_AcctFlags_ACB_NORMAL = -1;
-static gint hf_samr_samr_GroupInfo_all = -1;
 static gint hf_samr_samr_UserInfo16_acct_flags = -1;
 static gint hf_samr_samr_UserInfo2_country_code = -1;
 static gint hf_samr_samr_AddGroupMember_flags = -1;
 static gint hf_samr_samr_UserInfo10_home_directory = -1;
 static gint hf_samr_samr_CreateDomainGroup_group_handle = -1;
+static gint hf_samr_samr_UserInfo_val2_info2 = -1;
 static gint hf_samr_samr_QueryUserInfo2_user_handle = -1;
 static gint hf_samr_samr_OemChangePasswordUser2_server = -1;
+static gint hf_samr_samr_AliasInfo_valALIASINFONAME_name = -1;
+static gint hf_samr_samr_DomainInfo_val6_info6 = -1;
 static gint hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_CHANGE_PASSWORD = -1;
-static gint hf_samr_samr_AliasInfo_all = -1;
 static gint hf_samr_samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_BAD_PASSWORD_TIME = -1;
 static gint hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_NAME_ETC = -1;
 static gint hf_samr_samr_ChangePasswordUser3_password3 = -1;
 static gint hf_samr_samr_UserInfo13_description = -1;
 static gint hf_samr_samr_UserInfo21_lm_password_set = -1;
-static gint hf_samr_samr_UserInfo_info2 = -1;
 static gint hf_samr_samr_EnumDomainUsers_domain_handle = -1;
 static gint hf_samr_samr_LookupRids_domain_handle = -1;
 static gint hf_samr_samr_LogonHours_bits = -1;
+static gint hf_samr_samr_UserInfo_val14_info14 = -1;
 static gint hf_samr_samr_OpenUser_domain_handle = -1;
 static gint hf_samr_samr_CreateUser2_access_mask = -1;
 static gint hf_samr_samr_GroupAttrs_SE_GROUP_ENABLED_BY_DEFAULT = -1;
 static gint hf_samr_samr_EnumDomainGroups_sam = -1;
 static gint hf_samr_samr_GroupInfoAll_name = -1;
-static gint hf_samr_samr_ValidatePasswordRep_ctr2 = -1;
-static gint hf_samr_samr_UserInfo_info24 = -1;
-static gint hf_samr_samr_DomainInfo_info3 = -1;
 static gint hf_samr_samr_EnumDomainGroups_num_entries = -1;
 static gint hf_samr_samr_AcctFlags_ACB_PWNOTREQ = -1;
 static gint hf_samr_samr_UserInfo3_bad_password_count = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_CODE_PAGE = -1;
 static gint hf_samr_samr_ChangePasswordUser_new_lm_crypted = -1;
 static gint hf_samr_samr_LookupNames_types = -1;
+static gint hf_samr_samr_UserInfo_val5_info5 = -1;
 static gint hf_samr_samr_SamEntry_idx = -1;
+static gint hf_samr_samr_DomainInfo_val3_info3 = -1;
 static gint hf_samr_samr_UserInfo3_logon_hours = -1;
 static gint hf_samr_samr_ChangePasswordUser3_account = -1;
 static gint hf_samr_samr_DomInfo8_sequence_num = -1;
@@ -488,18 +497,17 @@ static gint hf_samr_samr_ConnectInfo1_unknown2 = -1;
 static gint hf_samr_samr_TestPrivateFunctionsUser_user_handle = -1;
 static gint hf_samr_samr_QueryDisplayInfo2_domain_handle = -1;
 static gint hf_samr_samr_AliasInfoAll_name = -1;
+static gint hf_samr_samr_DispInfo_val1_info1 = -1;
 static gint hf_samr_samr_Connect_access_mask = -1;
 static gint hf_samr_samr_GetUserPwInfo_user_handle = -1;
 static gint hf_samr_samr_DispEntryFull_rid = -1;
 static gint hf_samr_samr_OpenAlias_access_mask = -1;
-static gint hf_samr_samr_GroupInfo_description = -1;
 static gint hf_samr_samr_OpenGroup_rid = -1;
 static gint hf_samr_samr_GroupAttrs_SE_GROUP_OWNER = -1;
 static gint hf_samr_samr_EnumDomainAliases_sam = -1;
 static gint hf_samr_samr_LogonHours_units_per_week = -1;
 static gint hf_samr_samr_DomGeneralInformation_role = -1;
 static gint hf_samr_samr_QueryDisplayInfo2_buf_size = -1;
-static gint hf_samr_samr_DomainInfo_info13 = -1;
 static gint hf_samr_samr_SetSecurity_sec_info = -1;
 static gint hf_samr_samr_PasswordProperties_DOMAIN_PASSWORD_STORE_CLEARTEXT = -1;
 static gint hf_samr_samr_DomGeneralInformation2_lockout_threshold = -1;
@@ -508,13 +516,13 @@ static gint hf_samr_samr_ChangePasswordUser2_account = -1;
 static gint hf_samr_samr_ChangePasswordUser3_lm_password = -1;
 static gint hf_samr_samr_UserInfo3_account_name = -1;
 static gint hf_samr_samr_Connect3_system_name = -1;
-static gint hf_samr_samr_UserInfo_info11 = -1;
-static gint hf_samr_samr_DomainInfo_info9 = -1;
 static gint hf_samr_samr_SamEntry_name = -1;
 static gint hf_samr_samr_UserInfo3_acct_flags = -1;
 static gint hf_samr_samr_UserInfo3_allow_password_change = -1;
 static gint hf_samr_samr_QueryDomainInfo2_level = -1;
 static gint hf_samr_samr_GetDisplayEnumerationIndex_name = -1;
+static gint hf_samr_samr_DomainInfo_val7_info7 = -1;
+static gint hf_samr_samr_UserInfo_val24_info24 = -1;
 static gint hf_samr_samr_ValidatePasswordReq3_info = -1;
 static gint hf_samr_samr_ValidatePasswordInfo_lockout_time = -1;
 static gint hf_samr_samr_Connect4_access_mask = -1;
@@ -530,19 +538,19 @@ static gint hf_samr_samr_UserInfo5_home_drive = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_FORCE_PWD_CHANGE = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_LAST_LOGOFF = -1;
 static gint hf_samr_samr_RidWithAttributeArray_rids = -1;
+static gint hf_samr_samr_GroupInfo_valGROUPINFOALL2_all2 = -1;
 static gint hf_samr_samr_DeleteDomainGroup_group_handle = -1;
 static gint hf_samr_samr_Password_hash = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_OWF_PWD = -1;
-static gint hf_samr_samr_UserInfo_info25 = -1;
 static gint hf_samr_samr_QueryDisplayInfo_start_idx = -1;
 static gint hf_samr_samr_UserInfo3_home_drive = -1;
-static gint hf_samr_samr_UserInfo_info13 = -1;
 static gint hf_samr_samr_DeleteAliasMember_alias_handle = -1;
 static gint hf_samr_samr_QueryDomainInfo_domain_handle = -1;
 static gint hf_samr_samr_ChangePasswordUser2_nt_password = -1;
 static gint hf_samr_samr_RidAttrArray_attributes = -1;
 static gint hf_samr_samr_ValidatePasswordInfo_bad_pwd_count = -1;
 static gint hf_samr_samr_QueryGroupMember_rids = -1;
+static gint hf_samr_samr_DomainInfo_val1_info1 = -1;
 static gint hf_samr_samr_UserInfo21_password_expired = -1;
 static gint hf_samr_samr_EnumDomains_buf_size = -1;
 static gint hf_samr_samr_DomInfo1_max_password_age = -1;
@@ -551,11 +559,9 @@ static gint hf_samr_samr_GroupInfoAll_description = -1;
 static gint hf_samr_samr_UserInfo3_logon_count = -1;
 static gint hf_samr_samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_PASSWORD_HISTORY = -1;
 static gint hf_samr_samr_AcctFlags_ACB_PARTIAL_SECRETS_ACCOUNT = -1;
-static gint hf_samr_samr_GroupInfo_name = -1;
 static gint hf_samr_samr_UserInfo3_force_password_change = -1;
 static gint hf_samr_samr_ChangePasswordUser_nt_present = -1;
 static gint hf_samr_samr_UserInfo21_home_directory = -1;
-static gint hf_samr_samr_UserInfo_info12 = -1;
 static gint hf_samr_samr_OemChangePasswordUser2_password = -1;
 static gint hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_CREATE_ALIAS = -1;
 static gint hf_samr_samr_EnumDomainGroups_domain_handle = -1;
@@ -568,14 +574,14 @@ static gint hf_samr_samr_GetGroupsForUser_user_handle = -1;
 static gint hf_samr_samr_QueryDomainInfo2_domain_handle = -1;
 static gint hf_samr_samr_UserInfo14_workstations = -1;
 static gint hf_samr_samr_GetDisplayEnumerationIndex_domain_handle = -1;
-static gint hf_samr_samr_DispInfo_info3 = -1;
-static gint hf_samr_samr_DomainInfo_info8 = -1;
 static gint hf_samr_samr_DispInfoGeneral_entries = -1;
 static gint hf_samr_samr_UserInfo8_full_name = -1;
 static gint hf_samr_samr_UserInfo21_logon_count = -1;
 static gint hf_samr_samr_UserInfo21_code_page = -1;
 static gint hf_samr_samr_DispEntryFullGroup_acct_flags = -1;
 static gint hf_samr_samr_AcctFlags_ACB_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION = -1;
+static gint hf_samr_samr_UserInfo_val25_info25 = -1;
+static gint hf_samr_samr_DispInfo_val5_info5 = -1;
 static gint hf_samr_samr_SetUserInfo_info = -1;
 static gint hf_samr_samr_OpenDomain_sid = -1;
 static gint hf_samr_samr_CreateUser2_acct_flags = -1;
@@ -583,9 +589,7 @@ static gint hf_samr_samr_DispEntryFull_account_name = -1;
 static gint hf_samr_userPwdChangeFailureInformation_filterModuleName = -1;
 static gint hf_samr_samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_PASSWORD_HISTORY_LENGTH = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_HOME_DRIVE = -1;
-static gint hf_samr_samr_DomainInfo_info1 = -1;
 static gint hf_samr_samr_RidAttrArray_rids = -1;
-static gint hf_samr_samr_ValidatePasswordRep_ctr1 = -1;
 static gint hf_samr_samr_UserInfo18_nt_pwd_active = -1;
 static gint hf_samr_samr_AcctFlags_ACB_DOMTRUST = -1;
 static gint hf_samr_samr_ChangePasswordUser_lm_cross = -1;
@@ -607,7 +611,6 @@ static gint hf_samr_samr_OemChangePasswordUser2_account = -1;
 static gint hf_samr_samr_RemoveMultipleMembersFromAlias_sids = -1;
 static gint hf_samr_samr_QueryDisplayInfo2_info = -1;
 static gint hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_ENUM_DOMAINS = -1;
-static gint hf_samr_samr_UserInfo_info4 = -1;
 static gint hf_samr_samr_DomInfo1_password_properties = -1;
 static gint hf_samr_samr_UserInfo21_logon_script = -1;
 static gint hf_samr_samr_AcctFlags_ACB_AUTOLOCK = -1;
@@ -615,7 +618,6 @@ static gint hf_samr_samr_CreateUser_domain_handle = -1;
 static gint hf_samr_samr_GetBootKeyInformation_unknown = -1;
 static gint hf_samr_samr_RidWithAttribute_attributes = -1;
 static gint hf_samr_samr_CryptPassword_data = -1;
-static gint hf_samr_samr_AliasInfo_name = -1;
 static gint hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_CREATE_USER = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_COMMENT = -1;
 static gint hf_samr_samr_UserInfo3_last_password_change = -1;
@@ -632,20 +634,19 @@ static gint hf_samr_samr_UserInfo21_logon_hours = -1;
 static gint hf_samr_samr_UserInfo21_country_code = -1;
 static gint hf_samr_samr_AddAliasMember_alias_handle = -1;
 static gint hf_samr_samr_SetDsrmPassword_hash = -1;
-static gint hf_samr_samr_DomainInfo_general = -1;
 static gint hf_samr_samr_QueryDisplayInfo_domain_handle = -1;
 static gint hf_samr_samr_GroupAttrs_SE_GROUP_MANDATORY = -1;
 static gint hf_samr_samr_UserInfo5_description = -1;
 static gint hf_samr_samr_DomInfo7_role = -1;
 static gint hf_samr_samr_UserInfo21_workstations = -1;
 static gint hf_samr_samr_DispEntryGeneral_description = -1;
+static gint hf_samr_samr_UserInfo_val6_info6 = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_PRIVATE_DATA = -1;
 static gint hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS = -1;
-static gint hf_samr_samr_ValidatePasswordReq_req3 = -1;
 static gint hf_samr_samr_ChangePasswordUser2_nt_verifier = -1;
 static gint hf_samr_samr_AcctFlags_ACB_TRUSTED_FOR_DELEGATION = -1;
+static gint hf_samr_samr_UserInfo_val18_info18 = -1;
 static gint hf_samr_samr_EnumDomains_connect_handle = -1;
-static gint hf_samr_samr_UserInfo_info18 = -1;
 static gint hf_samr_samr_CreateDomAlias_access_mask = -1;
 static gint hf_samr_samr_UserInfo21_force_password_change = -1;
 static gint hf_samr_samr_GetDisplayEnumerationIndex2_domain_handle = -1;
@@ -665,14 +666,13 @@ static gint hf_samr_samr_AddMultipleMembersToAlias_alias_handle = -1;
 static gint hf_samr_samr_OpenUser_access_mask = -1;
 static gint hf_samr_samr_RemoveMultipleMembersFromAlias_alias_handle = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_LOGON_HOURS = -1;
+static gint hf_samr_samr_GroupInfo_valGROUPINFONAME_name = -1;
 static gint hf_samr_samr_ChangePasswordUser3_dominfo = -1;
 static gint hf_samr_samr_ValidationBlob_data = -1;
 static gint hf_samr_samr_UserInfo18_lm_pwd_active = -1;
 static gint hf_samr_samr_CreateDomAlias_domain_handle = -1;
-static gint hf_samr_samr_UserInfo_info26 = -1;
 static gint hf_samr_samr_EnumDomainAliases_domain_handle = -1;
 static gint hf_samr_samr_GroupInfoAll_attributes = -1;
-static gint hf_samr_samr_DomainInfo_info7 = -1;
 static gint hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_CONNECT_TO_SERVER = -1;
 static gint hf_samr_samr_EnumDomains_num_entries = -1;
 static gint hf_samr_samr_UserInfo21_parameters = -1;
@@ -684,7 +684,6 @@ static gint hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1 = -1;
 static gint hf_samr_samr_GetAliasMembership_rids = -1;
 static gint hf_samr_samr_CreateDomAlias_alias_handle = -1;
 static gint hf_samr_samr_UserInfo6_account_name = -1;
-static gint hf_samr_samr_UserInfo_info3 = -1;
 static gint hf_samr_samr_Connect5_level_in = -1;
 static gint hf_samr_samr_DomInfo12_lockout_window = -1;
 static gint hf_samr_samr_CreateUser_user_handle = -1;
@@ -693,10 +692,8 @@ static gint hf_samr_samr_GetUserPwInfo_info = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_SEC_DESC = -1;
 static gint hf_samr_samr_EnumDomainUsers_acct_flags = -1;
 static gint hf_samr_samr_UserInfo3_rid = -1;
-static gint hf_samr_samr_DomainInfo_info6 = -1;
 static gint hf_samr_samr_CreateDomAlias_alias_name = -1;
 static gint hf_samr_samr_EnumDomainUsers_sam = -1;
-static gint hf_samr_samr_DispInfo_info5 = -1;
 static gint hf_samr_samr_GetGroupsForUser_rids = -1;
 static gint hf_samr_samr_UserInfo3_last_logoff = -1;
 static gint hf_samr_samr_ValidatePasswordRepCtr_info = -1;
@@ -710,7 +707,6 @@ static gint hf_samr_samr_OpenAlias_rid = -1;
 static gint hf_samr_samr_Close_handle = -1;
 static gint hf_samr_samr_Connect5_info_in = -1;
 static gint hf_samr_samr_UserInfo21_nt_password_set = -1;
-static gint hf_samr_samr_UserInfo_info20 = -1;
 static gint hf_samr_samr_UserInfo21_private_data = -1;
 static gint hf_samr_samr_CreateUser_access_mask = -1;
 static gint hf_samr_samr_UserInfo5_account_name = -1;
@@ -719,6 +715,7 @@ static gint hf_samr_samr_UserInfo5_full_name = -1;
 static gint hf_samr_samr_ChangePasswordUser3_lm_verifier = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_PRIMARY_GID = -1;
 static gint hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_3 = -1;
+static gint hf_samr_samr_GroupInfo_valGROUPINFOALL_all = -1;
 static gint hf_samr_samr_GroupAttrs_SE_GROUP_USE_FOR_DENY_ONLY = -1;
 static gint hf_samr_samr_DispInfoAscii_count = -1;
 static gint hf_samr_samr_GetMembersInAlias_sids = -1;
@@ -726,7 +723,10 @@ static gint hf_samr_samr_QueryDisplayInfo3_info = -1;
 static gint hf_samr_samr_OemChangePasswordUser2_hash = -1;
 static gint hf_samr_samr_ChangePasswordUser_user_handle = -1;
 static gint hf_samr_samr_QueryUserInfo2_level = -1;
+static gint hf_samr_samr_UserInfo_val4_info4 = -1;
+static gint hf_samr_samr_DomainInfo_val11_general2 = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_BAD_PWD_COUNT = -1;
+static gint hf_samr_samr_ValidatePasswordRep_val2_ctr2 = -1;
 static gint hf_samr_samr_ValidatePasswordReq3_clear_lockout = -1;
 static gint hf_samr_samr_Connect4_client_version = -1;
 static gint hf_samr_samr_GetDisplayEnumerationIndex_level = -1;
@@ -753,7 +753,7 @@ static gint hf_samr_samr_UserInfo5_last_password_change = -1;
 static gint hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_CREATE_GROUP = -1;
 static gint hf_samr_samr_QueryDisplayInfo_returned_size = -1;
 static gint hf_samr_samr_UserInfo21_allow_password_change = -1;
-static gint hf_samr_samr_ConnectInfo_info1 = -1;
+static gint hf_samr_samr_UserInfo_val10_info10 = -1;
 static gint hf_samr_samr_SetSecurity_handle = -1;
 static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_FULL_NAME = -1;
 static gint hf_samr_samr_AliasInfoAll_description = -1;
@@ -1100,18 +1100,18 @@ static int samr_dissect_element_DomInfo12_lockout_threshold(tvbuff_t *tvb _U_, i
 static int samr_dissect_element_DomInfo13_sequence_num(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_DomInfo13_domain_create_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_DomInfo13_modified_count_at_last_promotion(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_DomainInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_DomainInfo_general(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_DomainInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_DomainInfo_oem(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_DomainInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_DomainInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_DomainInfo_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_DomainInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_DomainInfo_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_DomainInfo_general2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_DomainInfo_info12(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_DomainInfo_info13(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_DomainInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_DomainInfo_val2_general(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_DomainInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_DomainInfo_val4_oem(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_DomainInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_DomainInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_DomainInfo_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_DomainInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_DomainInfo_val9_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_DomainInfo_val11_general2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_DomainInfo_val12_info12(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_DomainInfo_val13_info13(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_Ids_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_Ids_ids(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_Ids_ids_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1158,11 +1158,11 @@ const value_string samr_samr_GroupInfoEnum_vals[] = {
        { GROUPINFOALL2, "GROUPINFOALL2" },
 { 0, NULL }
 };
-static int samr_dissect_element_GroupInfo_all(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_GroupInfo_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_GroupInfo_attributes(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_GroupInfo_description(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_GroupInfo_all2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_GroupInfo_valGROUPINFOALL_all(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_GroupInfo_valGROUPINFONAME_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_GroupInfo_valGROUPINFOATTRIBUTES_attributes(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_GroupInfo_valGROUPINFODESCRIPTION_description(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_GroupInfo_valGROUPINFOALL2_all2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_RidAttrArray_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_RidAttrArray_rids(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_RidAttrArray_rids_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1179,9 +1179,9 @@ const value_string samr_samr_AliasInfoEnum_vals[] = {
        { ALIASINFODESCRIPTION, "ALIASINFODESCRIPTION" },
 { 0, NULL }
 };
-static int samr_dissect_element_AliasInfo_all(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_AliasInfo_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_AliasInfo_description(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_AliasInfo_valALIASINFOALL_all(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_AliasInfo_valALIASINFONAME_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_AliasInfo_valALIASINFODESCRIPTION_description(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 const value_string samr_samr_UserInfoLevel_vals[] = {
        { UserGeneralInformation, "UserGeneralInformation" },
        { UserPreferencesInformation, "UserPreferencesInformation" },
@@ -1447,29 +1447,29 @@ static int samr_dissect_element_UserInfo25_info(tvbuff_t *tvb _U_, int offset _U
 static int samr_dissect_element_UserInfo25_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_UserInfo26_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_UserInfo26_password_expired(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info10(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info11(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info12(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info13(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info14(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info16(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info17(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info18(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info20(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info21(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info23(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info24(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info25(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_UserInfo_info26(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val9_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val10_info10(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val11_info11(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val12_info12(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val13_info13(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val14_info14(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val16_info16(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val17_info17(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val18_info18(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val20_info20(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val21_info21(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val23_info23(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val24_info24(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val25_info25(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_UserInfo_val26_info26(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_RidWithAttribute_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_RidWithAttribute_attributes(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_RidWithAttributeArray_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1510,11 +1510,11 @@ static int samr_dissect_element_DispInfoAscii_count(tvbuff_t *tvb _U_, int offse
 static int samr_dissect_element_DispInfoAscii_entries(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_DispInfoAscii_entries_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_DispInfoAscii_entries__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_DispInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_DispInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_DispInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_DispInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_DispInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_DispInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_DispInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_DispInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_DispInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_DispInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_PwInfo_min_password_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_PwInfo_password_properties(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 const value_string samr_samr_ConnectVersion_vals[] = {
@@ -1539,7 +1539,7 @@ static int samr_dissect_element_userPwdChangeFailureInformation_extendedFailureR
 static int samr_dissect_element_userPwdChangeFailureInformation_filterModuleName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_ConnectInfo1_client_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_ConnectInfo1_unknown2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_ConnectInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_ConnectInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static const true_false_string samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_PASSWORD_LAST_SET_tfs = {
    "SAMR_VALIDATE_FIELD_PASSWORD_LAST_SET is SET",
    "SAMR_VALIDATE_FIELD_PASSWORD_LAST_SET is NOT SET",
@@ -1599,9 +1599,9 @@ static int samr_dissect_element_ValidatePasswordInfo_pwd_history_(tvbuff_t *tvb
 static int samr_dissect_element_ValidatePasswordInfo_pwd_history__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_ValidatePasswordRepCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_ValidatePasswordRepCtr_status(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_ValidatePasswordRep_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_ValidatePasswordRep_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_ValidatePasswordRep_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_ValidatePasswordRep_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_ValidatePasswordRep_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_ValidatePasswordRep_val3_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_ValidatePasswordReq3_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_ValidatePasswordReq3_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_ValidatePasswordReq3_account(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1615,9 +1615,9 @@ static int samr_dissect_element_ValidatePasswordReq2_hash(tvbuff_t *tvb _U_, int
 static int samr_dissect_element_ValidatePasswordReq2_password_matched(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_ValidatePasswordReq1_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_ValidatePasswordReq1_password_matched(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_ValidatePasswordReq_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_ValidatePasswordReq_req2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int samr_dissect_element_ValidatePasswordReq_req3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_ValidatePasswordReq_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_ValidatePasswordReq_val2_req2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int samr_dissect_element_ValidatePasswordReq_val3_req3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_Connect_system_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_Connect_system_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int samr_dissect_element_Connect_access_mask(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3878,97 +3878,97 @@ samr_dissect_struct_DomInfo13(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 /* IDL: } */
 
 static int
-samr_dissect_element_DomainInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_DomainInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_DomInfo1(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_info1,0);
+       offset = samr_dissect_struct_DomInfo1(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_val1_info1,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_DomainInfo_general(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_DomainInfo_val2_general(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_DomGeneralInformation(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_general,0);
+       offset = samr_dissect_struct_DomGeneralInformation(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_val2_general,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_DomainInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_DomainInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_DomInfo3(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_info3,0);
+       offset = samr_dissect_struct_DomInfo3(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_val3_info3,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_DomainInfo_oem(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_DomainInfo_val4_oem(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_DomOEMInformation(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_oem,0);
+       offset = samr_dissect_struct_DomOEMInformation(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_val4_oem,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_DomainInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_DomainInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_DomInfo5(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_info5,0);
+       offset = samr_dissect_struct_DomInfo5(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_val5_info5,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_DomainInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_DomainInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_DomInfo6(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_info6,0);
+       offset = samr_dissect_struct_DomInfo6(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_val6_info6,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_DomainInfo_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_DomainInfo_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_DomInfo7(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_info7,0);
+       offset = samr_dissect_struct_DomInfo7(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_val7_info7,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_DomainInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_DomainInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_DomInfo8(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_info8,0);
+       offset = samr_dissect_struct_DomInfo8(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_val8_info8,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_DomainInfo_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_DomainInfo_val9_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_DomInfo9(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_info9,0);
+       offset = samr_dissect_struct_DomInfo9(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_val9_info9,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_DomainInfo_general2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_DomainInfo_val11_general2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_DomGeneralInformation2(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_general2,0);
+       offset = samr_dissect_struct_DomGeneralInformation2(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_val11_general2,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_DomainInfo_info12(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_DomainInfo_val12_info12(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_DomInfo12(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_info12,0);
+       offset = samr_dissect_struct_DomInfo12(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_val12_info12,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_DomainInfo_info13(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_DomainInfo_val13_info13(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_DomInfo13(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_info13,0);
+       offset = samr_dissect_struct_DomInfo13(tvb,offset,pinfo,tree,drep,hf_samr_samr_DomainInfo_val13_info13,0);
 
        return offset;
 }
@@ -3992,51 +3992,51 @@ samr_dissect_DomainInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U
 
        switch(level) {
                case 1:
-                       offset = samr_dissect_element_DomainInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_DomainInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = samr_dissect_element_DomainInfo_general(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_DomainInfo_val2_general(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = samr_dissect_element_DomainInfo_info3(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_DomainInfo_val3_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = samr_dissect_element_DomainInfo_oem(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_DomainInfo_val4_oem(tvb, offset, pinfo, tree, drep);
                break;
 
                case 5:
-                       offset = samr_dissect_element_DomainInfo_info5(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_DomainInfo_val5_info5(tvb, offset, pinfo, tree, drep);
                break;
 
                case 6:
-                       offset = samr_dissect_element_DomainInfo_info6(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_DomainInfo_val6_info6(tvb, offset, pinfo, tree, drep);
                break;
 
                case 7:
-                       offset = samr_dissect_element_DomainInfo_info7(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_DomainInfo_val7_info7(tvb, offset, pinfo, tree, drep);
                break;
 
                case 8:
-                       offset = samr_dissect_element_DomainInfo_info8(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_DomainInfo_val8_info8(tvb, offset, pinfo, tree, drep);
                break;
 
                case 9:
-                       offset = samr_dissect_element_DomainInfo_info9(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_DomainInfo_val9_info9(tvb, offset, pinfo, tree, drep);
                break;
 
                case 11:
-                       offset = samr_dissect_element_DomainInfo_general2(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_DomainInfo_val11_general2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 12:
-                       offset = samr_dissect_element_DomainInfo_info12(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_DomainInfo_val12_info12(tvb, offset, pinfo, tree, drep);
                break;
 
                case 13:
-                       offset = samr_dissect_element_DomainInfo_info13(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_DomainInfo_val13_info13(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -4403,41 +4403,41 @@ samr_dissect_enum_GroupInfoEnum(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 /* IDL: } */
 
 static int
-samr_dissect_element_GroupInfo_all(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_GroupInfo_valGROUPINFOALL_all(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_GroupInfoAll(tvb,offset,pinfo,tree,drep,hf_samr_samr_GroupInfo_all,0);
+       offset = samr_dissect_struct_GroupInfoAll(tvb,offset,pinfo,tree,drep,hf_samr_samr_GroupInfo_valGROUPINFOALL_all,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_GroupInfo_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_GroupInfo_valGROUPINFONAME_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_lsa_String(tvb,offset,pinfo,tree,drep,hf_samr_samr_GroupInfo_name,0);
+       offset = samr_dissect_struct_lsa_String(tvb,offset,pinfo,tree,drep,hf_samr_samr_GroupInfo_valGROUPINFONAME_name,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_GroupInfo_attributes(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_GroupInfo_valGROUPINFOATTRIBUTES_attributes(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_GroupInfoAttributes(tvb,offset,pinfo,tree,drep,hf_samr_samr_GroupInfo_attributes,0);
+       offset = samr_dissect_struct_GroupInfoAttributes(tvb,offset,pinfo,tree,drep,hf_samr_samr_GroupInfo_valGROUPINFOATTRIBUTES_attributes,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_GroupInfo_description(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_GroupInfo_valGROUPINFODESCRIPTION_description(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_lsa_String(tvb,offset,pinfo,tree,drep,hf_samr_samr_GroupInfo_description,0);
+       offset = samr_dissect_struct_lsa_String(tvb,offset,pinfo,tree,drep,hf_samr_samr_GroupInfo_valGROUPINFODESCRIPTION_description,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_GroupInfo_all2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_GroupInfo_valGROUPINFOALL2_all2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_GroupInfoAll(tvb,offset,pinfo,tree,drep,hf_samr_samr_GroupInfo_all2,0);
+       offset = samr_dissect_struct_GroupInfoAll(tvb,offset,pinfo,tree,drep,hf_samr_samr_GroupInfo_valGROUPINFOALL2_all2,0);
 
        return offset;
 }
@@ -4461,23 +4461,23 @@ samr_dissect_GroupInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_
 
        switch(level) {
                case GROUPINFOALL:
-                       offset = samr_dissect_element_GroupInfo_all(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_GroupInfo_valGROUPINFOALL_all(tvb, offset, pinfo, tree, drep);
                break;
 
                case GROUPINFONAME:
-                       offset = samr_dissect_element_GroupInfo_name(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_GroupInfo_valGROUPINFONAME_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case GROUPINFOATTRIBUTES:
-                       offset = samr_dissect_element_GroupInfo_attributes(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_GroupInfo_valGROUPINFOATTRIBUTES_attributes(tvb, offset, pinfo, tree, drep);
                break;
 
                case GROUPINFODESCRIPTION:
-                       offset = samr_dissect_element_GroupInfo_description(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_GroupInfo_valGROUPINFODESCRIPTION_description(tvb, offset, pinfo, tree, drep);
                break;
 
                case GROUPINFOALL2:
-                       offset = samr_dissect_element_GroupInfo_all2(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_GroupInfo_valGROUPINFOALL2_all2(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -4676,25 +4676,25 @@ samr_dissect_enum_AliasInfoEnum(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 /* IDL: } */
 
 static int
-samr_dissect_element_AliasInfo_all(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_AliasInfo_valALIASINFOALL_all(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_AliasInfoAll(tvb,offset,pinfo,tree,drep,hf_samr_samr_AliasInfo_all,0);
+       offset = samr_dissect_struct_AliasInfoAll(tvb,offset,pinfo,tree,drep,hf_samr_samr_AliasInfo_valALIASINFOALL_all,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_AliasInfo_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_AliasInfo_valALIASINFONAME_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_lsa_String(tvb,offset,pinfo,tree,drep,hf_samr_samr_AliasInfo_name,0);
+       offset = samr_dissect_struct_lsa_String(tvb,offset,pinfo,tree,drep,hf_samr_samr_AliasInfo_valALIASINFONAME_name,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_AliasInfo_description(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_AliasInfo_valALIASINFODESCRIPTION_description(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_lsa_String(tvb,offset,pinfo,tree,drep,hf_samr_samr_AliasInfo_description,0);
+       offset = samr_dissect_struct_lsa_String(tvb,offset,pinfo,tree,drep,hf_samr_samr_AliasInfo_valALIASINFODESCRIPTION_description,0);
 
        return offset;
 }
@@ -4718,15 +4718,15 @@ samr_dissect_AliasInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_
 
        switch(level) {
                case ALIASINFOALL:
-                       offset = samr_dissect_element_AliasInfo_all(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_AliasInfo_valALIASINFOALL_all(tvb, offset, pinfo, tree, drep);
                break;
 
                case ALIASINFONAME:
-                       offset = samr_dissect_element_AliasInfo_name(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_AliasInfo_valALIASINFONAME_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case ALIASINFODESCRIPTION:
-                       offset = samr_dissect_element_AliasInfo_description(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_AliasInfo_valALIASINFODESCRIPTION_description(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -7232,185 +7232,185 @@ samr_dissect_struct_UserInfo26(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 /* IDL: } */
 
 static int
-samr_dissect_element_UserInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo1(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info1,0);
+       offset = samr_dissect_struct_UserInfo1(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val1_info1,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo2(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info2,0);
+       offset = samr_dissect_struct_UserInfo2(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val2_info2,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo3(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info3,0);
+       offset = samr_dissect_struct_UserInfo3(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val3_info3,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo4(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info4,0);
+       offset = samr_dissect_struct_UserInfo4(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val4_info4,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo5(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info5,0);
+       offset = samr_dissect_struct_UserInfo5(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val5_info5,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo6(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info6,0);
+       offset = samr_dissect_struct_UserInfo6(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val6_info6,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo7(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info7,0);
+       offset = samr_dissect_struct_UserInfo7(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val7_info7,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo8(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info8,0);
+       offset = samr_dissect_struct_UserInfo8(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val8_info8,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val9_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo9(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info9,0);
+       offset = samr_dissect_struct_UserInfo9(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val9_info9,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info10(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val10_info10(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo10(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info10,0);
+       offset = samr_dissect_struct_UserInfo10(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val10_info10,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info11(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val11_info11(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo11(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info11,0);
+       offset = samr_dissect_struct_UserInfo11(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val11_info11,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info12(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val12_info12(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo12(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info12,0);
+       offset = samr_dissect_struct_UserInfo12(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val12_info12,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info13(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val13_info13(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo13(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info13,0);
+       offset = samr_dissect_struct_UserInfo13(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val13_info13,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info14(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val14_info14(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo14(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info14,0);
+       offset = samr_dissect_struct_UserInfo14(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val14_info14,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info16(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val16_info16(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo16(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info16,0);
+       offset = samr_dissect_struct_UserInfo16(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val16_info16,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info17(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val17_info17(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo17(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info17,0);
+       offset = samr_dissect_struct_UserInfo17(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val17_info17,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info18(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val18_info18(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo18(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info18,0);
+       offset = samr_dissect_struct_UserInfo18(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val18_info18,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info20(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val20_info20(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo20(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info20,0);
+       offset = samr_dissect_struct_UserInfo20(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val20_info20,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info21(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val21_info21(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo21(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info21,0);
+       offset = samr_dissect_struct_UserInfo21(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val21_info21,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info23(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val23_info23(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo23(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info23,0);
+       offset = samr_dissect_struct_UserInfo23(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val23_info23,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info24(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val24_info24(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo24(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info24,0);
+       offset = samr_dissect_struct_UserInfo24(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val24_info24,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info25(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val25_info25(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo25(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info25,0);
+       offset = samr_dissect_struct_UserInfo25(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val25_info25,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_UserInfo_info26(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_UserInfo_val26_info26(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_UserInfo26(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_info26,0);
+       offset = samr_dissect_struct_UserInfo26(tvb,offset,pinfo,tree,drep,hf_samr_samr_UserInfo_val26_info26,0);
 
        return offset;
 }
@@ -7434,95 +7434,95 @@ samr_dissect_UserInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_,
 
        switch(level) {
                case 1:
-                       offset = samr_dissect_element_UserInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = samr_dissect_element_UserInfo_info2(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val2_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = samr_dissect_element_UserInfo_info3(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val3_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = samr_dissect_element_UserInfo_info4(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val4_info4(tvb, offset, pinfo, tree, drep);
                break;
 
                case 5:
-                       offset = samr_dissect_element_UserInfo_info5(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val5_info5(tvb, offset, pinfo, tree, drep);
                break;
 
                case 6:
-                       offset = samr_dissect_element_UserInfo_info6(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val6_info6(tvb, offset, pinfo, tree, drep);
                break;
 
                case 7:
-                       offset = samr_dissect_element_UserInfo_info7(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val7_info7(tvb, offset, pinfo, tree, drep);
                break;
 
                case 8:
-                       offset = samr_dissect_element_UserInfo_info8(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val8_info8(tvb, offset, pinfo, tree, drep);
                break;
 
                case 9:
-                       offset = samr_dissect_element_UserInfo_info9(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val9_info9(tvb, offset, pinfo, tree, drep);
                break;
 
                case 10:
-                       offset = samr_dissect_element_UserInfo_info10(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val10_info10(tvb, offset, pinfo, tree, drep);
                break;
 
                case 11:
-                       offset = samr_dissect_element_UserInfo_info11(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val11_info11(tvb, offset, pinfo, tree, drep);
                break;
 
                case 12:
-                       offset = samr_dissect_element_UserInfo_info12(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val12_info12(tvb, offset, pinfo, tree, drep);
                break;
 
                case 13:
-                       offset = samr_dissect_element_UserInfo_info13(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val13_info13(tvb, offset, pinfo, tree, drep);
                break;
 
                case 14:
-                       offset = samr_dissect_element_UserInfo_info14(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val14_info14(tvb, offset, pinfo, tree, drep);
                break;
 
                case 16:
-                       offset = samr_dissect_element_UserInfo_info16(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val16_info16(tvb, offset, pinfo, tree, drep);
                break;
 
                case 17:
-                       offset = samr_dissect_element_UserInfo_info17(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val17_info17(tvb, offset, pinfo, tree, drep);
                break;
 
                case 18:
-                       offset = samr_dissect_element_UserInfo_info18(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val18_info18(tvb, offset, pinfo, tree, drep);
                break;
 
                case 20:
-                       offset = samr_dissect_element_UserInfo_info20(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val20_info20(tvb, offset, pinfo, tree, drep);
                break;
 
                case 21:
-                       offset = samr_dissect_element_UserInfo_info21(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val21_info21(tvb, offset, pinfo, tree, drep);
                break;
 
                case 23:
-                       offset = samr_dissect_element_UserInfo_info23(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val23_info23(tvb, offset, pinfo, tree, drep);
                break;
 
                case 24:
-                       offset = samr_dissect_element_UserInfo_info24(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val24_info24(tvb, offset, pinfo, tree, drep);
                break;
 
                case 25:
-                       offset = samr_dissect_element_UserInfo_info25(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val25_info25(tvb, offset, pinfo, tree, drep);
                break;
 
                case 26:
-                       offset = samr_dissect_element_UserInfo_info26(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_UserInfo_val26_info26(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -8270,41 +8270,41 @@ samr_dissect_struct_DispInfoAscii(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-samr_dissect_element_DispInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_DispInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_DispInfoGeneral(tvb,offset,pinfo,tree,drep,hf_samr_samr_DispInfo_info1,0);
+       offset = samr_dissect_struct_DispInfoGeneral(tvb,offset,pinfo,tree,drep,hf_samr_samr_DispInfo_val1_info1,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_DispInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_DispInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_DispInfoFull(tvb,offset,pinfo,tree,drep,hf_samr_samr_DispInfo_info2,0);
+       offset = samr_dissect_struct_DispInfoFull(tvb,offset,pinfo,tree,drep,hf_samr_samr_DispInfo_val2_info2,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_DispInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_DispInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_DispInfoFullGroups(tvb,offset,pinfo,tree,drep,hf_samr_samr_DispInfo_info3,0);
+       offset = samr_dissect_struct_DispInfoFullGroups(tvb,offset,pinfo,tree,drep,hf_samr_samr_DispInfo_val3_info3,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_DispInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_DispInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_DispInfoAscii(tvb,offset,pinfo,tree,drep,hf_samr_samr_DispInfo_info4,0);
+       offset = samr_dissect_struct_DispInfoAscii(tvb,offset,pinfo,tree,drep,hf_samr_samr_DispInfo_val4_info4,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_DispInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_DispInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_DispInfoAscii(tvb,offset,pinfo,tree,drep,hf_samr_samr_DispInfo_info5,0);
+       offset = samr_dissect_struct_DispInfoAscii(tvb,offset,pinfo,tree,drep,hf_samr_samr_DispInfo_val5_info5,0);
 
        return offset;
 }
@@ -8328,23 +8328,23 @@ samr_dissect_DispInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_,
 
        switch(level) {
                case 1:
-                       offset = samr_dissect_element_DispInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_DispInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = samr_dissect_element_DispInfo_info2(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_DispInfo_val2_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = samr_dissect_element_DispInfo_info3(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_DispInfo_val3_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = samr_dissect_element_DispInfo_info4(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_DispInfo_val4_info4(tvb, offset, pinfo, tree, drep);
                break;
 
                case 5:
-                       offset = samr_dissect_element_DispInfo_info5(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_DispInfo_val5_info5(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -8568,9 +8568,9 @@ samr_dissect_struct_ConnectInfo1(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-samr_dissect_element_ConnectInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_ConnectInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_ConnectInfo1(tvb,offset,pinfo,tree,drep,hf_samr_samr_ConnectInfo_info1,0);
+       offset = samr_dissect_struct_ConnectInfo1(tvb,offset,pinfo,tree,drep,hf_samr_samr_ConnectInfo_val1_info1,0);
 
        return offset;
 }
@@ -8594,7 +8594,7 @@ samr_dissect_ConnectInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _
 
        switch(level) {
                case 1:
-                       offset = samr_dissect_element_ConnectInfo_info1(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_ConnectInfo_val1_info1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -8994,25 +8994,25 @@ samr_dissect_struct_ValidatePasswordRepCtr(tvbuff_t *tvb _U_, int offset _U_, pa
 /* IDL: } */
 
 static int
-samr_dissect_element_ValidatePasswordRep_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_ValidatePasswordRep_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_ValidatePasswordRepCtr(tvb,offset,pinfo,tree,drep,hf_samr_samr_ValidatePasswordRep_ctr1,0);
+       offset = samr_dissect_struct_ValidatePasswordRepCtr(tvb,offset,pinfo,tree,drep,hf_samr_samr_ValidatePasswordRep_val1_ctr1,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_ValidatePasswordRep_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_ValidatePasswordRep_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_ValidatePasswordRepCtr(tvb,offset,pinfo,tree,drep,hf_samr_samr_ValidatePasswordRep_ctr2,0);
+       offset = samr_dissect_struct_ValidatePasswordRepCtr(tvb,offset,pinfo,tree,drep,hf_samr_samr_ValidatePasswordRep_val2_ctr2,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_ValidatePasswordRep_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_ValidatePasswordRep_val3_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_ValidatePasswordRepCtr(tvb,offset,pinfo,tree,drep,hf_samr_samr_ValidatePasswordRep_ctr3,0);
+       offset = samr_dissect_struct_ValidatePasswordRepCtr(tvb,offset,pinfo,tree,drep,hf_samr_samr_ValidatePasswordRep_val3_ctr3,0);
 
        return offset;
 }
@@ -9036,15 +9036,15 @@ samr_dissect_ValidatePasswordRep(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
        switch(level) {
                case 1:
-                       offset = samr_dissect_element_ValidatePasswordRep_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_ValidatePasswordRep_val1_ctr1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = samr_dissect_element_ValidatePasswordRep_ctr2(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_ValidatePasswordRep_val2_ctr2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = samr_dissect_element_ValidatePasswordRep_ctr3(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_ValidatePasswordRep_val3_ctr3(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -9299,25 +9299,25 @@ samr_dissect_struct_ValidatePasswordReq1(tvbuff_t *tvb _U_, int offset _U_, pack
 /* IDL: } */
 
 static int
-samr_dissect_element_ValidatePasswordReq_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_ValidatePasswordReq_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_ValidatePasswordReq1(tvb,offset,pinfo,tree,drep,hf_samr_samr_ValidatePasswordReq_req1,0);
+       offset = samr_dissect_struct_ValidatePasswordReq1(tvb,offset,pinfo,tree,drep,hf_samr_samr_ValidatePasswordReq_val1_req1,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_ValidatePasswordReq_req2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_ValidatePasswordReq_val2_req2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_ValidatePasswordReq2(tvb,offset,pinfo,tree,drep,hf_samr_samr_ValidatePasswordReq_req2,0);
+       offset = samr_dissect_struct_ValidatePasswordReq2(tvb,offset,pinfo,tree,drep,hf_samr_samr_ValidatePasswordReq_val2_req2,0);
 
        return offset;
 }
 
 static int
-samr_dissect_element_ValidatePasswordReq_req3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+samr_dissect_element_ValidatePasswordReq_val3_req3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = samr_dissect_struct_ValidatePasswordReq3(tvb,offset,pinfo,tree,drep,hf_samr_samr_ValidatePasswordReq_req3,0);
+       offset = samr_dissect_struct_ValidatePasswordReq3(tvb,offset,pinfo,tree,drep,hf_samr_samr_ValidatePasswordReq_val3_req3,0);
 
        return offset;
 }
@@ -9341,15 +9341,15 @@ samr_dissect_ValidatePasswordReq(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
        switch(level) {
                case 1:
-                       offset = samr_dissect_element_ValidatePasswordReq_req1(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_ValidatePasswordReq_val1_req1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = samr_dissect_element_ValidatePasswordReq_req2(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_ValidatePasswordReq_val2_req2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = samr_dissect_element_ValidatePasswordReq_req3(tvb, offset, pinfo, tree, drep);
+                       offset = samr_dissect_element_ValidatePasswordReq_val3_req3(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -15540,14 +15540,16 @@ void proto_register_dcerpc_samr(void)
        static hf_register_info hf[] = {
        { &hf_samr_samr_QueryDisplayInfo2_level,
          { "Level", "samr.samr_QueryDisplayInfo2.level", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val23_info23,
+         { "Info23", "samr.samr_UserInfo_val23.info23", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val1_info1,
+         { "Info1", "samr.samr_UserInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_Connect5_connect_handle,
          { "Connect Handle", "samr.samr_Connect5.connect_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_Connect2_system_name,
          { "System Name", "samr.samr_Connect2.system_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_AcctFlags_ACB_DONT_REQUIRE_PREAUTH,
          { "Acb Dont Require Preauth", "samr.samr_AcctFlags.ACB_DONT_REQUIRE_PREAUTH", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_DONT_REQUIRE_PREAUTH_tfs), ( 0x00010000 ), NULL, HFILL }},
-       { &hf_samr_samr_DomainInfo_oem,
-         { "Oem", "samr.samr_DomainInfo.oem", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DispInfoAscii_entries,
          { "Entries", "samr.samr_DispInfoAscii.entries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryAliasInfo_level,
@@ -15576,12 +15578,18 @@ void proto_register_dcerpc_samr(void)
          { "Sdbuf", "samr.samr_QuerySecurity.sdbuf", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo3_workstations,
          { "Workstations", "samr.samr_UserInfo3.workstations", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_GroupInfo_valGROUPINFODESCRIPTION_description,
+         { "Description", "samr.samr_GroupInfo_valGROUPINFODESCRIPTION.description", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryUserInfo2_info,
          { "Info", "samr.samr_QueryUserInfo2.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryDisplayInfo3_start_idx,
          { "Start Idx", "samr.samr_QueryDisplayInfo3.start_idx", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_FieldsPresent_SAMR_FIELD_PARAMETERS,
          { "Samr Field Parameters", "samr.samr_FieldsPresent.SAMR_FIELD_PARAMETERS", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_PARAMETERS_tfs), ( 0x00200000 ), NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val3_info3,
+         { "Info3", "samr.samr_UserInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_DomainInfo_val5_info5,
+         { "Info5", "samr.samr_DomainInfo_val5.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DomGeneralInformation_num_users,
          { "Num Users", "samr.samr_DomGeneralInformation.num_users", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_ALIAS,
@@ -15604,12 +15612,8 @@ void proto_register_dcerpc_samr(void)
          { "User Handle", "samr.samr_SetUserInfo.user_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryDomainInfo_info,
          { "Info", "samr.samr_QueryDomainInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info16,
-         { "Info16", "samr.samr_UserInfo.info16", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_SetBootKeyInformation_unknown1,
          { "Unknown1", "samr.samr_SetBootKeyInformation.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_GroupInfo_attributes,
-         { "Attributes", "samr.samr_GroupInfo.attributes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DomInfo3_force_logoff_time,
          { "Force Logoff Time", "samr.samr_DomInfo3.force_logoff_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ChangePasswordUser_new_nt_crypted,
@@ -15644,6 +15648,8 @@ void proto_register_dcerpc_samr(void)
          { "Ids", "samr.samr_Ids.ids", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_FieldsPresent_SAMR_FIELD_LAST_PWD_CHANGE,
          { "Samr Field Last Pwd Change", "samr.samr_FieldsPresent.SAMR_FIELD_LAST_PWD_CHANGE", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_LAST_PWD_CHANGE_tfs), ( 0x00040000 ), NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val11_info11,
+         { "Info11", "samr.samr_UserInfo_val11.info11", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo20_parameters,
          { "Parameters", "samr.samr_UserInfo20.parameters", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo18_lm_pwd,
@@ -15668,6 +15674,8 @@ void proto_register_dcerpc_samr(void)
          { "Samr Field Account Name", "samr.samr_FieldsPresent.SAMR_FIELD_ACCOUNT_NAME", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_ACCOUNT_NAME_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_samr_samr_UserInfo21_rid,
          { "Rid", "samr.samr_UserInfo21.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_ValidatePasswordRep_val1_ctr1,
+         { "Ctr1", "samr.samr_ValidatePasswordRep_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_OpenGroup_access_mask,
          { "Access Mask", "samr.samr_OpenGroup.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ValidatePasswordReq3_password,
@@ -15684,12 +15692,8 @@ void proto_register_dcerpc_samr(void)
          { "Entries", "samr.samr_DispInfoFullGroups.entries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo5_bad_password_count,
          { "Bad Password Count", "samr.samr_UserInfo5.bad_password_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_DomainInfo_info5,
-         { "Info5", "samr.samr_DomainInfo.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_ADD_MEMBER,
          { "Samr Alias Access Add Member", "samr.samr_AliasAccessMask.SAMR_ALIAS_ACCESS_ADD_MEMBER", FT_BOOLEAN, 32, TFS(&samr_AliasAccessMask_SAMR_ALIAS_ACCESS_ADD_MEMBER_tfs), ( 0x00000001 ), NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info6,
-         { "Info6", "samr.samr_UserInfo.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_Connect5_info_out,
          { "Info Out", "samr.samr_Connect5.info_out", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_Connect_connect_handle,
@@ -15700,12 +15704,18 @@ void proto_register_dcerpc_samr(void)
          { "Level", "samr.samr_SetUserInfo.level", FT_UINT1632, BASE_DEC, VALS(samr_samr_UserInfoLevel_vals), 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo21_last_logon,
          { "Last Logon", "samr.samr_UserInfo21.last_logon", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_DomainInfo_val13_info13,
+         { "Info13", "samr.samr_DomainInfo_val13.info13", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_GetBootKeyInformation_domain_handle,
          { "Domain Handle", "samr.samr_GetBootKeyInformation.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryDisplayInfo3_returned_size,
          { "Returned Size", "samr.samr_QueryDisplayInfo3.returned_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val8_info8,
+         { "Info8", "samr.samr_UserInfo_val8.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ValidatePasswordReq3_account,
          { "Account", "samr.samr_ValidatePasswordReq3.account", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val12_info12,
+         { "Info12", "samr.samr_UserInfo_val12.info12", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo7_account_name,
          { "Account Name", "samr.samr_UserInfo7.account_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo23_info,
@@ -15714,12 +15724,14 @@ void proto_register_dcerpc_samr(void)
          { "Samr Domain Access Set Info 1", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_SET_INFO_1", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_1_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_samr_samr_UserInfo3_last_logon,
          { "Last Logon", "samr.samr_UserInfo3.last_logon", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info10,
-         { "Info10", "samr.samr_UserInfo.info10", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val26_info26,
+         { "Info26", "samr.samr_UserInfo_val26.info26", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_EnumDomainGroups_max_size,
          { "Max Size", "samr.samr_EnumDomainGroups.max_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_PasswordProperties_DOMAIN_PASSWORD_NO_ANON_CHANGE,
          { "Domain Password No Anon Change", "samr.samr_PasswordProperties.DOMAIN_PASSWORD_NO_ANON_CHANGE", FT_BOOLEAN, 32, TFS(&samr_PasswordProperties_DOMAIN_PASSWORD_NO_ANON_CHANGE_tfs), ( 0x00000002 ), NULL, HFILL }},
+       { &hf_samr_samr_DomainInfo_val8_info8,
+         { "Info8", "samr.samr_DomainInfo_val8.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo3_full_name,
          { "Full Name", "samr.samr_UserInfo3.full_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_SetUserInfo2_user_handle,
@@ -15736,10 +15748,6 @@ void proto_register_dcerpc_samr(void)
          { "Domain Handle", "samr.samr_OpenDomain.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DomInfo13_sequence_num,
          { "Sequence Num", "samr.samr_DomInfo13.sequence_num", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info21,
-         { "Info21", "samr.samr_UserInfo.info21", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_ValidatePasswordReq_req1,
-         { "Req1", "samr.samr_ValidatePasswordReq.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_GetAliasMembership_domain_handle,
          { "Domain Handle", "samr.samr_GetAliasMembership.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_AcctFlags_ACB_MNS,
@@ -15758,8 +15766,8 @@ void proto_register_dcerpc_samr(void)
          { "Samr User Access Change Group Membership", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_CHANGE_GROUP_MEMBERSHIP", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_CHANGE_GROUP_MEMBERSHIP_tfs), ( 0x00000400 ), NULL, HFILL }},
        { &hf_samr_samr_PwInfo_password_properties,
          { "Password Properties", "samr.samr_PwInfo.password_properties", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_ValidatePasswordReq_req2,
-         { "Req2", "samr.samr_ValidatePasswordReq.req2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_ValidatePasswordReq_val3_req3,
+         { "Req3", "samr.samr_ValidatePasswordReq_val3.req3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DomGeneralInformation2_lockout_window,
          { "Lockout Window", "samr.samr_DomGeneralInformation2.lockout_window", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryDisplayInfo2_returned_size,
@@ -15778,10 +15786,10 @@ void proto_register_dcerpc_samr(void)
          { "Acb Smartcard Required", "samr.samr_AcctFlags.ACB_SMARTCARD_REQUIRED", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_SMARTCARD_REQUIRED_tfs), ( 0x00001000 ), NULL, HFILL }},
        { &hf_samr_samr_ChangePasswordUser3_nt_verifier,
          { "Nt Verifier", "samr.samr_ChangePasswordUser3.nt_verifier", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info17,
-         { "Info17", "samr.samr_UserInfo.info17", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_LookupRids_types,
          { "Types", "samr.samr_LookupRids.types", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val20_info20,
+         { "Info20", "samr.samr_UserInfo_val20.info20", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DeleteGroupMember_rid,
          { "Rid", "samr.samr_DeleteGroupMember.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_FieldsPresent_SAMR_FIELD_PROFILE_PATH,
@@ -15804,6 +15812,8 @@ void proto_register_dcerpc_samr(void)
          { "Acb Pwnoexp", "samr.samr_AcctFlags.ACB_PWNOEXP", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_PWNOEXP_tfs), ( 0x00000200 ), NULL, HFILL }},
        { &hf_samr_samr_DomOEMInformation_oem_information,
          { "Oem Information", "samr.samr_DomOEMInformation.oem_information", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_DispInfo_val4_info4,
+         { "Info4", "samr.samr_DispInfo_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_SetBootKeyInformation_connect_handle,
          { "Connect Handle", "samr.samr_SetBootKeyInformation.connect_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_EnumDomainAliases_num_entries,
@@ -15814,10 +15824,12 @@ void proto_register_dcerpc_samr(void)
          { "Domain Handle", "samr.samr_OpenAlias.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DomGeneralInformation_oem_information,
          { "Oem Information", "samr.samr_DomGeneralInformation.oem_information", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info8,
-         { "Info8", "samr.samr_UserInfo.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo25_info,
          { "Info", "samr.samr_UserInfo25.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_ValidatePasswordReq_val2_req2,
+         { "Req2", "samr.samr_ValidatePasswordReq_val2.req2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_DomainInfo_val12_info12,
+         { "Info12", "samr.samr_DomainInfo_val12.info12", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_GROUP_MEMBERSHIP,
          { "Samr User Access Get Group Membership", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_GET_GROUP_MEMBERSHIP", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_GET_GROUP_MEMBERSHIP_tfs), ( 0x00000200 ), NULL, HFILL }},
        { &hf_samr_samr_CreateDomainGroup_name,
@@ -15840,8 +15852,10 @@ void proto_register_dcerpc_samr(void)
          { "Primary Gid", "samr.samr_UserInfo3.primary_gid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_LOOKUP_INFO,
          { "Samr Alias Access Lookup Info", "samr.samr_AliasAccessMask.SAMR_ALIAS_ACCESS_LOOKUP_INFO", FT_BOOLEAN, 32, TFS(&samr_AliasAccessMask_SAMR_ALIAS_ACCESS_LOOKUP_INFO_tfs), ( 0x00000008 ), NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info5,
-         { "Info5", "samr.samr_UserInfo.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_GroupInfo_valGROUPINFOATTRIBUTES_attributes,
+         { "Attributes", "samr.samr_GroupInfo_valGROUPINFOATTRIBUTES.attributes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_AliasInfo_valALIASINFODESCRIPTION_description,
+         { "Description", "samr.samr_AliasInfo_valALIASINFODESCRIPTION.description", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_RidWithAttribute_rid,
          { "Rid", "samr.samr_RidWithAttribute.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo3_home_directory,
@@ -15862,8 +15876,6 @@ void proto_register_dcerpc_samr(void)
          { "Level", "samr.samr_GetDisplayEnumerationIndex2.level", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_AcctFlags_ACB_ENC_TXT_PWD_ALLOWED,
          { "Acb Enc Txt Pwd Allowed", "samr.samr_AcctFlags.ACB_ENC_TXT_PWD_ALLOWED", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_ENC_TXT_PWD_ALLOWED_tfs), ( 0x00000800 ), NULL, HFILL }},
-       { &hf_samr_samr_AliasInfo_description,
-         { "Description", "samr.samr_AliasInfo.description", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryDisplayInfo_info,
          { "Info", "samr.samr_QueryDisplayInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_GroupInfoAll_num_members,
@@ -15876,18 +15888,22 @@ void proto_register_dcerpc_samr(void)
          { "Rid", "samr.samr_UserInfo5.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo12_profile_path,
          { "Profile Path", "samr.samr_UserInfo12.profile_path", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val17_info17,
+         { "Info17", "samr.samr_UserInfo_val17.info17", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_LookupDomain_connect_handle,
          { "Connect Handle", "samr.samr_LookupDomain.connect_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo21_comment,
          { "Comment", "samr.samr_UserInfo21.comment", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_2,
          { "Samr Domain Access Set Info 2", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_SET_INFO_2", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_2_tfs), ( 0x00000008 ), NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info14,
-         { "Info14", "samr.samr_UserInfo.info14", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_DispInfo_val2_info2,
+         { "Info2", "samr.samr_DispInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_CreateUser2_access_granted,
          { "Access Granted", "samr.samr_CreateUser2.access_granted", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ConnectInfo1_client_version,
          { "Client Version", "samr.samr_ConnectInfo1.client_version", FT_UINT32, BASE_DEC, VALS(samr_samr_ConnectVersion_vals), 0, NULL, HFILL }},
+       { &hf_samr_samr_DispInfo_val3_info3,
+         { "Info3", "samr.samr_DispInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo5_acct_flags,
          { "Acct Flags", "samr.samr_UserInfo5.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo24_password_expired,
@@ -15926,14 +15942,12 @@ void proto_register_dcerpc_samr(void)
          { "Bad Password Time", "samr.samr_ValidatePasswordInfo.bad_password_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_AcctFlags_ACB_USE_DES_KEY_ONLY,
          { "Acb Use Des Key Only", "samr.samr_AcctFlags.ACB_USE_DES_KEY_ONLY", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_USE_DES_KEY_ONLY_tfs), ( 0x00008000 ), NULL, HFILL }},
-       { &hf_samr_samr_DispInfo_info1,
-         { "Info1", "samr.samr_DispInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_SetDomainInfo_level,
          { "Level", "samr.samr_SetDomainInfo.level", FT_UINT1632, BASE_DEC, VALS(samr_samr_DomainInfoClass_vals), 0, NULL, HFILL }},
-       { &hf_samr_samr_DispInfo_info4,
-         { "Info4", "samr.samr_DispInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DomInfo8_domain_create_time,
          { "Domain Create Time", "samr.samr_DomInfo8.domain_create_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val7_info7,
+         { "Info7", "samr.samr_UserInfo_val7.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ChangePasswordUser_old_nt_crypted,
          { "Old Nt Crypted", "samr.samr_ChangePasswordUser.old_nt_crypted", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DomGeneralInformation_force_logoff_time,
@@ -15946,8 +15960,6 @@ void proto_register_dcerpc_samr(void)
          { "Domain Handle", "samr.samr_CreateDomainGroup.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_SamArray_entries,
          { "Entries", "samr.samr_SamArray.entries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info9,
-         { "Info9", "samr.samr_UserInfo.info9", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_Connect3_access_mask,
          { "Access Mask", "samr.samr_Connect3.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ChangePasswordUser2_lm_password,
@@ -15964,12 +15976,12 @@ void proto_register_dcerpc_samr(void)
          { "Description", "samr.samr_DispEntryFull.description", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_LookupDomain_domain_name,
          { "Domain Name", "samr.samr_LookupDomain.domain_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_ValidatePasswordRep_ctr3,
-         { "Ctr3", "samr.samr_ValidatePasswordRep.ctr3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryDisplayInfo3_max_entries,
          { "Max Entries", "samr.samr_QueryDisplayInfo3.max_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DomInfo6_primary,
          { "Primary", "samr.samr_DomInfo6.primary", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_ConnectInfo_val1_info1,
+         { "Info1", "samr.samr_ConnectInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_PasswordProperties_DOMAIN_PASSWORD_COMPLEX,
          { "Domain Password Complex", "samr.samr_PasswordProperties.DOMAIN_PASSWORD_COMPLEX", FT_BOOLEAN, 32, TFS(&samr_PasswordProperties_DOMAIN_PASSWORD_COMPLEX_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_samr_samr_DeleteGroupMember_group_handle,
@@ -15990,6 +16002,8 @@ void proto_register_dcerpc_samr(void)
          { "Min Password Length", "samr.samr_DomInfo1.min_password_length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ValidatePasswordReq3_pwd_must_change_at_next_logon,
          { "Pwd Must Change At Next Logon", "samr.samr_ValidatePasswordReq3.pwd_must_change_at_next_logon", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_ValidatePasswordRep_val3_ctr3,
+         { "Ctr3", "samr.samr_ValidatePasswordRep_val3.ctr3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QuerySecurity_handle,
          { "Handle", "samr.samr_QuerySecurity.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_FieldsPresent_SAMR_FIELD_WORKSTATIONS,
@@ -15998,6 +16012,8 @@ void proto_register_dcerpc_samr(void)
          { "Idx", "samr.samr_GetDisplayEnumerationIndex.idx", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DomInfo9_domain_server_state,
          { "Domain Server State", "samr.samr_DomInfo9.domain_server_state", FT_UINT32, BASE_DEC, VALS(samr_samr_DomainServerState_vals), 0, NULL, HFILL }},
+       { &hf_samr_samr_DomainInfo_val4_oem,
+         { "Oem", "samr.samr_DomainInfo_val4.oem", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_Connect5_level_out,
          { "Level Out", "samr.samr_Connect5.level_out", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_CreateUser2_user_handle,
@@ -16012,20 +16028,24 @@ void proto_register_dcerpc_samr(void)
          { "Count", "samr.samr_SamArray.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo24_password,
          { "Password", "samr.samr_UserInfo24.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_DomainInfo_val2_general,
+         { "General", "samr.samr_DomainInfo_val2.general", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DispEntryFull_idx,
          { "Idx", "samr.samr_DispEntryFull.idx", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_INITIALIZE_SERVER,
          { "Samr Access Initialize Server", "samr.samr_ConnectAccessMask.SAMR_ACCESS_INITIALIZE_SERVER", FT_BOOLEAN, 32, TFS(&samr_ConnectAccessMask_SAMR_ACCESS_INITIALIZE_SERVER_tfs), ( 0x00000004 ), NULL, HFILL }},
+       { &hf_samr_samr_ValidatePasswordReq_val1_req1,
+         { "Req1", "samr.samr_ValidatePasswordReq_val1.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DispEntryFull_acct_flags,
          { "Acct Flags", "samr.samr_DispEntryFull.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DomInfo13_modified_count_at_last_promotion,
          { "Modified Count At Last Promotion", "samr.samr_DomInfo13.modified_count_at_last_promotion", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_GetAliasMembership_sids,
          { "Sids", "samr.samr_GetAliasMembership.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info1,
-         { "Info1", "samr.samr_UserInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_GroupAttrs_SE_GROUP_RESOURCE,
          { "Se Group Resource", "samr.samr_GroupAttrs.SE_GROUP_RESOURCE", FT_BOOLEAN, 32, TFS(&samr_GroupAttrs_SE_GROUP_RESOURCE_tfs), ( 0x20000000 ), NULL, HFILL }},
+       { &hf_samr_samr_AliasInfo_valALIASINFOALL_all,
+         { "All", "samr.samr_AliasInfo_valALIASINFOALL.all", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_FieldsPresent_SAMR_FIELD_DESCRIPTION,
          { "Samr Field Description", "samr.samr_FieldsPresent.SAMR_FIELD_DESCRIPTION", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_DESCRIPTION_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_samr_samr_UserInfo18_nt_pwd,
@@ -16040,20 +16060,18 @@ void proto_register_dcerpc_samr(void)
          { "Password", "samr.samr_UserInfo23.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo21_last_logoff,
          { "Last Logoff", "samr.samr_UserInfo21.last_logoff", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_DispInfo_info2,
-         { "Info2", "samr.samr_DispInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_EnumDomainUsers_resume_handle,
          { "Resume Handle", "samr.samr_EnumDomainUsers.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ValidatePasswordRepCtr_status,
          { "Status", "samr.samr_ValidatePasswordRepCtr.status", FT_UINT1632, BASE_DEC, VALS(samr_samr_ValidationStatus_vals), 0, NULL, HFILL }},
        { &hf_samr_samr_SetMemberAttributesOfGroup_unknown2,
          { "Unknown2", "samr.samr_SetMemberAttributesOfGroup.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_DomainInfo_general2,
-         { "General2", "samr.samr_DomainInfo.general2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo2_reserved,
          { "Reserved", "samr.samr_UserInfo2.reserved", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DispInfoFull_count,
          { "Count", "samr.samr_DispInfoFull.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_DomainInfo_val9_info9,
+         { "Info9", "samr.samr_DomainInfo_val9.info9", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_GET_MEMBERS,
          { "Samr Group Access Get Members", "samr.samr_GroupAccessMask.SAMR_GROUP_ACCESS_GET_MEMBERS", FT_BOOLEAN, 32, TFS(&samr_GroupAccessMask_SAMR_GROUP_ACCESS_GET_MEMBERS_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_samr_samr_FieldsPresent_SAMR_FIELD_COUNTRY_CODE,
@@ -16084,10 +16102,10 @@ void proto_register_dcerpc_samr(void)
          { "Comment", "samr.samr_UserInfo2.comment", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_FieldsPresent_SAMR_FIELD_RID,
          { "Samr Field Rid", "samr.samr_FieldsPresent.SAMR_FIELD_RID", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_RID_tfs), ( 0x00000004 ), NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info23,
-         { "Info23", "samr.samr_UserInfo.info23", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo18_password_expired,
          { "Password Expired", "samr.samr_UserInfo18.password_expired", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val21_info21,
+         { "Info21", "samr.samr_UserInfo_val21.info21", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryDisplayInfo2_total_size,
          { "Total Size", "samr.samr_QueryDisplayInfo2.total_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo25_password,
@@ -16100,6 +16118,8 @@ void proto_register_dcerpc_samr(void)
          { "Logon Hours", "samr.samr_UserInfo4.logon_hours", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo5_home_directory,
          { "Home Directory", "samr.samr_UserInfo5.home_directory", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val9_info9,
+         { "Info9", "samr.samr_UserInfo_val9.info9", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DomInfo12_lockout_duration,
          { "Lockout Duration", "samr.samr_DomInfo12.lockout_duration", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_CreateUser_account_name,
@@ -16144,18 +16164,12 @@ void proto_register_dcerpc_samr(void)
          { "Sec Info", "samr.samr_QuerySecurity.sec_info", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_AddGroupMember_rid,
          { "Rid", "samr.samr_AddGroupMember.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_DomainInfo_info12,
-         { "Info12", "samr.samr_DomainInfo.info12", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_OpenGroup_domain_handle,
          { "Domain Handle", "samr.samr_OpenGroup.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryDisplayInfo_max_entries,
          { "Max Entries", "samr.samr_QueryDisplayInfo.max_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_EnumDomains_resume_handle,
          { "Resume Handle", "samr.samr_EnumDomains.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info7,
-         { "Info7", "samr.samr_UserInfo.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_GroupInfo_all2,
-         { "All2", "samr.samr_GroupInfo.all2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo1_full_name,
          { "Full Name", "samr.samr_UserInfo1.full_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryDisplayInfo3_domain_handle,
@@ -16170,8 +16184,12 @@ void proto_register_dcerpc_samr(void)
          { "Info", "samr.samr_SetUserInfo2.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryGroupInfo_group_handle,
          { "Group Handle", "samr.samr_QueryGroupInfo.group_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val13_info13,
+         { "Info13", "samr.samr_UserInfo_val13.info13", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ChangePasswordUser3_nt_password,
          { "Nt Password", "samr.samr_ChangePasswordUser3.nt_password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val16_info16,
+         { "Info16", "samr.samr_UserInfo_val16.info16", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo21_buf_count,
          { "Buf Count", "samr.samr_UserInfo21.buf_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_PwInfo_min_password_length,
@@ -16188,8 +16206,6 @@ void proto_register_dcerpc_samr(void)
          { "Samr Alias Access Get Members", "samr.samr_AliasAccessMask.SAMR_ALIAS_ACCESS_GET_MEMBERS", FT_BOOLEAN, 32, TFS(&samr_AliasAccessMask_SAMR_ALIAS_ACCESS_GET_MEMBERS_tfs), ( 0x00000004 ), NULL, HFILL }},
        { &hf_samr_samr_AcctFlags_ACB_NORMAL,
          { "Acb Normal", "samr.samr_AcctFlags.ACB_NORMAL", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_NORMAL_tfs), ( 0x00000010 ), NULL, HFILL }},
-       { &hf_samr_samr_GroupInfo_all,
-         { "All", "samr.samr_GroupInfo.all", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo16_acct_flags,
          { "Acct Flags", "samr.samr_UserInfo16.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo2_country_code,
@@ -16200,14 +16216,18 @@ void proto_register_dcerpc_samr(void)
          { "Home Directory", "samr.samr_UserInfo10.home_directory", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_CreateDomainGroup_group_handle,
          { "Group Handle", "samr.samr_CreateDomainGroup.group_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val2_info2,
+         { "Info2", "samr.samr_UserInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryUserInfo2_user_handle,
          { "User Handle", "samr.samr_QueryUserInfo2.user_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_OemChangePasswordUser2_server,
          { "Server", "samr.samr_OemChangePasswordUser2.server", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_AliasInfo_valALIASINFONAME_name,
+         { "Name", "samr.samr_AliasInfo_valALIASINFONAME.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_DomainInfo_val6_info6,
+         { "Info6", "samr.samr_DomainInfo_val6.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_CHANGE_PASSWORD,
          { "Samr User Access Change Password", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_CHANGE_PASSWORD", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_CHANGE_PASSWORD_tfs), ( 0x00000040 ), NULL, HFILL }},
-       { &hf_samr_samr_AliasInfo_all,
-         { "All", "samr.samr_AliasInfo.all", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_BAD_PASSWORD_TIME,
          { "Samr Validate Field Bad Password Time", "samr.samr_ValidateFieldsPresent.SAMR_VALIDATE_FIELD_BAD_PASSWORD_TIME", FT_BOOLEAN, 32, TFS(&samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_BAD_PASSWORD_TIME_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_NAME_ETC,
@@ -16218,14 +16238,14 @@ void proto_register_dcerpc_samr(void)
          { "Description", "samr.samr_UserInfo13.description", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo21_lm_password_set,
          { "Lm Password Set", "samr.samr_UserInfo21.lm_password_set", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info2,
-         { "Info2", "samr.samr_UserInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_EnumDomainUsers_domain_handle,
          { "Domain Handle", "samr.samr_EnumDomainUsers.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_LookupRids_domain_handle,
          { "Domain Handle", "samr.samr_LookupRids.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_LogonHours_bits,
          { "Bits", "samr.samr_LogonHours.bits", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val14_info14,
+         { "Info14", "samr.samr_UserInfo_val14.info14", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_OpenUser_domain_handle,
          { "Domain Handle", "samr.samr_OpenUser.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_CreateUser2_access_mask,
@@ -16236,12 +16256,6 @@ void proto_register_dcerpc_samr(void)
          { "Sam", "samr.samr_EnumDomainGroups.sam", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_GroupInfoAll_name,
          { "Name", "samr.samr_GroupInfoAll.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_ValidatePasswordRep_ctr2,
-         { "Ctr2", "samr.samr_ValidatePasswordRep.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info24,
-         { "Info24", "samr.samr_UserInfo.info24", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_DomainInfo_info3,
-         { "Info3", "samr.samr_DomainInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_EnumDomainGroups_num_entries,
          { "Num Entries", "samr.samr_EnumDomainGroups.num_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_AcctFlags_ACB_PWNOTREQ,
@@ -16254,8 +16268,12 @@ void proto_register_dcerpc_samr(void)
          { "New Lm Crypted", "samr.samr_ChangePasswordUser.new_lm_crypted", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_LookupNames_types,
          { "Types", "samr.samr_LookupNames.types", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val5_info5,
+         { "Info5", "samr.samr_UserInfo_val5.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_SamEntry_idx,
          { "Idx", "samr.samr_SamEntry.idx", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_DomainInfo_val3_info3,
+         { "Info3", "samr.samr_DomainInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo3_logon_hours,
          { "Logon Hours", "samr.samr_UserInfo3.logon_hours", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ChangePasswordUser3_account,
@@ -16278,6 +16296,8 @@ void proto_register_dcerpc_samr(void)
          { "Domain Handle", "samr.samr_QueryDisplayInfo2.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_AliasInfoAll_name,
          { "Name", "samr.samr_AliasInfoAll.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_DispInfo_val1_info1,
+         { "Info1", "samr.samr_DispInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_Connect_access_mask,
          { "Access Mask", "samr.samr_Connect.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_GetUserPwInfo_user_handle,
@@ -16286,8 +16306,6 @@ void proto_register_dcerpc_samr(void)
          { "Rid", "samr.samr_DispEntryFull.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_OpenAlias_access_mask,
          { "Access Mask", "samr.samr_OpenAlias.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_GroupInfo_description,
-         { "Description", "samr.samr_GroupInfo.description", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_OpenGroup_rid,
          { "Rid", "samr.samr_OpenGroup.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_GroupAttrs_SE_GROUP_OWNER,
@@ -16300,8 +16318,6 @@ void proto_register_dcerpc_samr(void)
          { "Role", "samr.samr_DomGeneralInformation.role", FT_UINT32, BASE_DEC, VALS(samr_samr_Role_vals), 0, NULL, HFILL }},
        { &hf_samr_samr_QueryDisplayInfo2_buf_size,
          { "Buf Size", "samr.samr_QueryDisplayInfo2.buf_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_DomainInfo_info13,
-         { "Info13", "samr.samr_DomainInfo.info13", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_SetSecurity_sec_info,
          { "Sec Info", "samr.samr_SetSecurity.sec_info", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_PasswordProperties_DOMAIN_PASSWORD_STORE_CLEARTEXT,
@@ -16318,10 +16334,6 @@ void proto_register_dcerpc_samr(void)
          { "Account Name", "samr.samr_UserInfo3.account_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_Connect3_system_name,
          { "System Name", "samr.samr_Connect3.system_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info11,
-         { "Info11", "samr.samr_UserInfo.info11", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_DomainInfo_info9,
-         { "Info9", "samr.samr_DomainInfo.info9", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_SamEntry_name,
          { "Name", "samr.samr_SamEntry.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo3_acct_flags,
@@ -16332,6 +16344,10 @@ void proto_register_dcerpc_samr(void)
          { "Level", "samr.samr_QueryDomainInfo2.level", FT_UINT1632, BASE_DEC, VALS(samr_samr_DomainInfoClass_vals), 0, NULL, HFILL }},
        { &hf_samr_samr_GetDisplayEnumerationIndex_name,
          { "Name", "samr.samr_GetDisplayEnumerationIndex.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_DomainInfo_val7_info7,
+         { "Info7", "samr.samr_DomainInfo_val7.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val24_info24,
+         { "Info24", "samr.samr_UserInfo_val24.info24", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ValidatePasswordReq3_info,
          { "Info", "samr.samr_ValidatePasswordReq3.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ValidatePasswordInfo_lockout_time,
@@ -16362,20 +16378,18 @@ void proto_register_dcerpc_samr(void)
          { "Samr Field Last Logoff", "samr.samr_FieldsPresent.SAMR_FIELD_LAST_LOGOFF", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_LAST_LOGOFF_tfs), ( 0x00001000 ), NULL, HFILL }},
        { &hf_samr_samr_RidWithAttributeArray_rids,
          { "Rids", "samr.samr_RidWithAttributeArray.rids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_GroupInfo_valGROUPINFOALL2_all2,
+         { "All2", "samr.samr_GroupInfo_valGROUPINFOALL2.all2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DeleteDomainGroup_group_handle,
          { "Group Handle", "samr.samr_DeleteDomainGroup.group_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_Password_hash,
          { "Hash", "samr.samr_Password.hash", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_FieldsPresent_SAMR_FIELD_OWF_PWD,
          { "Samr Field Owf Pwd", "samr.samr_FieldsPresent.SAMR_FIELD_OWF_PWD", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_OWF_PWD_tfs), ( 0x20000000 ), NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info25,
-         { "Info25", "samr.samr_UserInfo.info25", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryDisplayInfo_start_idx,
          { "Start Idx", "samr.samr_QueryDisplayInfo.start_idx", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo3_home_drive,
          { "Home Drive", "samr.samr_UserInfo3.home_drive", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info13,
-         { "Info13", "samr.samr_UserInfo.info13", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DeleteAliasMember_alias_handle,
          { "Alias Handle", "samr.samr_DeleteAliasMember.alias_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryDomainInfo_domain_handle,
@@ -16388,6 +16402,8 @@ void proto_register_dcerpc_samr(void)
          { "Bad Pwd Count", "samr.samr_ValidatePasswordInfo.bad_pwd_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryGroupMember_rids,
          { "Rids", "samr.samr_QueryGroupMember.rids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_DomainInfo_val1_info1,
+         { "Info1", "samr.samr_DomainInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo21_password_expired,
          { "Password Expired", "samr.samr_UserInfo21.password_expired", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_EnumDomains_buf_size,
@@ -16404,16 +16420,12 @@ void proto_register_dcerpc_samr(void)
          { "Samr Validate Field Password History", "samr.samr_ValidateFieldsPresent.SAMR_VALIDATE_FIELD_PASSWORD_HISTORY", FT_BOOLEAN, 32, TFS(&samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_PASSWORD_HISTORY_tfs), ( 0x00000020 ), NULL, HFILL }},
        { &hf_samr_samr_AcctFlags_ACB_PARTIAL_SECRETS_ACCOUNT,
          { "Acb Partial Secrets Account", "samr.samr_AcctFlags.ACB_PARTIAL_SECRETS_ACCOUNT", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_PARTIAL_SECRETS_ACCOUNT_tfs), ( 0x00100000 ), NULL, HFILL }},
-       { &hf_samr_samr_GroupInfo_name,
-         { "Name", "samr.samr_GroupInfo.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo3_force_password_change,
          { "Force Password Change", "samr.samr_UserInfo3.force_password_change", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ChangePasswordUser_nt_present,
          { "Nt Present", "samr.samr_ChangePasswordUser.nt_present", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo21_home_directory,
          { "Home Directory", "samr.samr_UserInfo21.home_directory", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info12,
-         { "Info12", "samr.samr_UserInfo.info12", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_OemChangePasswordUser2_password,
          { "Password", "samr.samr_OemChangePasswordUser2.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_CREATE_ALIAS,
@@ -16438,10 +16450,6 @@ void proto_register_dcerpc_samr(void)
          { "Workstations", "samr.samr_UserInfo14.workstations", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_GetDisplayEnumerationIndex_domain_handle,
          { "Domain Handle", "samr.samr_GetDisplayEnumerationIndex.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_DispInfo_info3,
-         { "Info3", "samr.samr_DispInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_DomainInfo_info8,
-         { "Info8", "samr.samr_DomainInfo.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DispInfoGeneral_entries,
          { "Entries", "samr.samr_DispInfoGeneral.entries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo8_full_name,
@@ -16454,6 +16462,10 @@ void proto_register_dcerpc_samr(void)
          { "Acct Flags", "samr.samr_DispEntryFullGroup.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_AcctFlags_ACB_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION,
          { "Acb Trusted To Authenticate For Delegation", "samr.samr_AcctFlags.ACB_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION_tfs), ( 0x00040000 ), NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val25_info25,
+         { "Info25", "samr.samr_UserInfo_val25.info25", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_DispInfo_val5_info5,
+         { "Info5", "samr.samr_DispInfo_val5.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_SetUserInfo_info,
          { "Info", "samr.samr_SetUserInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_OpenDomain_sid,
@@ -16468,12 +16480,8 @@ void proto_register_dcerpc_samr(void)
          { "Samr Validate Field Password History Length", "samr.samr_ValidateFieldsPresent.SAMR_VALIDATE_FIELD_PASSWORD_HISTORY_LENGTH", FT_BOOLEAN, 32, TFS(&samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_PASSWORD_HISTORY_LENGTH_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_samr_samr_FieldsPresent_SAMR_FIELD_HOME_DRIVE,
          { "Samr Field Home Drive", "samr.samr_FieldsPresent.SAMR_FIELD_HOME_DRIVE", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_HOME_DRIVE_tfs), ( 0x00000080 ), NULL, HFILL }},
-       { &hf_samr_samr_DomainInfo_info1,
-         { "Info1", "samr.samr_DomainInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_RidAttrArray_rids,
          { "Rids", "samr.samr_RidAttrArray.rids", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_ValidatePasswordRep_ctr1,
-         { "Ctr1", "samr.samr_ValidatePasswordRep.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo18_nt_pwd_active,
          { "Nt Pwd Active", "samr.samr_UserInfo18.nt_pwd_active", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_AcctFlags_ACB_DOMTRUST,
@@ -16516,8 +16524,6 @@ void proto_register_dcerpc_samr(void)
          { "Info", "samr.samr_QueryDisplayInfo2.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_ENUM_DOMAINS,
          { "Samr Access Enum Domains", "samr.samr_ConnectAccessMask.SAMR_ACCESS_ENUM_DOMAINS", FT_BOOLEAN, 32, TFS(&samr_ConnectAccessMask_SAMR_ACCESS_ENUM_DOMAINS_tfs), ( 0x00000010 ), NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info4,
-         { "Info4", "samr.samr_UserInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DomInfo1_password_properties,
          { "Password Properties", "samr.samr_DomInfo1.password_properties", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo21_logon_script,
@@ -16532,8 +16538,6 @@ void proto_register_dcerpc_samr(void)
          { "Attributes", "samr.samr_RidWithAttribute.attributes", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_CryptPassword_data,
          { "Data", "samr.samr_CryptPassword.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_AliasInfo_name,
-         { "Name", "samr.samr_AliasInfo.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_CREATE_USER,
          { "Samr Domain Access Create User", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_CREATE_USER", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_CREATE_USER_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_samr_samr_FieldsPresent_SAMR_FIELD_COMMENT,
@@ -16566,8 +16570,6 @@ void proto_register_dcerpc_samr(void)
          { "Alias Handle", "samr.samr_AddAliasMember.alias_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_SetDsrmPassword_hash,
          { "Hash", "samr.samr_SetDsrmPassword.hash", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_DomainInfo_general,
-         { "General", "samr.samr_DomainInfo.general", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryDisplayInfo_domain_handle,
          { "Domain Handle", "samr.samr_QueryDisplayInfo.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_GroupAttrs_SE_GROUP_MANDATORY,
@@ -16580,20 +16582,20 @@ void proto_register_dcerpc_samr(void)
          { "Workstations", "samr.samr_UserInfo21.workstations", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DispEntryGeneral_description,
          { "Description", "samr.samr_DispEntryGeneral.description", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val6_info6,
+         { "Info6", "samr.samr_UserInfo_val6.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_FieldsPresent_SAMR_FIELD_PRIVATE_DATA,
          { "Samr Field Private Data", "samr.samr_FieldsPresent.SAMR_FIELD_PRIVATE_DATA", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_PRIVATE_DATA_tfs), ( 0x04000000 ), NULL, HFILL }},
        { &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS,
          { "Samr Domain Access Enum Accounts", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS_tfs), ( 0x00000100 ), NULL, HFILL }},
-       { &hf_samr_samr_ValidatePasswordReq_req3,
-         { "Req3", "samr.samr_ValidatePasswordReq.req3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ChangePasswordUser2_nt_verifier,
          { "Nt Verifier", "samr.samr_ChangePasswordUser2.nt_verifier", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_AcctFlags_ACB_TRUSTED_FOR_DELEGATION,
          { "Acb Trusted For Delegation", "samr.samr_AcctFlags.ACB_TRUSTED_FOR_DELEGATION", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_TRUSTED_FOR_DELEGATION_tfs), ( 0x00002000 ), NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val18_info18,
+         { "Info18", "samr.samr_UserInfo_val18.info18", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_EnumDomains_connect_handle,
          { "Connect Handle", "samr.samr_EnumDomains.connect_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info18,
-         { "Info18", "samr.samr_UserInfo.info18", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_CreateDomAlias_access_mask,
          { "Access Mask", "samr.samr_CreateDomAlias.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo21_force_password_change,
@@ -16632,6 +16634,8 @@ void proto_register_dcerpc_samr(void)
          { "Alias Handle", "samr.samr_RemoveMultipleMembersFromAlias.alias_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_FieldsPresent_SAMR_FIELD_LOGON_HOURS,
          { "Samr Field Logon Hours", "samr.samr_FieldsPresent.SAMR_FIELD_LOGON_HOURS", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_LOGON_HOURS_tfs), ( 0x00002000 ), NULL, HFILL }},
+       { &hf_samr_samr_GroupInfo_valGROUPINFONAME_name,
+         { "Name", "samr.samr_GroupInfo_valGROUPINFONAME.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ChangePasswordUser3_dominfo,
          { "Dominfo", "samr.samr_ChangePasswordUser3.dominfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ValidationBlob_data,
@@ -16640,14 +16644,10 @@ void proto_register_dcerpc_samr(void)
          { "Lm Pwd Active", "samr.samr_UserInfo18.lm_pwd_active", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_CreateDomAlias_domain_handle,
          { "Domain Handle", "samr.samr_CreateDomAlias.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info26,
-         { "Info26", "samr.samr_UserInfo.info26", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_EnumDomainAliases_domain_handle,
          { "Domain Handle", "samr.samr_EnumDomainAliases.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_GroupInfoAll_attributes,
          { "Attributes", "samr.samr_GroupInfoAll.attributes", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_DomainInfo_info7,
-         { "Info7", "samr.samr_DomainInfo.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ConnectAccessMask_SAMR_ACCESS_CONNECT_TO_SERVER,
          { "Samr Access Connect To Server", "samr.samr_ConnectAccessMask.SAMR_ACCESS_CONNECT_TO_SERVER", FT_BOOLEAN, 32, TFS(&samr_ConnectAccessMask_SAMR_ACCESS_CONNECT_TO_SERVER_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_samr_samr_EnumDomains_num_entries,
@@ -16670,8 +16670,6 @@ void proto_register_dcerpc_samr(void)
          { "Alias Handle", "samr.samr_CreateDomAlias.alias_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo6_account_name,
          { "Account Name", "samr.samr_UserInfo6.account_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info3,
-         { "Info3", "samr.samr_UserInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_Connect5_level_in,
          { "Level In", "samr.samr_Connect5.level_in", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_DomInfo12_lockout_window,
@@ -16688,14 +16686,10 @@ void proto_register_dcerpc_samr(void)
          { "Acct Flags", "samr.samr_EnumDomainUsers.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo3_rid,
          { "Rid", "samr.samr_UserInfo3.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_DomainInfo_info6,
-         { "Info6", "samr.samr_DomainInfo.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_CreateDomAlias_alias_name,
          { "Alias Name", "samr.samr_CreateDomAlias.alias_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_EnumDomainUsers_sam,
          { "Sam", "samr.samr_EnumDomainUsers.sam", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_DispInfo_info5,
-         { "Info5", "samr.samr_DispInfo.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_GetGroupsForUser_rids,
          { "Rids", "samr.samr_GetGroupsForUser.rids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo3_last_logoff,
@@ -16722,8 +16716,6 @@ void proto_register_dcerpc_samr(void)
          { "Info In", "samr.samr_Connect5.info_in", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo21_nt_password_set,
          { "Nt Password Set", "samr.samr_UserInfo21.nt_password_set", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_UserInfo_info20,
-         { "Info20", "samr.samr_UserInfo.info20", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo21_private_data,
          { "Private Data", "samr.samr_UserInfo21.private_data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_CreateUser_access_mask,
@@ -16740,6 +16732,8 @@ void proto_register_dcerpc_samr(void)
          { "Samr Field Primary Gid", "samr.samr_FieldsPresent.SAMR_FIELD_PRIMARY_GID", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_PRIMARY_GID_tfs), ( 0x00000008 ), NULL, HFILL }},
        { &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_3,
          { "Samr Domain Access Set Info 3", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_SET_INFO_3", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_3_tfs), ( 0x00000400 ), NULL, HFILL }},
+       { &hf_samr_samr_GroupInfo_valGROUPINFOALL_all,
+         { "All", "samr.samr_GroupInfo_valGROUPINFOALL.all", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_GroupAttrs_SE_GROUP_USE_FOR_DENY_ONLY,
          { "Se Group Use For Deny Only", "samr.samr_GroupAttrs.SE_GROUP_USE_FOR_DENY_ONLY", FT_BOOLEAN, 32, TFS(&samr_GroupAttrs_SE_GROUP_USE_FOR_DENY_ONLY_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_samr_samr_DispInfoAscii_count,
@@ -16754,8 +16748,14 @@ void proto_register_dcerpc_samr(void)
          { "User Handle", "samr.samr_ChangePasswordUser.user_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_QueryUserInfo2_level,
          { "Level", "samr.samr_QueryUserInfo2.level", FT_UINT1632, BASE_DEC, VALS(samr_samr_UserInfoLevel_vals), 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val4_info4,
+         { "Info4", "samr.samr_UserInfo_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_DomainInfo_val11_general2,
+         { "General2", "samr.samr_DomainInfo_val11.general2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_FieldsPresent_SAMR_FIELD_BAD_PWD_COUNT,
          { "Samr Field Bad Pwd Count", "samr.samr_FieldsPresent.SAMR_FIELD_BAD_PWD_COUNT", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_BAD_PWD_COUNT_tfs), ( 0x00004000 ), NULL, HFILL }},
+       { &hf_samr_samr_ValidatePasswordRep_val2_ctr2,
+         { "Ctr2", "samr.samr_ValidatePasswordRep_val2.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_ValidatePasswordReq3_clear_lockout,
          { "Clear Lockout", "samr.samr_ValidatePasswordReq3.clear_lockout", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_Connect4_client_version,
@@ -16808,8 +16808,8 @@ void proto_register_dcerpc_samr(void)
          { "Returned Size", "samr.samr_QueryDisplayInfo.returned_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_UserInfo21_allow_password_change,
          { "Allow Password Change", "samr.samr_UserInfo21.allow_password_change", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
-       { &hf_samr_samr_ConnectInfo_info1,
-         { "Info1", "samr.samr_ConnectInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_samr_samr_UserInfo_val10_info10,
+         { "Info10", "samr.samr_UserInfo_val10.info10", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_SetSecurity_handle,
          { "Handle", "samr.samr_SetSecurity.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_samr_samr_FieldsPresent_SAMR_FIELD_FULL_NAME,