Regenerate DCE RPC dissectors with the current pidl.

Change-Id: I3cfb9399a9e5ed783083fa5b26a39646fb53875f
Reviewed-on: https://code.wireshark.org/review/5101
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 601 insertions, 547 deletions

diff --git a/epan/dissectors/packet-dcerpc-dfs.c b/epan/dissectors/packet-dcerpc-dfs.c
index 65d608d4f8..612a617fb1 100644
--- a/epan/dissectors/packet-dcerpc-dfs.c
+++ b/epan/dissectors/packet-dcerpc-dfs.c
@@ -59,175 +59,175 @@ static gint ett_netdfs_dfs_UnknownStruct = -1;
 
 
 /* Header field declarations */
-static gint hf_netdfs_dfs_Add_share = -1;
-static gint hf_netdfs_dfs_FlushFtTable_rootshare = -1;
+static gint hf_netdfs_dfs_AddFtRoot_comment = -1;
+static gint hf_netdfs_dfs_AddFtRoot_dfs_config_dn = -1;
 static gint hf_netdfs_dfs_AddFtRoot_dfsname = -1;
-static gint hf_netdfs_dfs_Info105_comment = -1;
-static gint hf_netdfs_dfs_Info5_guid = -1;
-static gint hf_netdfs_dfs_Info5_path = -1;
-static gint hf_netdfs_dfs_Add_path = -1;
-static gint hf_netdfs_dfs_StorageInfo_share = -1;
-static gint hf_netdfs_dfs_GetInfo_dfs_entry_path = -1;
-static gint hf_netdfs_dfs_Info6_stores = -1;
-static gint hf_netdfs_dfs_Remove_dfs_entry_path = -1;
-static gint hf_netdfs_dfs_Info105_state = -1;
-static gint hf_netdfs_dfs_RemoveFtRoot_dfsname = -1;
-static gint hf_netdfs_dfs_UnknownStruct_unknown2 = -1;
-static gint hf_netdfs_dfs_Info_info7 = -1;
-static gint hf_netdfs_dfs_EnumArray3_s = -1;
-static gint hf_netdfs_dfs_Info_info4 = -1;
-static gint hf_netdfs_dfs_Info106_priority = -1;
-static gint hf_netdfs_dfs_Info5_timeout = -1;
-static gint hf_netdfs_dfs_EnumEx_info = -1;
-static gint hf_netdfs_dfs_Info6_entry_path = -1;
-static gint hf_netdfs_dfs_Info_info6 = -1;
-static gint hf_netdfs_dfs_EnumStruct_level = -1;
-static gint hf_netdfs_dfs_Info6_state = -1;
-static gint hf_netdfs_dfs_StorageInfo_server = -1;
-static gint hf_netdfs_dfs_SetInfo_dfs_entry_path = -1;
-static gint hf_netdfs_dfs_Info4_timeout = -1;
-static gint hf_netdfs_dfs_SetInfo_sharename = -1;
-static gint hf_netdfs_dfs_Info_info1 = -1;
-static gint hf_netdfs_dfs_Add_comment = -1;
-static gint hf_netdfs_dfs_Info105_property_flags = -1;
-static gint hf_netdfs_dfs_EnumEx_bufsize = -1;
-static gint hf_netdfs_dfs_AddStdRootForced_store = -1;
-static gint hf_netdfs_dfs_Info2_num_stores = -1;
-static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_STANDALONE = -1;
-static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_OFFLINE = -1;
-static gint hf_netdfs_dfs_EnumInfo_info4 = -1;
-static gint hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_CLUSTER_ENABLED = -1;
-static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_AD_BLOB = -1;
-static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_INCONSISTENT = -1;
+static gint hf_netdfs_dfs_AddFtRoot_dns_servername = -1;
+static gint hf_netdfs_dfs_AddFtRoot_flags = -1;
+static gint hf_netdfs_dfs_AddFtRoot_rootshare = -1;
 static gint hf_netdfs_dfs_AddFtRoot_servername = -1;
-static gint hf_netdfs_dfs_Info_info101 = -1;
+static gint hf_netdfs_dfs_AddFtRoot_unknown1 = -1;
 static gint hf_netdfs_dfs_AddFtRoot_unknown2 = -1;
-static gint hf_netdfs_dfs_GetInfo_sharename = -1;
-static gint hf_netdfs_dfs_Info200_dom_root = -1;
-static gint hf_netdfs_dfs_Info6_num_stores = -1;
-static gint hf_netdfs_dfs_Add_flags = -1;
-static gint hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_SITE_COSTING = -1;
-static gint hf_netdfs_dfs_Info_info103 = -1;
-static gint hf_netdfs_dfs_Info_info106 = -1;
-static gint hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ACTIVE = -1;
-static gint hf_netdfs_dfs_Info7_generation_guid = -1;
-static gint hf_netdfs_dfs_Info5_comment = -1;
-static gint hf_netdfs_dfs_Info5_flags = -1;
-static gint hf_netdfs_dfs_Remove_sharename = -1;
-static gint hf_netdfs_dfs_Info5_pktsize = -1;
-static gint hf_netdfs_dfs_Target_Priority_reserved = -1;
-static gint hf_netdfs_dfs_Info6_pktsize = -1;
-static gint hf_netdfs_dfs_RemoveStdRoot_flags = -1;
-static gint hf_netdfs_dfs_RemoveFtRoot_rootshare = -1;
-static gint hf_netdfs_dfs_EnumArray2_count = -1;
-static gint hf_netdfs_dfs_Info_info105 = -1;
+static gint hf_netdfs_dfs_AddStdRootForced_comment = -1;
 static gint hf_netdfs_dfs_AddStdRootForced_rootshare = -1;
-static gint hf_netdfs_dfs_GetInfo_info = -1;
-static gint hf_netdfs_dfs_Info3_path = -1;
-static gint hf_netdfs_dfs_EnumEx_dfs_name = -1;
-static gint hf_netdfs_dfs_Info4_state = -1;
+static gint hf_netdfs_dfs_AddStdRootForced_servername = -1;
+static gint hf_netdfs_dfs_AddStdRootForced_store = -1;
+static gint hf_netdfs_dfs_AddStdRoot_comment = -1;
+static gint hf_netdfs_dfs_AddStdRoot_flags = -1;
+static gint hf_netdfs_dfs_AddStdRoot_rootshare = -1;
+static gint hf_netdfs_dfs_AddStdRoot_servername = -1;
+static gint hf_netdfs_dfs_Add_comment = -1;
+static gint hf_netdfs_dfs_Add_flags = -1;
+static gint hf_netdfs_dfs_Add_path = -1;
+static gint hf_netdfs_dfs_Add_server = -1;
+static gint hf_netdfs_dfs_Add_share = -1;
+static gint hf_netdfs_dfs_EnumArray1_count = -1;
+static gint hf_netdfs_dfs_EnumArray1_s = -1;
+static gint hf_netdfs_dfs_EnumArray200_count = -1;
 static gint hf_netdfs_dfs_EnumArray200_s = -1;
-static gint hf_netdfs_dfs_Info_info0 = -1;
-static gint hf_netdfs_dfs_AddFtRoot_flags = -1;
+static gint hf_netdfs_dfs_EnumArray2_count = -1;
+static gint hf_netdfs_dfs_EnumArray2_s = -1;
+static gint hf_netdfs_dfs_EnumArray300_count = -1;
 static gint hf_netdfs_dfs_EnumArray300_s = -1;
-static gint hf_netdfs_dfs_Info4_path = -1;
-static gint hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ONLINE = -1;
-static gint hf_netdfs_dfs_RemoveStdRoot_servername = -1;
-static gint hf_netdfs_dfs_Add_server = -1;
-static gint hf_netdfs_dfs_EnumInfo_info1 = -1;
-static gint hf_netdfs_dfs_Info300_dom_root = -1;
+static gint hf_netdfs_dfs_EnumArray3_count = -1;
+static gint hf_netdfs_dfs_EnumArray3_s = -1;
+static gint hf_netdfs_dfs_EnumArray4_count = -1;
+static gint hf_netdfs_dfs_EnumArray4_s = -1;
+static gint hf_netdfs_dfs_EnumEx_bufsize = -1;
+static gint hf_netdfs_dfs_EnumEx_dfs_name = -1;
+static gint hf_netdfs_dfs_EnumEx_info = -1;
 static gint hf_netdfs_dfs_EnumEx_level = -1;
-static gint hf_netdfs_dfs_EnumArray200_count = -1;
-static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_ONLINE = -1;
-static gint hf_netdfs_dfs_Info106_state = -1;
-static gint hf_netdfs_dfs_GetManagerVersion_version = -1;
-static gint hf_netdfs_dfs_SetInfo_level = -1;
+static gint hf_netdfs_dfs_EnumEx_total = -1;
+static gint hf_netdfs_dfs_EnumInfo_info1 = -1;
+static gint hf_netdfs_dfs_EnumInfo_info2 = -1;
+static gint hf_netdfs_dfs_EnumInfo_info200 = -1;
+static gint hf_netdfs_dfs_EnumInfo_info3 = -1;
+static gint hf_netdfs_dfs_EnumInfo_info300 = -1;
+static gint hf_netdfs_dfs_EnumInfo_info4 = -1;
+static gint hf_netdfs_dfs_EnumStruct_e = -1;
+static gint hf_netdfs_dfs_EnumStruct_level = -1;
+static gint hf_netdfs_dfs_Enum_bufsize = -1;
+static gint hf_netdfs_dfs_Enum_info = -1;
+static gint hf_netdfs_dfs_Enum_level = -1;
 static gint hf_netdfs_dfs_Enum_total = -1;
-static gint hf_netdfs_dfs_AddFtRoot_dfs_config_dn = -1;
-static gint hf_netdfs_dfs_RemoveFtRoot_unknown = -1;
-static gint hf_netdfs_dfs_Info1_path = -1;
-static gint hf_netdfs_dfs_SetInfo_servername = -1;
+static gint hf_netdfs_dfs_FlushFtTable_rootshare = -1;
 static gint hf_netdfs_dfs_FlushFtTable_servername = -1;
-static gint hf_netdfs_dfs_Info103_flags = -1;
-static gint hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_ROOT_SCALABILITY = -1;
-static gint hf_netdfs_dfs_EnumInfo_info3 = -1;
+static gint hf_netdfs_dfs_GetInfo_dfs_entry_path = -1;
+static gint hf_netdfs_dfs_GetInfo_info = -1;
+static gint hf_netdfs_dfs_GetInfo_level = -1;
 static gint hf_netdfs_dfs_GetInfo_servername = -1;
-static gint hf_netdfs_dfs_Info4_guid = -1;
-static gint hf_netdfs_dfs_EnumArray4_s = -1;
-static gint hf_netdfs_dfs_Remove_servername = -1;
-static gint hf_netdfs_dfs_StorageInfo2_info = -1;
-static gint hf_netdfs_dfs_Info4_comment = -1;
-static gint hf_netdfs_dfs_AddFtRoot_rootshare = -1;
-static gint hf_netdfs_dfs_Info3_state = -1;
-static gint hf_netdfs_dfs_EnumArray1_s = -1;
-static gint hf_netdfs_dfs_Info_info2 = -1;
-static gint hf_netdfs_dfs_Enum_info = -1;
-static gint hf_netdfs_dfs_EnumStruct_e = -1;
-static gint hf_netdfs_dfs_Info_info5 = -1;
-static gint hf_netdfs_dfs_EnumArray300_count = -1;
-static gint hf_netdfs_dfs_ManagerInitialize_servername = -1;
-static gint hf_netdfs_dfs_RemoveStdRoot_rootshare = -1;
-static gint hf_netdfs_dfs_Info_info100 = -1;
+static gint hf_netdfs_dfs_GetInfo_sharename = -1;
+static gint hf_netdfs_dfs_GetManagerVersion_version = -1;
 static gint hf_netdfs_dfs_Info100_comment = -1;
-static gint hf_netdfs_dfs_AddFtRoot_unknown1 = -1;
-static gint hf_netdfs_opnum = -1;
-static gint hf_netdfs_dfs_EnumInfo_info300 = -1;
-static gint hf_netdfs_dfs_Info6_flags = -1;
+static gint hf_netdfs_dfs_Info101_state = -1;
 static gint hf_netdfs_dfs_Info102_timeout = -1;
-static gint hf_netdfs_dfs_EnumInfo_info200 = -1;
-static gint hf_netdfs_dfs_Info3_num_stores = -1;
-static gint hf_netdfs_dfs_StorageInfo_state = -1;
-static gint hf_netdfs_dfs_EnumArray1_count = -1;
-static gint hf_netdfs_dfs_Info_info3 = -1;
-static gint hf_netdfs_dfs_AddStdRootForced_comment = -1;
+static gint hf_netdfs_dfs_Info103_flags = -1;
 static gint hf_netdfs_dfs_Info104_priority = -1;
-static gint hf_netdfs_dfs_AddStdRoot_comment = -1;
-static gint hf_netdfs_dfs_Info3_comment = -1;
-static gint hf_netdfs_dfs_UnknownStruct_unknown1 = -1;
-static gint hf_netdfs_dfs_Info6_timeout = -1;
-static gint hf_netdfs_dfs_Info101_state = -1;
-static gint hf_netdfs_dfs_AddStdRootForced_servername = -1;
-static gint hf_netdfs_dfs_Info2_path = -1;
+static gint hf_netdfs_dfs_Info105_comment = -1;
+static gint hf_netdfs_dfs_Info105_property_flag_mask = -1;
+static gint hf_netdfs_dfs_Info105_property_flags = -1;
+static gint hf_netdfs_dfs_Info105_state = -1;
 static gint hf_netdfs_dfs_Info105_timeout = -1;
+static gint hf_netdfs_dfs_Info106_priority = -1;
+static gint hf_netdfs_dfs_Info106_state = -1;
+static gint hf_netdfs_dfs_Info1_path = -1;
+static gint hf_netdfs_dfs_Info200_dom_root = -1;
+static gint hf_netdfs_dfs_Info2_comment = -1;
+static gint hf_netdfs_dfs_Info2_num_stores = -1;
+static gint hf_netdfs_dfs_Info2_path = -1;
+static gint hf_netdfs_dfs_Info2_state = -1;
+static gint hf_netdfs_dfs_Info300_dom_root = -1;
+static gint hf_netdfs_dfs_Info300_flavor = -1;
+static gint hf_netdfs_dfs_Info3_comment = -1;
+static gint hf_netdfs_dfs_Info3_num_stores = -1;
+static gint hf_netdfs_dfs_Info3_path = -1;
+static gint hf_netdfs_dfs_Info3_state = -1;
 static gint hf_netdfs_dfs_Info3_stores = -1;
-static gint hf_netdfs_dfs_AddFtRoot_dns_servername = -1;
-static gint hf_netdfs_dfs_Enum_bufsize = -1;
-static gint hf_netdfs_dfs_GetInfo_level = -1;
-static gint hf_netdfs_werror = -1;
-static gint hf_netdfs_dfs_AddFtRoot_comment = -1;
-static gint hf_netdfs_dfs_Info_info102 = -1;
-static gint hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_TARGET_FAILBACK = -1;
-static gint hf_netdfs_dfs_EnumArray3_count = -1;
-static gint hf_netdfs_dfs_ManagerInitialize_flags = -1;
+static gint hf_netdfs_dfs_Info4_comment = -1;
+static gint hf_netdfs_dfs_Info4_guid = -1;
+static gint hf_netdfs_dfs_Info4_num_stores = -1;
+static gint hf_netdfs_dfs_Info4_path = -1;
+static gint hf_netdfs_dfs_Info4_state = -1;
 static gint hf_netdfs_dfs_Info4_stores = -1;
+static gint hf_netdfs_dfs_Info4_timeout = -1;
+static gint hf_netdfs_dfs_Info5_comment = -1;
+static gint hf_netdfs_dfs_Info5_flags = -1;
+static gint hf_netdfs_dfs_Info5_guid = -1;
+static gint hf_netdfs_dfs_Info5_num_stores = -1;
+static gint hf_netdfs_dfs_Info5_path = -1;
+static gint hf_netdfs_dfs_Info5_pktsize = -1;
+static gint hf_netdfs_dfs_Info5_state = -1;
+static gint hf_netdfs_dfs_Info5_timeout = -1;
+static gint hf_netdfs_dfs_Info6_comment = -1;
+static gint hf_netdfs_dfs_Info6_entry_path = -1;
+static gint hf_netdfs_dfs_Info6_flags = -1;
+static gint hf_netdfs_dfs_Info6_guid = -1;
+static gint hf_netdfs_dfs_Info6_num_stores = -1;
+static gint hf_netdfs_dfs_Info6_pktsize = -1;
+static gint hf_netdfs_dfs_Info6_state = -1;
+static gint hf_netdfs_dfs_Info6_stores = -1;
+static gint hf_netdfs_dfs_Info6_timeout = -1;
+static gint hf_netdfs_dfs_Info7_generation_guid = -1;
+static gint hf_netdfs_dfs_Info_info0 = -1;
+static gint hf_netdfs_dfs_Info_info1 = -1;
+static gint hf_netdfs_dfs_Info_info100 = -1;
+static gint hf_netdfs_dfs_Info_info101 = -1;
+static gint hf_netdfs_dfs_Info_info102 = -1;
+static gint hf_netdfs_dfs_Info_info103 = -1;
 static gint hf_netdfs_dfs_Info_info104 = -1;
-static gint hf_netdfs_dfs_SetInfo_info = -1;
+static gint hf_netdfs_dfs_Info_info105 = -1;
+static gint hf_netdfs_dfs_Info_info106 = -1;
+static gint hf_netdfs_dfs_Info_info2 = -1;
+static gint hf_netdfs_dfs_Info_info3 = -1;
+static gint hf_netdfs_dfs_Info_info4 = -1;
+static gint hf_netdfs_dfs_Info_info5 = -1;
+static gint hf_netdfs_dfs_Info_info6 = -1;
+static gint hf_netdfs_dfs_Info_info7 = -1;
+static gint hf_netdfs_dfs_ManagerInitialize_flags = -1;
+static gint hf_netdfs_dfs_ManagerInitialize_servername = -1;
+static gint hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_CLUSTER_ENABLED = -1;
+static gint hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_INSITE_REFERRALS = -1;
+static gint hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_ROOT_SCALABILITY = -1;
+static gint hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_SITE_COSTING = -1;
+static gint hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_TARGET_FAILBACK = -1;
+static gint hf_netdfs_dfs_RemoveFtRoot_dfsname = -1;
 static gint hf_netdfs_dfs_RemoveFtRoot_dns_servername = -1;
+static gint hf_netdfs_dfs_RemoveFtRoot_flags = -1;
+static gint hf_netdfs_dfs_RemoveFtRoot_rootshare = -1;
+static gint hf_netdfs_dfs_RemoveFtRoot_servername = -1;
+static gint hf_netdfs_dfs_RemoveFtRoot_unknown = -1;
+static gint hf_netdfs_dfs_RemoveStdRoot_flags = -1;
+static gint hf_netdfs_dfs_RemoveStdRoot_rootshare = -1;
+static gint hf_netdfs_dfs_RemoveStdRoot_servername = -1;
+static gint hf_netdfs_dfs_Remove_dfs_entry_path = -1;
+static gint hf_netdfs_dfs_Remove_servername = -1;
+static gint hf_netdfs_dfs_Remove_sharename = -1;
+static gint hf_netdfs_dfs_SetInfo_dfs_entry_path = -1;
+static gint hf_netdfs_dfs_SetInfo_info = -1;
+static gint hf_netdfs_dfs_SetInfo_level = -1;
+static gint hf_netdfs_dfs_SetInfo_servername = -1;
+static gint hf_netdfs_dfs_SetInfo_sharename = -1;
+static gint hf_netdfs_dfs_StorageInfo2_info = -1;
 static gint hf_netdfs_dfs_StorageInfo2_target_priority = -1;
-static gint hf_netdfs_dfs_Target_Priority_target_priority_rank = -1;
-static gint hf_netdfs_dfs_Info5_num_stores = -1;
-static gint hf_netdfs_dfs_AddStdRoot_flags = -1;
-static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_OK = -1;
+static gint hf_netdfs_dfs_StorageInfo_server = -1;
+static gint hf_netdfs_dfs_StorageInfo_share = -1;
+static gint hf_netdfs_dfs_StorageInfo_state = -1;
+static gint hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ACTIVE = -1;
 static gint hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_OFFLINE = -1;
-static gint hf_netdfs_dfs_EnumArray2_s = -1;
-static gint hf_netdfs_dfs_EnumEx_total = -1;
-static gint hf_netdfs_dfs_AddStdRoot_servername = -1;
-static gint hf_netdfs_dfs_EnumInfo_info2 = -1;
-static gint hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_INSITE_REFERRALS = -1;
-static gint hf_netdfs_dfs_Info6_guid = -1;
-static gint hf_netdfs_dfs_Info2_comment = -1;
-static gint hf_netdfs_dfs_Info2_state = -1;
-static gint hf_netdfs_dfs_Info300_flavor = -1;
-static gint hf_netdfs_dfs_RemoveFtRoot_flags = -1;
-static gint hf_netdfs_dfs_EnumArray4_count = -1;
-static gint hf_netdfs_dfs_Info6_comment = -1;
+static gint hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ONLINE = -1;
+static gint hf_netdfs_dfs_Target_Priority_reserved = -1;
 static gint hf_netdfs_dfs_Target_Priority_target_priority_class = -1;
-static gint hf_netdfs_dfs_Enum_level = -1;
-static gint hf_netdfs_dfs_Info5_state = -1;
-static gint hf_netdfs_dfs_AddStdRoot_rootshare = -1;
-static gint hf_netdfs_dfs_Info4_num_stores = -1;
-static gint hf_netdfs_dfs_RemoveFtRoot_servername = -1;
-static gint hf_netdfs_dfs_Info105_property_flag_mask = -1;
+static gint hf_netdfs_dfs_Target_Priority_target_priority_rank = -1;
+static gint hf_netdfs_dfs_UnknownStruct_unknown1 = -1;
+static gint hf_netdfs_dfs_UnknownStruct_unknown2 = -1;
+static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_AD_BLOB = -1;
+static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_INCONSISTENT = -1;
+static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_OFFLINE = -1;
+static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_OK = -1;
+static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_ONLINE = -1;
+static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_STANDALONE = -1;
+static gint hf_netdfs_opnum = -1;
+static gint hf_netdfs_werror = -1;
 
 static gint proto_dcerpc_netdfs = -1;
 /* Version information */
@@ -560,12 +560,12 @@ int
 netdfs_dissect_enum_dfs_ManagerVersion(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
 	guint32 parameter=0;
-	if(param){
-		parameter=(guint32)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -596,7 +596,7 @@ netdfs_dissect_struct_dfs_Info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 
 
 /* IDL: struct { */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *path; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *path; */
 /* IDL: } */
 
 static int
@@ -627,6 +627,8 @@ netdfs_dissect_struct_dfs_Info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -734,8 +736,8 @@ netdfs_dissect_bitmap_dfs_VolumeState(tvbuff_t *tvb _U_, int offset _U_, packet_
 
 
 /* IDL: struct { */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *path; */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *comment; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *path; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *comment; */
 /* IDL: 	dfs_VolumeState state; */
 /* IDL: 	uint32 num_stores; */
 /* IDL: } */
@@ -803,6 +805,8 @@ netdfs_dissect_struct_dfs_Info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -890,8 +894,8 @@ netdfs_dissect_bitmap_dfs_StorageState(tvbuff_t *tvb _U_, int offset _U_, packet
 
 /* IDL: struct { */
 /* IDL: 	dfs_StorageState state; */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *server; */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *share; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *server; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *share; */
 /* IDL: } */
 
 static int
@@ -949,6 +953,8 @@ netdfs_dissect_struct_dfs_StorageInfo(tvbuff_t *tvb _U_, int offset _U_, packet_
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -975,11 +981,11 @@ netdfs_dissect_struct_dfs_StorageInfo(tvbuff_t *tvb _U_, int offset _U_, packet_
 
 
 /* IDL: struct { */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *path; */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *comment; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *path; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *comment; */
 /* IDL: 	dfs_VolumeState state; */
 /* IDL: 	uint32 num_stores; */
-/* IDL: 	[unique(1)] [size_is(num_stores)] dfs_StorageInfo *stores; */
+/* IDL: 	[size_is(num_stores)] [unique(1)] dfs_StorageInfo *stores; */
 /* IDL: } */
 
 static int
@@ -1069,6 +1075,8 @@ netdfs_dissect_struct_dfs_Info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -1099,13 +1107,13 @@ netdfs_dissect_struct_dfs_Info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 
 
 /* IDL: struct { */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *path; */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *comment; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *path; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *comment; */
 /* IDL: 	dfs_VolumeState state; */
 /* IDL: 	uint32 timeout; */
 /* IDL: 	GUID guid; */
 /* IDL: 	uint32 num_stores; */
-/* IDL: 	[unique(1)] [size_is(num_stores)] dfs_StorageInfo *stores; */
+/* IDL: 	[size_is(num_stores)] [unique(1)] dfs_StorageInfo *stores; */
 /* IDL: } */
 
 static int
@@ -1211,6 +1219,8 @@ netdfs_dissect_struct_dfs_Info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -1321,8 +1331,8 @@ netdfs_dissect_bitmap_dfs_PropertyFlags(tvbuff_t *tvb _U_, int offset _U_, packe
 
 
 /* IDL: struct { */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *path; */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *comment; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *path; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *comment; */
 /* IDL: 	dfs_VolumeState state; */
 /* IDL: 	uint32 timeout; */
 /* IDL: 	GUID guid; */
@@ -1426,6 +1436,8 @@ netdfs_dissect_struct_dfs_Info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -1474,12 +1486,12 @@ int
 netdfs_dissect_enum_dfs_Target_PriorityClass(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
 {
 	guint32 parameter=0;
-	if(param){
-		parameter=(guint32)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -1524,6 +1536,8 @@ netdfs_dissect_struct_dfs_Target_Priority(tvbuff_t *tvb _U_, int offset _U_, pac
 
 	ALIGN_TO_4_BYTES;
 
+	ALIGN_TO_4_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -1579,6 +1593,8 @@ netdfs_dissect_struct_dfs_StorageInfo2(tvbuff_t *tvb _U_, int offset _U_, packet
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -1603,15 +1619,15 @@ netdfs_dissect_struct_dfs_StorageInfo2(tvbuff_t *tvb _U_, int offset _U_, packet
 
 
 /* IDL: struct { */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *entry_path; */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *comment; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *entry_path; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *comment; */
 /* IDL: 	dfs_VolumeState state; */
 /* IDL: 	uint32 timeout; */
 /* IDL: 	GUID guid; */
 /* IDL: 	dfs_PropertyFlags flags; */
 /* IDL: 	uint32 pktsize; */
 /* IDL: 	uint16 num_stores; */
-/* IDL: 	[unique(1)] [size_is(num_stores)] dfs_StorageInfo2 *stores; */
+/* IDL: 	[size_is(num_stores)] [unique(1)] dfs_StorageInfo2 *stores; */
 /* IDL: } */
 
 static int
@@ -1733,6 +1749,8 @@ netdfs_dissect_struct_dfs_Info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -1791,6 +1809,8 @@ netdfs_dissect_struct_dfs_Info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 
 	ALIGN_TO_4_BYTES;
 
+	ALIGN_TO_4_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -1813,7 +1833,7 @@ netdfs_dissect_struct_dfs_Info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 
 
 /* IDL: struct { */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *comment; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *comment; */
 /* IDL: } */
 
 static int
@@ -1844,6 +1864,8 @@ netdfs_dissect_struct_dfs_Info100(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -1886,6 +1908,8 @@ netdfs_dissect_struct_dfs_Info101(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
 	ALIGN_TO_4_BYTES;
 
+	ALIGN_TO_4_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -1928,6 +1952,8 @@ netdfs_dissect_struct_dfs_Info102(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
 	ALIGN_TO_4_BYTES;
 
+	ALIGN_TO_4_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -1970,6 +1996,8 @@ netdfs_dissect_struct_dfs_Info103(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
 	ALIGN_TO_4_BYTES;
 
+	ALIGN_TO_4_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -2012,6 +2040,8 @@ netdfs_dissect_struct_dfs_Info104(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
 	ALIGN_TO_4_BYTES;
 
+	ALIGN_TO_4_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -2034,7 +2064,7 @@ netdfs_dissect_struct_dfs_Info104(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
 
 /* IDL: struct { */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *comment; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *comment; */
 /* IDL: 	dfs_VolumeState state; */
 /* IDL: 	uint32 timeout; */
 /* IDL: 	uint32 property_flag_mask; */
@@ -2101,6 +2131,8 @@ netdfs_dissect_struct_dfs_Info105(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -2160,6 +2192,8 @@ netdfs_dissect_struct_dfs_Info106(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
 	ALIGN_TO_4_BYTES;
 
+	ALIGN_TO_4_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -2184,7 +2218,7 @@ netdfs_dissect_struct_dfs_Info106(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
 
 /* IDL: struct { */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *dom_root; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *dom_root; */
 /* IDL: } */
 
 static int
@@ -2215,6 +2249,8 @@ netdfs_dissect_struct_dfs_Info200(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -2245,12 +2281,12 @@ int
 netdfs_dissect_enum_dfs_VolumeFlavor(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint1632 *param _U_)
 {
 	guint1632 parameter=0;
-	if(param){
-		parameter=(guint1632)*param;
+	if (param) {
+		parameter = *param;
 	}
 	offset = dissect_ndr_uint1632(tvb, offset, pinfo, tree, di, drep, hf_index, &parameter);
-	if(param){
-		*param=(guint32)parameter;
+	if (param) {
+		*param = parameter;
 	}
 	return offset;
 }
@@ -2258,7 +2294,7 @@ netdfs_dissect_enum_dfs_VolumeFlavor(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
 /* IDL: struct { */
 /* IDL: 	dfs_VolumeFlavor flavor; */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *dom_root; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *dom_root; */
 /* IDL: } */
 
 static int
@@ -2297,6 +2333,8 @@ netdfs_dissect_struct_dfs_Info300(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -2321,21 +2359,21 @@ netdfs_dissect_struct_dfs_Info300(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
 
 /* IDL: union { */
-/* IDL: [case(0)] [unique(1)] [case(0)] dfs_Info0 *info0; */
-/* IDL: [case(1)] [unique(1)] [case(1)] dfs_Info1 *info1; */
-/* IDL: [case(2)] [unique(1)] [case(2)] dfs_Info2 *info2; */
-/* IDL: [case(3)] [unique(1)] [case(3)] dfs_Info3 *info3; */
-/* IDL: [case(4)] [unique(1)] [case(4)] dfs_Info4 *info4; */
-/* IDL: [case(5)] [unique(1)] [case(5)] dfs_Info5 *info5; */
-/* IDL: [case(6)] [unique(1)] [case(6)] dfs_Info6 *info6; */
-/* IDL: [case(7)] [unique(1)] [case(7)] dfs_Info7 *info7; */
-/* IDL: [case(100)] [unique(1)] [case(100)] dfs_Info100 *info100; */
-/* IDL: [case(101)] [unique(1)] [case(101)] dfs_Info101 *info101; */
-/* IDL: [case(102)] [unique(1)] [case(102)] dfs_Info102 *info102; */
-/* IDL: [case(103)] [unique(1)] [case(103)] dfs_Info103 *info103; */
-/* IDL: [case(104)] [unique(1)] [case(104)] dfs_Info104 *info104; */
-/* IDL: [case(105)] [unique(1)] [case(105)] dfs_Info105 *info105; */
-/* IDL: [case(106)] [unique(1)] [case(106)] dfs_Info106 *info106; */
+/* IDL: [case(0)] [case(0)] [unique(1)] dfs_Info0 *info0; */
+/* IDL: [case(1)] [case(1)] [unique(1)] dfs_Info1 *info1; */
+/* IDL: [case(2)] [case(2)] [unique(1)] dfs_Info2 *info2; */
+/* IDL: [case(3)] [case(3)] [unique(1)] dfs_Info3 *info3; */
+/* IDL: [case(4)] [case(4)] [unique(1)] dfs_Info4 *info4; */
+/* IDL: [case(5)] [case(5)] [unique(1)] dfs_Info5 *info5; */
+/* IDL: [case(6)] [case(6)] [unique(1)] dfs_Info6 *info6; */
+/* IDL: [case(7)] [case(7)] [unique(1)] dfs_Info7 *info7; */
+/* IDL: [case(100)] [case(100)] [unique(1)] dfs_Info100 *info100; */
+/* IDL: [case(101)] [case(101)] [unique(1)] dfs_Info101 *info101; */
+/* IDL: [case(102)] [case(102)] [unique(1)] dfs_Info102 *info102; */
+/* IDL: [case(103)] [case(103)] [unique(1)] dfs_Info103 *info103; */
+/* IDL: [case(104)] [case(104)] [unique(1)] dfs_Info104 *info104; */
+/* IDL: [case(105)] [case(105)] [unique(1)] dfs_Info105 *info105; */
+/* IDL: [case(106)] [case(106)] [unique(1)] dfs_Info106 *info106; */
 /* IDL: } */
 
 static int
@@ -2663,7 +2701,7 @@ netdfs_dissect_dfs_Info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U
 
 /* IDL: struct { */
 /* IDL: 	uint32 count; */
-/* IDL: 	[unique(1)] [size_is(count)] dfs_Info1 *s; */
+/* IDL: 	[size_is(count)] [unique(1)] dfs_Info1 *s; */
 /* IDL: } */
 
 static int
@@ -2707,6 +2745,8 @@ netdfs_dissect_struct_dfs_EnumArray1(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -2732,7 +2772,7 @@ netdfs_dissect_struct_dfs_EnumArray1(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
 /* IDL: struct { */
 /* IDL: 	uint32 count; */
-/* IDL: 	[unique(1)] [size_is(count)] dfs_Info2 *s; */
+/* IDL: 	[size_is(count)] [unique(1)] dfs_Info2 *s; */
 /* IDL: } */
 
 static int
@@ -2776,6 +2816,8 @@ netdfs_dissect_struct_dfs_EnumArray2(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -2801,7 +2843,7 @@ netdfs_dissect_struct_dfs_EnumArray2(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
 /* IDL: struct { */
 /* IDL: 	uint32 count; */
-/* IDL: 	[unique(1)] [size_is(count)] dfs_Info3 *s; */
+/* IDL: 	[size_is(count)] [unique(1)] dfs_Info3 *s; */
 /* IDL: } */
 
 static int
@@ -2845,6 +2887,8 @@ netdfs_dissect_struct_dfs_EnumArray3(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -2870,7 +2914,7 @@ netdfs_dissect_struct_dfs_EnumArray3(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
 /* IDL: struct { */
 /* IDL: 	uint32 count; */
-/* IDL: 	[unique(1)] [size_is(count)] dfs_Info4 *s; */
+/* IDL: 	[size_is(count)] [unique(1)] dfs_Info4 *s; */
 /* IDL: } */
 
 static int
@@ -2914,6 +2958,8 @@ netdfs_dissect_struct_dfs_EnumArray4(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -2939,7 +2985,7 @@ netdfs_dissect_struct_dfs_EnumArray4(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
 /* IDL: struct { */
 /* IDL: 	uint32 count; */
-/* IDL: 	[unique(1)] [size_is(count)] dfs_Info200 *s; */
+/* IDL: 	[size_is(count)] [unique(1)] dfs_Info200 *s; */
 /* IDL: } */
 
 static int
@@ -2983,6 +3029,8 @@ netdfs_dissect_struct_dfs_EnumArray200(tvbuff_t *tvb _U_, int offset _U_, packet
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -3008,7 +3056,7 @@ netdfs_dissect_struct_dfs_EnumArray200(tvbuff_t *tvb _U_, int offset _U_, packet
 
 /* IDL: struct { */
 /* IDL: 	uint32 count; */
-/* IDL: 	[unique(1)] [size_is(count)] dfs_Info300 *s; */
+/* IDL: 	[size_is(count)] [unique(1)] dfs_Info300 *s; */
 /* IDL: } */
 
 static int
@@ -3052,6 +3100,8 @@ netdfs_dissect_struct_dfs_EnumArray300(tvbuff_t *tvb _U_, int offset _U_, packet
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -3076,12 +3126,12 @@ netdfs_dissect_struct_dfs_EnumArray300(tvbuff_t *tvb _U_, int offset _U_, packet
 
 
 /* IDL: union { */
-/* IDL: [case(1)] [unique(1)] [case(1)] dfs_EnumArray1 *info1; */
-/* IDL: [case(2)] [unique(1)] [case(2)] dfs_EnumArray2 *info2; */
-/* IDL: [case(3)] [unique(1)] [case(3)] dfs_EnumArray3 *info3; */
-/* IDL: [case(4)] [unique(1)] [case(4)] dfs_EnumArray4 *info4; */
-/* IDL: [case(200)] [unique(1)] [case(200)] dfs_EnumArray200 *info200; */
-/* IDL: [case(300)] [unique(1)] [case(300)] dfs_EnumArray300 *info300; */
+/* IDL: [case(1)] [case(1)] [unique(1)] dfs_EnumArray1 *info1; */
+/* IDL: [case(2)] [case(2)] [unique(1)] dfs_EnumArray2 *info2; */
+/* IDL: [case(3)] [case(3)] [unique(1)] dfs_EnumArray3 *info3; */
+/* IDL: [case(4)] [case(4)] [unique(1)] dfs_EnumArray4 *info4; */
+/* IDL: [case(200)] [case(200)] [unique(1)] dfs_EnumArray200 *info200; */
+/* IDL: [case(300)] [case(300)] [unique(1)] dfs_EnumArray300 *info300; */
 /* IDL: } */
 
 static int
@@ -3258,6 +3308,8 @@ netdfs_dissect_struct_dfs_EnumStruct(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -3283,7 +3335,7 @@ netdfs_dissect_struct_dfs_EnumStruct(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
 /* IDL: struct { */
 /* IDL: 	uint32 unknown1; */
-/* IDL: 	[unique(1)] [charset(UTF16)] uint16 *unknown2; */
+/* IDL: 	[charset(UTF16)] [unique(1)] uint16 *unknown2; */
 /* IDL: } */
 
 static int
@@ -3322,6 +3374,8 @@ netdfs_dissect_struct_dfs_UnknownStruct(tvbuff_t *tvb _U_, int offset _U_, packe
 
 	ALIGN_TO_5_BYTES;
 
+	ALIGN_TO_5_BYTES;
+
 	old_offset = offset;
 
 	if (parent_tree) {
@@ -3466,10 +3520,10 @@ netdfs_dissect_element_dfs_Add_flags(tvbuff_t *tvb _U_, int offset _U_, packet_i
 }
 
 /* IDL: WERROR dfs_Add( */
-/* IDL: [ref] [in] [charset(UTF16)] uint16 *path, */
-/* IDL: [ref] [in] [charset(UTF16)] uint16 *server, */
-/* IDL: [unique(1)] [in] [charset(UTF16)] uint16 *share, */
-/* IDL: [unique(1)] [in] [charset(UTF16)] uint16 *comment, */
+/* IDL: [charset(UTF16)] [in] [ref] uint16 *path, */
+/* IDL: [charset(UTF16)] [in] [ref] uint16 *server, */
+/* IDL: [charset(UTF16)] [in] [unique(1)] uint16 *share, */
+/* IDL: [charset(UTF16)] [in] [unique(1)] uint16 *comment, */
 /* IDL: [in] uint32 flags */
 /* IDL: ); */
 
@@ -3562,9 +3616,9 @@ netdfs_dissect_element_dfs_Remove_sharename_(tvbuff_t *tvb _U_, int offset _U_,
 }
 
 /* IDL: WERROR dfs_Remove( */
-/* IDL: [ref] [in] [charset(UTF16)] uint16 *dfs_entry_path, */
-/* IDL: [unique(1)] [in] [charset(UTF16)] uint16 *servername, */
-/* IDL: [unique(1)] [in] [charset(UTF16)] uint16 *sharename */
+/* IDL: [charset(UTF16)] [in] [ref] uint16 *dfs_entry_path, */
+/* IDL: [charset(UTF16)] [in] [unique(1)] uint16 *servername, */
+/* IDL: [charset(UTF16)] [in] [unique(1)] uint16 *sharename */
 /* IDL: ); */
 
 static int
@@ -3668,11 +3722,11 @@ netdfs_dissect_element_dfs_SetInfo_info_(tvbuff_t *tvb _U_, int offset _U_, pack
 }
 
 /* IDL: WERROR dfs_SetInfo( */
-/* IDL: [in] [charset(UTF16)] uint16 dfs_entry_path[*], */
-/* IDL: [unique(1)] [in] [charset(UTF16)] uint16 *servername, */
-/* IDL: [unique(1)] [in] [charset(UTF16)] uint16 *sharename, */
+/* IDL: [charset(UTF16)] [in] uint16 dfs_entry_path[*], */
+/* IDL: [charset(UTF16)] [in] [unique(1)] uint16 *servername, */
+/* IDL: [charset(UTF16)] [in] [unique(1)] uint16 *sharename, */
 /* IDL: [in] uint32 level, */
-/* IDL: [ref] [in] [switch_is(level)] dfs_Info *info */
+/* IDL: [in] [ref] [switch_is(level)] dfs_Info *info */
 /* IDL: ); */
 
 static int
@@ -3780,9 +3834,9 @@ netdfs_dissect_element_dfs_GetInfo_info_(tvbuff_t *tvb _U_, int offset _U_, pack
 }
 
 /* IDL: WERROR dfs_GetInfo( */
-/* IDL: [in] [charset(UTF16)] uint16 dfs_entry_path[*], */
-/* IDL: [unique(1)] [in] [charset(UTF16)] uint16 *servername, */
-/* IDL: [unique(1)] [in] [charset(UTF16)] uint16 *sharename, */
+/* IDL: [charset(UTF16)] [in] uint16 dfs_entry_path[*], */
+/* IDL: [charset(UTF16)] [in] [unique(1)] uint16 *servername, */
+/* IDL: [charset(UTF16)] [in] [unique(1)] uint16 *sharename, */
 /* IDL: [in] uint32 level, */
 /* IDL: [out] [ref] [switch_is(level)] dfs_Info *info */
 /* IDL: ); */
@@ -3870,8 +3924,8 @@ netdfs_dissect_element_dfs_Enum_total_(tvbuff_t *tvb _U_, int offset _U_, packet
 /* IDL: WERROR dfs_Enum( */
 /* IDL: [in] uint32 level, */
 /* IDL: [in] uint32 bufsize, */
-/* IDL: [out] [unique(1)] [in] dfs_EnumStruct *info, */
-/* IDL: [out] [unique(1)] [in] uint32 *total */
+/* IDL: [in] [out] [unique(1)] dfs_EnumStruct *info, */
+/* IDL: [in] [out] [unique(1)] uint32 *total */
 /* IDL: ); */
 
 static int
@@ -4116,15 +4170,15 @@ netdfs_dissect_element_dfs_AddFtRoot_unknown2__(tvbuff_t *tvb _U_, int offset _U
 }
 
 /* IDL: WERROR dfs_AddFtRoot( */
-/* IDL: [in] [charset(UTF16)] uint16 servername[*], */
-/* IDL: [in] [charset(UTF16)] uint16 dns_servername[*], */
-/* IDL: [in] [charset(UTF16)] uint16 dfsname[*], */
-/* IDL: [in] [charset(UTF16)] uint16 rootshare[*], */
-/* IDL: [in] [charset(UTF16)] uint16 comment[*], */
-/* IDL: [in] [charset(UTF16)] uint16 dfs_config_dn[*], */
+/* IDL: [charset(UTF16)] [in] uint16 servername[*], */
+/* IDL: [charset(UTF16)] [in] uint16 dns_servername[*], */
+/* IDL: [charset(UTF16)] [in] uint16 dfsname[*], */
+/* IDL: [charset(UTF16)] [in] uint16 rootshare[*], */
+/* IDL: [charset(UTF16)] [in] uint16 comment[*], */
+/* IDL: [charset(UTF16)] [in] uint16 dfs_config_dn[*], */
 /* IDL: [in] uint8 unknown1, */
 /* IDL: [in] uint32 flags, */
-/* IDL: [out] [unique(1)] [in] dfs_UnknownStruct **unknown2 */
+/* IDL: [in] [out] [unique(1)] dfs_UnknownStruct **unknown2 */
 /* IDL: ); */
 
 static int
@@ -4246,12 +4300,12 @@ netdfs_dissect_element_dfs_RemoveFtRoot_unknown__(tvbuff_t *tvb _U_, int offset
 }
 
 /* IDL: WERROR dfs_RemoveFtRoot( */
-/* IDL: [in] [charset(UTF16)] uint16 servername[*], */
-/* IDL: [in] [charset(UTF16)] uint16 dns_servername[*], */
-/* IDL: [in] [charset(UTF16)] uint16 dfsname[*], */
-/* IDL: [in] [charset(UTF16)] uint16 rootshare[*], */
+/* IDL: [charset(UTF16)] [in] uint16 servername[*], */
+/* IDL: [charset(UTF16)] [in] uint16 dns_servername[*], */
+/* IDL: [charset(UTF16)] [in] uint16 dfsname[*], */
+/* IDL: [charset(UTF16)] [in] uint16 rootshare[*], */
 /* IDL: [in] uint32 flags, */
-/* IDL: [out] [unique(1)] [in] dfs_UnknownStruct **unknown */
+/* IDL: [in] [out] [unique(1)] dfs_UnknownStruct **unknown */
 /* IDL: ); */
 
 static int
@@ -4332,9 +4386,9 @@ netdfs_dissect_element_dfs_AddStdRoot_flags(tvbuff_t *tvb _U_, int offset _U_, p
 }
 
 /* IDL: WERROR dfs_AddStdRoot( */
-/* IDL: [in] [charset(UTF16)] uint16 servername[*], */
-/* IDL: [in] [charset(UTF16)] uint16 rootshare[*], */
-/* IDL: [in] [charset(UTF16)] uint16 comment[*], */
+/* IDL: [charset(UTF16)] [in] uint16 servername[*], */
+/* IDL: [charset(UTF16)] [in] uint16 rootshare[*], */
+/* IDL: [charset(UTF16)] [in] uint16 comment[*], */
 /* IDL: [in] uint32 flags */
 /* IDL: ); */
 
@@ -4398,8 +4452,8 @@ netdfs_dissect_element_dfs_RemoveStdRoot_flags(tvbuff_t *tvb _U_, int offset _U_
 }
 
 /* IDL: WERROR dfs_RemoveStdRoot( */
-/* IDL: [in] [charset(UTF16)] uint16 servername[*], */
-/* IDL: [in] [charset(UTF16)] uint16 rootshare[*], */
+/* IDL: [charset(UTF16)] [in] uint16 servername[*], */
+/* IDL: [charset(UTF16)] [in] uint16 rootshare[*], */
 /* IDL: [in] uint32 flags */
 /* IDL: ); */
 
@@ -4458,7 +4512,7 @@ netdfs_dissect_element_dfs_ManagerInitialize_flags(tvbuff_t *tvb _U_, int offset
 }
 
 /* IDL: WERROR dfs_ManagerInitialize( */
-/* IDL: [ref] [in] [charset(UTF16)] uint16 *servername, */
+/* IDL: [charset(UTF16)] [in] [ref] uint16 *servername, */
 /* IDL: [in] uint32 flags */
 /* IDL: ); */
 
@@ -4532,10 +4586,10 @@ netdfs_dissect_element_dfs_AddStdRootForced_store(tvbuff_t *tvb _U_, int offset
 }
 
 /* IDL: WERROR dfs_AddStdRootForced( */
-/* IDL: [in] [charset(UTF16)] uint16 servername[*], */
-/* IDL: [in] [charset(UTF16)] uint16 rootshare[*], */
-/* IDL: [in] [charset(UTF16)] uint16 comment[*], */
-/* IDL: [in] [charset(UTF16)] uint16 store[*] */
+/* IDL: [charset(UTF16)] [in] uint16 servername[*], */
+/* IDL: [charset(UTF16)] [in] uint16 rootshare[*], */
+/* IDL: [charset(UTF16)] [in] uint16 comment[*], */
+/* IDL: [charset(UTF16)] [in] uint16 store[*] */
 /* IDL: ); */
 
 static int
@@ -4640,8 +4694,8 @@ netdfs_dissect_element_dfs_FlushFtTable_rootshare(tvbuff_t *tvb _U_, int offset
 }
 
 /* IDL: WERROR dfs_FlushFtTable( */
-/* IDL: [in] [charset(UTF16)] uint16 servername[*], */
-/* IDL: [in] [charset(UTF16)] uint16 rootshare[*] */
+/* IDL: [charset(UTF16)] [in] uint16 servername[*], */
+/* IDL: [charset(UTF16)] [in] uint16 rootshare[*] */
 /* IDL: ); */
 
 static int
@@ -4779,11 +4833,11 @@ netdfs_dissect_element_dfs_EnumEx_total_(tvbuff_t *tvb _U_, int offset _U_, pack
 }
 
 /* IDL: WERROR dfs_EnumEx( */
-/* IDL: [in] [charset(UTF16)] uint16 dfs_name[*], */
+/* IDL: [charset(UTF16)] [in] uint16 dfs_name[*], */
 /* IDL: [in] uint32 level, */
 /* IDL: [in] uint32 bufsize, */
-/* IDL: [out] [unique(1)] [in] dfs_EnumStruct *info, */
-/* IDL: [out] [unique(1)] [in] uint32 *total */
+/* IDL: [in] [out] [unique(1)] dfs_EnumStruct *info, */
+/* IDL: [in] [out] [unique(1)] uint32 *total */
 /* IDL: ); */
 
 static int
@@ -4902,344 +4956,344 @@ static dcerpc_sub_dissector netdfs_dissectors[] = {
 void proto_register_dcerpc_netdfs(void)
 {
 	static hf_register_info hf[] = {
-	{ &hf_netdfs_dfs_Add_share,
-		{ "Share", "netdfs.dfs_Add.share", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_FlushFtTable_rootshare,
-		{ "Rootshare", "netdfs.dfs_FlushFtTable.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_AddFtRoot_comment,
+		{ "Comment", "netdfs.dfs_AddFtRoot.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_AddFtRoot_dfs_config_dn,
+		{ "Dfs Config Dn", "netdfs.dfs_AddFtRoot.dfs_config_dn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddFtRoot_dfsname,
 		{ "Dfsname", "netdfs.dfs_AddFtRoot.dfsname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info105_comment,
-		{ "Comment", "netdfs.dfs_Info105.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info5_guid,
-		{ "Guid", "netdfs.dfs_Info5.guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info5_path,
-		{ "Path", "netdfs.dfs_Info5.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Add_path,
-		{ "Path", "netdfs.dfs_Add.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_StorageInfo_share,
-		{ "Share", "netdfs.dfs_StorageInfo.share", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_GetInfo_dfs_entry_path,
-		{ "Dfs Entry Path", "netdfs.dfs_GetInfo.dfs_entry_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info6_stores,
-		{ "Stores", "netdfs.dfs_Info6.stores", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Remove_dfs_entry_path,
-		{ "Dfs Entry Path", "netdfs.dfs_Remove.dfs_entry_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info105_state,
-		{ "State", "netdfs.dfs_Info105.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_RemoveFtRoot_dfsname,
-		{ "Dfsname", "netdfs.dfs_RemoveFtRoot.dfsname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_UnknownStruct_unknown2,
-		{ "Unknown2", "netdfs.dfs_UnknownStruct.unknown2", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info_info7,
-		{ "Info7", "netdfs.dfs_Info.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumArray3_s,
-		{ "S", "netdfs.dfs_EnumArray3.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info_info4,
-		{ "Info4", "netdfs.dfs_Info.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info106_priority,
-		{ "Priority", "netdfs.dfs_Info106.priority", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info5_timeout,
-		{ "Timeout", "netdfs.dfs_Info5.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumEx_info,
-		{ "Info", "netdfs.dfs_EnumEx.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info6_entry_path,
-		{ "Entry Path", "netdfs.dfs_Info6.entry_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info_info6,
-		{ "Info6", "netdfs.dfs_Info.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumStruct_level,
-		{ "Level", "netdfs.dfs_EnumStruct.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info6_state,
-		{ "State", "netdfs.dfs_Info6.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_StorageInfo_server,
-		{ "Server", "netdfs.dfs_StorageInfo.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_SetInfo_dfs_entry_path,
-		{ "Dfs Entry Path", "netdfs.dfs_SetInfo.dfs_entry_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info4_timeout,
-		{ "Timeout", "netdfs.dfs_Info4.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_SetInfo_sharename,
-		{ "Sharename", "netdfs.dfs_SetInfo.sharename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info_info1,
-		{ "Info1", "netdfs.dfs_Info.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Add_comment,
-		{ "Comment", "netdfs.dfs_Add.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info105_property_flags,
-		{ "Property Flags", "netdfs.dfs_Info105.property_flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumEx_bufsize,
-		{ "Bufsize", "netdfs.dfs_EnumEx.bufsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_AddStdRootForced_store,
-		{ "Store", "netdfs.dfs_AddStdRootForced.store", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info2_num_stores,
-		{ "Num Stores", "netdfs.dfs_Info2.num_stores", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_STANDALONE,
-		{ "Dfs Volume State Standalone", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_STANDALONE", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_STANDALONE_tfs), ( DFS_VOLUME_FLAVOR_STANDALONE ), NULL, HFILL }},
-	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_OFFLINE,
-		{ "Dfs Volume State Offline", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_OFFLINE", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_OFFLINE_tfs), ( 0x4 ), NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumInfo_info4,
-		{ "Info4", "netdfs.dfs_EnumInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_CLUSTER_ENABLED,
-		{ "Dfs Property Flag Cluster Enabled", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_CLUSTER_ENABLED", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_CLUSTER_ENABLED_tfs), ( 0x10 ), NULL, HFILL }},
-	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_AD_BLOB,
-		{ "Dfs Volume State Ad Blob", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_AD_BLOB", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_AD_BLOB_tfs), ( DFS_VOLUME_FLAVOR_AD_BLOB ), NULL, HFILL }},
-	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_INCONSISTENT,
-		{ "Dfs Volume State Inconsistent", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_INCONSISTENT", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_INCONSISTENT_tfs), ( 0x2 ), NULL, HFILL }},
+	{ &hf_netdfs_dfs_AddFtRoot_dns_servername,
+		{ "Dns Servername", "netdfs.dfs_AddFtRoot.dns_servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_AddFtRoot_flags,
+		{ "Flags", "netdfs.dfs_AddFtRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_AddFtRoot_rootshare,
+		{ "Rootshare", "netdfs.dfs_AddFtRoot.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddFtRoot_servername,
 		{ "Servername", "netdfs.dfs_AddFtRoot.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info_info101,
-		{ "Info101", "netdfs.dfs_Info.info101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_AddFtRoot_unknown1,
+		{ "Unknown1", "netdfs.dfs_AddFtRoot.unknown1", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddFtRoot_unknown2,
 		{ "Unknown2", "netdfs.dfs_AddFtRoot.unknown2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_GetInfo_sharename,
-		{ "Sharename", "netdfs.dfs_GetInfo.sharename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info200_dom_root,
-		{ "Dom Root", "netdfs.dfs_Info200.dom_root", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info6_num_stores,
-		{ "Num Stores", "netdfs.dfs_Info6.num_stores", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Add_flags,
-		{ "Flags", "netdfs.dfs_Add.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_SITE_COSTING,
-		{ "Dfs Property Flag Site Costing", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_SITE_COSTING", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_SITE_COSTING_tfs), ( 0x04 ), NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info_info103,
-		{ "Info103", "netdfs.dfs_Info.info103", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info_info106,
-		{ "Info106", "netdfs.dfs_Info.info106", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ACTIVE,
-		{ "Dfs Storage State Active", "netdfs.dfs_StorageState.DFS_STORAGE_STATE_ACTIVE", FT_BOOLEAN, 32, TFS(&dfs_StorageState_DFS_STORAGE_STATE_ACTIVE_tfs), ( 4 ), NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info7_generation_guid,
-		{ "Generation Guid", "netdfs.dfs_Info7.generation_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info5_comment,
-		{ "Comment", "netdfs.dfs_Info5.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info5_flags,
-		{ "Flags", "netdfs.dfs_Info5.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Remove_sharename,
-		{ "Sharename", "netdfs.dfs_Remove.sharename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info5_pktsize,
-		{ "Pktsize", "netdfs.dfs_Info5.pktsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Target_Priority_reserved,
-		{ "Reserved", "netdfs.dfs_Target_Priority.reserved", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info6_pktsize,
-		{ "Pktsize", "netdfs.dfs_Info6.pktsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_RemoveStdRoot_flags,
-		{ "Flags", "netdfs.dfs_RemoveStdRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_RemoveFtRoot_rootshare,
-		{ "Rootshare", "netdfs.dfs_RemoveFtRoot.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumArray2_count,
-		{ "Count", "netdfs.dfs_EnumArray2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info_info105,
-		{ "Info105", "netdfs.dfs_Info.info105", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_AddStdRootForced_comment,
+		{ "Comment", "netdfs.dfs_AddStdRootForced.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddStdRootForced_rootshare,
 		{ "Rootshare", "netdfs.dfs_AddStdRootForced.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_GetInfo_info,
-		{ "Info", "netdfs.dfs_GetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info3_path,
-		{ "Path", "netdfs.dfs_Info3.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumEx_dfs_name,
-		{ "Dfs Name", "netdfs.dfs_EnumEx.dfs_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info4_state,
-		{ "State", "netdfs.dfs_Info4.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_AddStdRootForced_servername,
+		{ "Servername", "netdfs.dfs_AddStdRootForced.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_AddStdRootForced_store,
+		{ "Store", "netdfs.dfs_AddStdRootForced.store", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_AddStdRoot_comment,
+		{ "Comment", "netdfs.dfs_AddStdRoot.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_AddStdRoot_flags,
+		{ "Flags", "netdfs.dfs_AddStdRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_AddStdRoot_rootshare,
+		{ "Rootshare", "netdfs.dfs_AddStdRoot.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_AddStdRoot_servername,
+		{ "Servername", "netdfs.dfs_AddStdRoot.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Add_comment,
+		{ "Comment", "netdfs.dfs_Add.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Add_flags,
+		{ "Flags", "netdfs.dfs_Add.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Add_path,
+		{ "Path", "netdfs.dfs_Add.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Add_server,
+		{ "Server", "netdfs.dfs_Add.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Add_share,
+		{ "Share", "netdfs.dfs_Add.share", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumArray1_count,
+		{ "Count", "netdfs.dfs_EnumArray1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumArray1_s,
+		{ "S", "netdfs.dfs_EnumArray1.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumArray200_count,
+		{ "Count", "netdfs.dfs_EnumArray200.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumArray200_s,
 		{ "S", "netdfs.dfs_EnumArray200.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info_info0,
-		{ "Info0", "netdfs.dfs_Info.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_AddFtRoot_flags,
-		{ "Flags", "netdfs.dfs_AddFtRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumArray2_count,
+		{ "Count", "netdfs.dfs_EnumArray2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumArray2_s,
+		{ "S", "netdfs.dfs_EnumArray2.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumArray300_count,
+		{ "Count", "netdfs.dfs_EnumArray300.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumArray300_s,
 		{ "S", "netdfs.dfs_EnumArray300.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info4_path,
-		{ "Path", "netdfs.dfs_Info4.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ONLINE,
-		{ "Dfs Storage State Online", "netdfs.dfs_StorageState.DFS_STORAGE_STATE_ONLINE", FT_BOOLEAN, 32, TFS(&dfs_StorageState_DFS_STORAGE_STATE_ONLINE_tfs), ( 2 ), NULL, HFILL }},
-	{ &hf_netdfs_dfs_RemoveStdRoot_servername,
-		{ "Servername", "netdfs.dfs_RemoveStdRoot.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Add_server,
-		{ "Server", "netdfs.dfs_Add.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumInfo_info1,
-		{ "Info1", "netdfs.dfs_EnumInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info300_dom_root,
-		{ "Dom Root", "netdfs.dfs_Info300.dom_root", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumArray3_count,
+		{ "Count", "netdfs.dfs_EnumArray3.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumArray3_s,
+		{ "S", "netdfs.dfs_EnumArray3.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumArray4_count,
+		{ "Count", "netdfs.dfs_EnumArray4.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumArray4_s,
+		{ "S", "netdfs.dfs_EnumArray4.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumEx_bufsize,
+		{ "Bufsize", "netdfs.dfs_EnumEx.bufsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumEx_dfs_name,
+		{ "Dfs Name", "netdfs.dfs_EnumEx.dfs_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumEx_info,
+		{ "Info", "netdfs.dfs_EnumEx.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumEx_level,
 		{ "Level", "netdfs.dfs_EnumEx.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumArray200_count,
-		{ "Count", "netdfs.dfs_EnumArray200.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_ONLINE,
-		{ "Dfs Volume State Online", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_ONLINE", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_ONLINE_tfs), ( 0x8 ), NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info106_state,
-		{ "State", "netdfs.dfs_Info106.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_GetManagerVersion_version,
-		{ "Version", "netdfs.dfs_GetManagerVersion.version", FT_UINT32, BASE_DEC, VALS(netdfs_dfs_ManagerVersion_vals), 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_SetInfo_level,
-		{ "Level", "netdfs.dfs_SetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumEx_total,
+		{ "Total", "netdfs.dfs_EnumEx.total", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumInfo_info1,
+		{ "Info1", "netdfs.dfs_EnumInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumInfo_info2,
+		{ "Info2", "netdfs.dfs_EnumInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumInfo_info200,
+		{ "Info200", "netdfs.dfs_EnumInfo.info200", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumInfo_info3,
+		{ "Info3", "netdfs.dfs_EnumInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumInfo_info300,
+		{ "Info300", "netdfs.dfs_EnumInfo.info300", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumInfo_info4,
+		{ "Info4", "netdfs.dfs_EnumInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumStruct_e,
+		{ "E", "netdfs.dfs_EnumStruct.e", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_EnumStruct_level,
+		{ "Level", "netdfs.dfs_EnumStruct.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Enum_bufsize,
+		{ "Bufsize", "netdfs.dfs_Enum.bufsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Enum_info,
+		{ "Info", "netdfs.dfs_Enum.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Enum_level,
+		{ "Level", "netdfs.dfs_Enum.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Enum_total,
 		{ "Total", "netdfs.dfs_Enum.total", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_AddFtRoot_dfs_config_dn,
-		{ "Dfs Config Dn", "netdfs.dfs_AddFtRoot.dfs_config_dn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_RemoveFtRoot_unknown,
-		{ "Unknown", "netdfs.dfs_RemoveFtRoot.unknown", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info1_path,
-		{ "Path", "netdfs.dfs_Info1.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_SetInfo_servername,
-		{ "Servername", "netdfs.dfs_SetInfo.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_FlushFtTable_rootshare,
+		{ "Rootshare", "netdfs.dfs_FlushFtTable.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_FlushFtTable_servername,
 		{ "Servername", "netdfs.dfs_FlushFtTable.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info103_flags,
-		{ "Flags", "netdfs.dfs_Info103.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_ROOT_SCALABILITY,
-		{ "Dfs Property Flag Root Scalability", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_ROOT_SCALABILITY", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_ROOT_SCALABILITY_tfs), ( 0x02 ), NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumInfo_info3,
-		{ "Info3", "netdfs.dfs_EnumInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_GetInfo_dfs_entry_path,
+		{ "Dfs Entry Path", "netdfs.dfs_GetInfo.dfs_entry_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_GetInfo_info,
+		{ "Info", "netdfs.dfs_GetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_GetInfo_level,
+		{ "Level", "netdfs.dfs_GetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_GetInfo_servername,
 		{ "Servername", "netdfs.dfs_GetInfo.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info4_guid,
-		{ "Guid", "netdfs.dfs_Info4.guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumArray4_s,
-		{ "S", "netdfs.dfs_EnumArray4.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Remove_servername,
-		{ "Servername", "netdfs.dfs_Remove.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_StorageInfo2_info,
-		{ "Info", "netdfs.dfs_StorageInfo2.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info4_comment,
-		{ "Comment", "netdfs.dfs_Info4.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_AddFtRoot_rootshare,
-		{ "Rootshare", "netdfs.dfs_AddFtRoot.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info3_state,
-		{ "State", "netdfs.dfs_Info3.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumArray1_s,
-		{ "S", "netdfs.dfs_EnumArray1.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info_info2,
-		{ "Info2", "netdfs.dfs_Info.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Enum_info,
-		{ "Info", "netdfs.dfs_Enum.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumStruct_e,
-		{ "E", "netdfs.dfs_EnumStruct.e", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info_info5,
-		{ "Info5", "netdfs.dfs_Info.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumArray300_count,
-		{ "Count", "netdfs.dfs_EnumArray300.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_ManagerInitialize_servername,
-		{ "Servername", "netdfs.dfs_ManagerInitialize.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_RemoveStdRoot_rootshare,
-		{ "Rootshare", "netdfs.dfs_RemoveStdRoot.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info_info100,
-		{ "Info100", "netdfs.dfs_Info.info100", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_GetInfo_sharename,
+		{ "Sharename", "netdfs.dfs_GetInfo.sharename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_GetManagerVersion_version,
+		{ "Version", "netdfs.dfs_GetManagerVersion.version", FT_UINT32, BASE_DEC, VALS(netdfs_dfs_ManagerVersion_vals), 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info100_comment,
 		{ "Comment", "netdfs.dfs_Info100.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_AddFtRoot_unknown1,
-		{ "Unknown1", "netdfs.dfs_AddFtRoot.unknown1", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_opnum,
-		{ "Operation", "netdfs.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumInfo_info300,
-		{ "Info300", "netdfs.dfs_EnumInfo.info300", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info6_flags,
-		{ "Flags", "netdfs.dfs_Info6.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info101_state,
+		{ "State", "netdfs.dfs_Info101.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info102_timeout,
 		{ "Timeout", "netdfs.dfs_Info102.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumInfo_info200,
-		{ "Info200", "netdfs.dfs_EnumInfo.info200", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info3_num_stores,
-		{ "Num Stores", "netdfs.dfs_Info3.num_stores", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_StorageInfo_state,
-		{ "State", "netdfs.dfs_StorageInfo.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumArray1_count,
-		{ "Count", "netdfs.dfs_EnumArray1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info_info3,
-		{ "Info3", "netdfs.dfs_Info.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_AddStdRootForced_comment,
-		{ "Comment", "netdfs.dfs_AddStdRootForced.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info103_flags,
+		{ "Flags", "netdfs.dfs_Info103.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info104_priority,
 		{ "Priority", "netdfs.dfs_Info104.priority", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_AddStdRoot_comment,
-		{ "Comment", "netdfs.dfs_AddStdRoot.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info3_comment,
-		{ "Comment", "netdfs.dfs_Info3.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_UnknownStruct_unknown1,
-		{ "Unknown1", "netdfs.dfs_UnknownStruct.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info6_timeout,
-		{ "Timeout", "netdfs.dfs_Info6.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info101_state,
-		{ "State", "netdfs.dfs_Info101.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_AddStdRootForced_servername,
-		{ "Servername", "netdfs.dfs_AddStdRootForced.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info2_path,
-		{ "Path", "netdfs.dfs_Info2.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info105_comment,
+		{ "Comment", "netdfs.dfs_Info105.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info105_property_flag_mask,
+		{ "Property Flag Mask", "netdfs.dfs_Info105.property_flag_mask", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info105_property_flags,
+		{ "Property Flags", "netdfs.dfs_Info105.property_flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info105_state,
+		{ "State", "netdfs.dfs_Info105.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info105_timeout,
 		{ "Timeout", "netdfs.dfs_Info105.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info106_priority,
+		{ "Priority", "netdfs.dfs_Info106.priority", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info106_state,
+		{ "State", "netdfs.dfs_Info106.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info1_path,
+		{ "Path", "netdfs.dfs_Info1.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info200_dom_root,
+		{ "Dom Root", "netdfs.dfs_Info200.dom_root", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info2_comment,
+		{ "Comment", "netdfs.dfs_Info2.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info2_num_stores,
+		{ "Num Stores", "netdfs.dfs_Info2.num_stores", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info2_path,
+		{ "Path", "netdfs.dfs_Info2.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info2_state,
+		{ "State", "netdfs.dfs_Info2.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info300_dom_root,
+		{ "Dom Root", "netdfs.dfs_Info300.dom_root", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info300_flavor,
+		{ "Flavor", "netdfs.dfs_Info300.flavor", FT_UINT1632, BASE_DEC, VALS(netdfs_dfs_VolumeFlavor_vals), 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info3_comment,
+		{ "Comment", "netdfs.dfs_Info3.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info3_num_stores,
+		{ "Num Stores", "netdfs.dfs_Info3.num_stores", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info3_path,
+		{ "Path", "netdfs.dfs_Info3.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info3_state,
+		{ "State", "netdfs.dfs_Info3.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info3_stores,
 		{ "Stores", "netdfs.dfs_Info3.stores", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_AddFtRoot_dns_servername,
-		{ "Dns Servername", "netdfs.dfs_AddFtRoot.dns_servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Enum_bufsize,
-		{ "Bufsize", "netdfs.dfs_Enum.bufsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_GetInfo_level,
-		{ "Level", "netdfs.dfs_GetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_werror,
-		{ "Windows Error", "netdfs.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_AddFtRoot_comment,
-		{ "Comment", "netdfs.dfs_AddFtRoot.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info_info102,
-		{ "Info102", "netdfs.dfs_Info.info102", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_TARGET_FAILBACK,
-		{ "Dfs Property Flag Target Failback", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_TARGET_FAILBACK", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_TARGET_FAILBACK_tfs), ( 0x08 ), NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumArray3_count,
-		{ "Count", "netdfs.dfs_EnumArray3.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_ManagerInitialize_flags,
-		{ "Flags", "netdfs.dfs_ManagerInitialize.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info4_comment,
+		{ "Comment", "netdfs.dfs_Info4.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info4_guid,
+		{ "Guid", "netdfs.dfs_Info4.guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info4_num_stores,
+		{ "Num Stores", "netdfs.dfs_Info4.num_stores", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info4_path,
+		{ "Path", "netdfs.dfs_Info4.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info4_state,
+		{ "State", "netdfs.dfs_Info4.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info4_stores,
 		{ "Stores", "netdfs.dfs_Info4.stores", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info4_timeout,
+		{ "Timeout", "netdfs.dfs_Info4.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info5_comment,
+		{ "Comment", "netdfs.dfs_Info5.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info5_flags,
+		{ "Flags", "netdfs.dfs_Info5.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info5_guid,
+		{ "Guid", "netdfs.dfs_Info5.guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info5_num_stores,
+		{ "Num Stores", "netdfs.dfs_Info5.num_stores", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info5_path,
+		{ "Path", "netdfs.dfs_Info5.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info5_pktsize,
+		{ "Pktsize", "netdfs.dfs_Info5.pktsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info5_state,
+		{ "State", "netdfs.dfs_Info5.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info5_timeout,
+		{ "Timeout", "netdfs.dfs_Info5.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info6_comment,
+		{ "Comment", "netdfs.dfs_Info6.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info6_entry_path,
+		{ "Entry Path", "netdfs.dfs_Info6.entry_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info6_flags,
+		{ "Flags", "netdfs.dfs_Info6.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info6_guid,
+		{ "Guid", "netdfs.dfs_Info6.guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info6_num_stores,
+		{ "Num Stores", "netdfs.dfs_Info6.num_stores", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info6_pktsize,
+		{ "Pktsize", "netdfs.dfs_Info6.pktsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info6_state,
+		{ "State", "netdfs.dfs_Info6.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info6_stores,
+		{ "Stores", "netdfs.dfs_Info6.stores", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info6_timeout,
+		{ "Timeout", "netdfs.dfs_Info6.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info7_generation_guid,
+		{ "Generation Guid", "netdfs.dfs_Info7.generation_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info_info0,
+		{ "Info0", "netdfs.dfs_Info.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info_info1,
+		{ "Info1", "netdfs.dfs_Info.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info_info100,
+		{ "Info100", "netdfs.dfs_Info.info100", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info_info101,
+		{ "Info101", "netdfs.dfs_Info.info101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info_info102,
+		{ "Info102", "netdfs.dfs_Info.info102", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info_info103,
+		{ "Info103", "netdfs.dfs_Info.info103", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info_info104,
 		{ "Info104", "netdfs.dfs_Info.info104", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_SetInfo_info,
-		{ "Info", "netdfs.dfs_SetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info_info105,
+		{ "Info105", "netdfs.dfs_Info.info105", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info_info106,
+		{ "Info106", "netdfs.dfs_Info.info106", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info_info2,
+		{ "Info2", "netdfs.dfs_Info.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info_info3,
+		{ "Info3", "netdfs.dfs_Info.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info_info4,
+		{ "Info4", "netdfs.dfs_Info.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info_info5,
+		{ "Info5", "netdfs.dfs_Info.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info_info6,
+		{ "Info6", "netdfs.dfs_Info.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Info_info7,
+		{ "Info7", "netdfs.dfs_Info.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_ManagerInitialize_flags,
+		{ "Flags", "netdfs.dfs_ManagerInitialize.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_ManagerInitialize_servername,
+		{ "Servername", "netdfs.dfs_ManagerInitialize.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_CLUSTER_ENABLED,
+		{ "Dfs Property Flag Cluster Enabled", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_CLUSTER_ENABLED", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_CLUSTER_ENABLED_tfs), ( 0x10 ), NULL, HFILL }},
+	{ &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_INSITE_REFERRALS,
+		{ "Dfs Property Flag Insite Referrals", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_INSITE_REFERRALS", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_INSITE_REFERRALS_tfs), ( 0x01 ), NULL, HFILL }},
+	{ &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_ROOT_SCALABILITY,
+		{ "Dfs Property Flag Root Scalability", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_ROOT_SCALABILITY", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_ROOT_SCALABILITY_tfs), ( 0x02 ), NULL, HFILL }},
+	{ &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_SITE_COSTING,
+		{ "Dfs Property Flag Site Costing", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_SITE_COSTING", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_SITE_COSTING_tfs), ( 0x04 ), NULL, HFILL }},
+	{ &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_TARGET_FAILBACK,
+		{ "Dfs Property Flag Target Failback", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_TARGET_FAILBACK", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_TARGET_FAILBACK_tfs), ( 0x08 ), NULL, HFILL }},
+	{ &hf_netdfs_dfs_RemoveFtRoot_dfsname,
+		{ "Dfsname", "netdfs.dfs_RemoveFtRoot.dfsname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_RemoveFtRoot_dns_servername,
 		{ "Dns Servername", "netdfs.dfs_RemoveFtRoot.dns_servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_RemoveFtRoot_flags,
+		{ "Flags", "netdfs.dfs_RemoveFtRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_RemoveFtRoot_rootshare,
+		{ "Rootshare", "netdfs.dfs_RemoveFtRoot.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_RemoveFtRoot_servername,
+		{ "Servername", "netdfs.dfs_RemoveFtRoot.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_RemoveFtRoot_unknown,
+		{ "Unknown", "netdfs.dfs_RemoveFtRoot.unknown", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_RemoveStdRoot_flags,
+		{ "Flags", "netdfs.dfs_RemoveStdRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_RemoveStdRoot_rootshare,
+		{ "Rootshare", "netdfs.dfs_RemoveStdRoot.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_RemoveStdRoot_servername,
+		{ "Servername", "netdfs.dfs_RemoveStdRoot.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Remove_dfs_entry_path,
+		{ "Dfs Entry Path", "netdfs.dfs_Remove.dfs_entry_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Remove_servername,
+		{ "Servername", "netdfs.dfs_Remove.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Remove_sharename,
+		{ "Sharename", "netdfs.dfs_Remove.sharename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_SetInfo_dfs_entry_path,
+		{ "Dfs Entry Path", "netdfs.dfs_SetInfo.dfs_entry_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_SetInfo_info,
+		{ "Info", "netdfs.dfs_SetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_SetInfo_level,
+		{ "Level", "netdfs.dfs_SetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_SetInfo_servername,
+		{ "Servername", "netdfs.dfs_SetInfo.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_SetInfo_sharename,
+		{ "Sharename", "netdfs.dfs_SetInfo.sharename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_StorageInfo2_info,
+		{ "Info", "netdfs.dfs_StorageInfo2.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_StorageInfo2_target_priority,
 		{ "Target Priority", "netdfs.dfs_StorageInfo2.target_priority", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Target_Priority_target_priority_rank,
-		{ "Target Priority Rank", "netdfs.dfs_Target_Priority.target_priority_rank", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info5_num_stores,
-		{ "Num Stores", "netdfs.dfs_Info5.num_stores", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_AddStdRoot_flags,
-		{ "Flags", "netdfs.dfs_AddStdRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_OK,
-		{ "Dfs Volume State Ok", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_OK", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_OK_tfs), ( 0x1 ), NULL, HFILL }},
+	{ &hf_netdfs_dfs_StorageInfo_server,
+		{ "Server", "netdfs.dfs_StorageInfo.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_StorageInfo_share,
+		{ "Share", "netdfs.dfs_StorageInfo.share", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_StorageInfo_state,
+		{ "State", "netdfs.dfs_StorageInfo.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ACTIVE,
+		{ "Dfs Storage State Active", "netdfs.dfs_StorageState.DFS_STORAGE_STATE_ACTIVE", FT_BOOLEAN, 32, TFS(&dfs_StorageState_DFS_STORAGE_STATE_ACTIVE_tfs), ( 4 ), NULL, HFILL }},
 	{ &hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_OFFLINE,
 		{ "Dfs Storage State Offline", "netdfs.dfs_StorageState.DFS_STORAGE_STATE_OFFLINE", FT_BOOLEAN, 32, TFS(&dfs_StorageState_DFS_STORAGE_STATE_OFFLINE_tfs), ( 1 ), NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumArray2_s,
-		{ "S", "netdfs.dfs_EnumArray2.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumEx_total,
-		{ "Total", "netdfs.dfs_EnumEx.total", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_AddStdRoot_servername,
-		{ "Servername", "netdfs.dfs_AddStdRoot.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumInfo_info2,
-		{ "Info2", "netdfs.dfs_EnumInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_INSITE_REFERRALS,
-		{ "Dfs Property Flag Insite Referrals", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_INSITE_REFERRALS", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_INSITE_REFERRALS_tfs), ( 0x01 ), NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info6_guid,
-		{ "Guid", "netdfs.dfs_Info6.guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info2_comment,
-		{ "Comment", "netdfs.dfs_Info2.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info2_state,
-		{ "State", "netdfs.dfs_Info2.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info300_flavor,
-		{ "Flavor", "netdfs.dfs_Info300.flavor", FT_UINT1632, BASE_DEC, VALS(netdfs_dfs_VolumeFlavor_vals), 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_RemoveFtRoot_flags,
-		{ "Flags", "netdfs.dfs_RemoveFtRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_EnumArray4_count,
-		{ "Count", "netdfs.dfs_EnumArray4.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info6_comment,
-		{ "Comment", "netdfs.dfs_Info6.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ONLINE,
+		{ "Dfs Storage State Online", "netdfs.dfs_StorageState.DFS_STORAGE_STATE_ONLINE", FT_BOOLEAN, 32, TFS(&dfs_StorageState_DFS_STORAGE_STATE_ONLINE_tfs), ( 2 ), NULL, HFILL }},
+	{ &hf_netdfs_dfs_Target_Priority_reserved,
+		{ "Reserved", "netdfs.dfs_Target_Priority.reserved", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Target_Priority_target_priority_class,
 		{ "Target Priority Class", "netdfs.dfs_Target_Priority.target_priority_class", FT_UINT32, BASE_DEC, VALS(netdfs_dfs_Target_PriorityClass_vals), 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Enum_level,
-		{ "Level", "netdfs.dfs_Enum.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info5_state,
-		{ "State", "netdfs.dfs_Info5.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_AddStdRoot_rootshare,
-		{ "Rootshare", "netdfs.dfs_AddStdRoot.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info4_num_stores,
-		{ "Num Stores", "netdfs.dfs_Info4.num_stores", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_RemoveFtRoot_servername,
-		{ "Servername", "netdfs.dfs_RemoveFtRoot.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_netdfs_dfs_Info105_property_flag_mask,
-		{ "Property Flag Mask", "netdfs.dfs_Info105.property_flag_mask", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_Target_Priority_target_priority_rank,
+		{ "Target Priority Rank", "netdfs.dfs_Target_Priority.target_priority_rank", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_UnknownStruct_unknown1,
+		{ "Unknown1", "netdfs.dfs_UnknownStruct.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_UnknownStruct_unknown2,
+		{ "Unknown2", "netdfs.dfs_UnknownStruct.unknown2", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_AD_BLOB,
+		{ "Dfs Volume State Ad Blob", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_AD_BLOB", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_AD_BLOB_tfs), ( DFS_VOLUME_FLAVOR_AD_BLOB ), NULL, HFILL }},
+	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_INCONSISTENT,
+		{ "Dfs Volume State Inconsistent", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_INCONSISTENT", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_INCONSISTENT_tfs), ( 0x2 ), NULL, HFILL }},
+	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_OFFLINE,
+		{ "Dfs Volume State Offline", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_OFFLINE", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_OFFLINE_tfs), ( 0x4 ), NULL, HFILL }},
+	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_OK,
+		{ "Dfs Volume State Ok", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_OK", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_OK_tfs), ( 0x1 ), NULL, HFILL }},
+	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_ONLINE,
+		{ "Dfs Volume State Online", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_ONLINE", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_ONLINE_tfs), ( 0x8 ), NULL, HFILL }},
+	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_STANDALONE,
+		{ "Dfs Volume State Standalone", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_STANDALONE", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_STANDALONE_tfs), ( DFS_VOLUME_FLAVOR_STANDALONE ), NULL, HFILL }},
+	{ &hf_netdfs_opnum,
+		{ "Operation", "netdfs.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_netdfs_werror,
+		{ "Windows Error", "netdfs.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, NULL, HFILL }},
 	};