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

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

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-dnsserver.c b/bin/default/librpc/gen_ndr/packet-dcerpc-dnsserver.c
index 5c6a92cccdb0732c2f5e944b98a699bd1f8199a4..a3ae1b2609d0017e33beb6afc4aa3971db3f969c 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-dnsserver.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-dnsserver.c
@@ -96,23 +96,22 @@ static gint hf_dnsserver_DNS_RPC_DP_FLAGS_DNS_DP_DOMAIN_DEFAULT = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fAutoCacheUpdate = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_fSecureSecondaries = -1;
 static gint hf_dnsserver_DNS_RPC_BUFFER_Buffer = -1;
-static gint hf_dnsserver_DNS_RPC_DATA_timestamp = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_fForwarderSlave = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_Buffer = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_DOTNET_Flags = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_Forwarders = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_dwReserved2 = -1;
 static gint hf_dnsserver_DnssrvEnumRecords_pszZone = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwMaxCacheTtl = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_fDsIntegrated = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwReserveArray = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_ZoneListW2K = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_pReserved2 = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_LIST_DOTNET_dwReserved0 = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_BUF_wContextLength = -1;
 static gint hf_dnsserver_DnssrvUpdateRecord_pszZone = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwLogLevel = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_AAAA_ipv6 = -1;
 static gint hf_dnsserver_DNS_RPC_DP_INFO_dwReplicaCount = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_DirectoryPartition = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPWSTR_WideString = -1;
 static gint hf_dnsserver_DnssrvOperation_dwContext = -1;
 static gint hf_dnsserver_DNS_RPC_FORWARDERS_LONGHORN_fRecurseAfterForwarding = -1;
 static gint hf_dnsserver_DnssrvQuery2_pwszServerName = -1;
@@ -125,19 +124,19 @@ static gint hf_dnsserver_DNS_RPC_ZONE_CHANGE_DP_pszDestPartition = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_NAME_PREFERENCE_wPreference = -1;
 static gint hf_dnsserver_DnssrvComplexOperation_pszZone = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwLogLevel = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_ZoneInfoW2K = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fAutoReverseZones = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_IpValidate = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fReserveArray = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_DirectoryPartitionEnum = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwForwardTimeout = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_AddrArray = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_SOA_dwRefresh = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_PTR_ptr = -1;
 static gint hf_dnsserver_DNS_RPC_ENUM_ZONES_FILTER_pszQueryString = -1;
 static gint hf_dnsserver_DNSSRV_STAT_HEADER_fClear = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_W2K_ZoneCreateW2K = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IP_VALIDATE_IpValidate = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwDsPollingInterval = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_wType = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_aipListenAddrs = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_TOMBSTONE_timestamp = -1;
 static gint hf_dnsserver_DnssrvComplexOperation_ppDataOut = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_pvReserved5 = -1;
 static gint hf_dnsserver_DnssrvQuery_pwszServerName = -1;
@@ -146,7 +145,6 @@ static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_pExtension1 = -1;
 static gint hf_dnsserver_DnssrvUpdateRecord2_dwClientVersion = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_cAddressAnswerLimit = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwDsForestVersion = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_Zone = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_dwDefaultNoRefreshInterval = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_dwReserved6 = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_fForwardDelegations = -1;
@@ -168,35 +166,33 @@ static gint hf_dnsserver_DnssrvComplexOperation2_pdwTypeOut = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwRpcProtocol = -1;
 static gint hf_dnsserver_DNS_RPC_DP_INFO_dwRpcStructureVersion = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_dwZoneType = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_ForwardersW2K = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_pszDpFqdn = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_Secondaries = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_LIST_DOTNET_dwRpcStructureVersion = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_fAllowUpdate = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_LONGHORN_dwRpcStructureVersion = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_aipScavengeServers = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_LIST_DirectoryPartitionList = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_fShutdown = -1;
 static gint hf_dnsserver_DNS_RPC_DP_INFO_dwReserved0 = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_aipForwarders = -1;
 static gint hf_dnsserver_DnssrvComplexOperation_pszOperation = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_String = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_dwReserved3 = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fStrictFileParsing = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_fUseDatabase = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_fPaused = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_ServerInfoW2K = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_SRV_srv = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_dwSerial = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_data = -1;
 static gint hf_dnsserver_DNS_RPC_AUTOCONFIGURE_dwAutoConfigFlags = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwDsPollingInterval = -1;
 static gint hf_dnsserver_DnssrvOperation_pwszServerName = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_W2K_ZoneInfoW2K = -1;
 static gint hf_dnsserver_DNS_RPC_NODE_wLength = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_LONGHORN_fSecureSecondaries = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fSecureResponses = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_LONGHORN_dwReserved0 = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_FLAGS_DNS_RPC_ZONE_AGING = -1;
 static gint hf_dnsserver_DnssrvQuery_pszZone = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_DatabaseW2K = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_pReserved3 = -1;
 static gint hf_dnsserver_DnssrvComplexOperation2_dwSettingFlags = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_fBindSecondaries = -1;
@@ -205,6 +201,7 @@ static gint hf_dnsserver_DNSSRV_STAT_Buffer = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_pvReserved6 = -1;
 static gint hf_dnsserver_DnssrvUpdateRecord2_pDeleteRecord = -1;
 static gint hf_dnsserver_DNS_ADDR_MaxSa = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_DOTNET_ForwardersDotNet = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_dwDsPollingInterval = -1;
 static gint hf_dnsserver_DnssrvQuery2_pszOperation = -1;
 static gint hf_dnsserver_DNS_ADDR_ARRAY_Family = -1;
@@ -215,11 +212,9 @@ static gint hf_dnsserver_DnssrvUpdateRecord2_pszZone = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_FLAGS_DNS_RPC_ZONE_SHUTDOWN = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fLooseWildcarding = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_fWriteAuthorityNs = -1;
-static gint hf_dnsserver_DNS_RPC_DATA_mx = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_W2K_Version = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_fUseNbstat = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_dwLastSuccessfulSoaCheck = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_ZoneInfo = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_SECONDARIES_LONGHORN_dwReserved0 = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_SECONDARIES_W2K_fSecureSecondaries = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_aipSecondaries = -1;
@@ -231,6 +226,7 @@ static gint hf_dnsserver_DnssrvComplexOperation2_pwszServerName = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_dwRefreshInterval = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwRecursionTimeout = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_SRV_nameTarget = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NAME_AND_PARAM_NameAndParam = -1;
 static gint hf_dnsserver_DNS_RPC_FORWARDERS_DOTNET_dwForwardTimeout = -1;
 static gint hf_dnsserver_DNS_RPC_ENLIST_DP_dwReserved0 = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_SECONDARIES_LONGHORN_fNotifyLevel = -1;
@@ -240,8 +236,8 @@ static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwRecursionTimeout = -1;
 static gint hf_dnsserver_IP4_ARRAY_AddrArray = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_SRV_wWeight = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_fUseNbstat = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENUM_ZONES_FILTER_EnumZonesFilter = -1;
 static gint hf_dnsserver_DNS_RPC_FORWARDERS_DOTNET_aipForwarders = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_ZoneCreateW2K = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_fNotifyLevel = -1;
 static gint hf_dnsserver_DNS_ADDR_ARRAY_MaxCount = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_dwReserved1 = -1;
@@ -249,7 +245,6 @@ static gint hf_dnsserver_DnssrvUpdateRecord_pwszServerName = -1;
 static gint hf_dnsserver_DnssrvOperation2_dwSettingFlags = -1;
 static gint hf_dnsserver_DNS_RPC_ENUM_ZONES_FILTER_dwFilter = -1;
 static gint hf_dnsserver_DnssrvEnumRecords_pszNodeName = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_Database = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_LONGHORN_fRecurseAfterForwarding = -1;
 static gint hf_dnsserver_DNS_RPC_DP_ENUM_dwFlags = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_pszZoneName = -1;
@@ -262,9 +257,7 @@ static gint hf_dnsserver_DNS_RPC_DP_FLAGS_DNS_DP_AUTOCREATED = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_fUseWins = -1;
 static gint hf_dnsserver_DnssrvEnumRecords_pszStartChild = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_pszAdmin = -1;
-static gint hf_dnsserver_DNS_RPC_DATA_txt = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwScavengingInterval = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_Utf8StringList = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_FLAGS_DNS_RPC_ZONE_UPDATE_UNSECURE = -1;
 static gint hf_dnsserver_DNS_RPC_DP_INFO_pszDpDn = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_fAllowUpdate = -1;
@@ -276,7 +269,6 @@ static gint hf_dnsserver_DNS_ADDR_ARRAY_Tag = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fRecurseAfterForwarding = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fWriteAuthorityNs = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_EXPORT_INFO_dwReserved0 = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_ServerInfo = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_DOTNET_pszDpFqdn = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_DOTNET_dwDpFlags = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_pszDataFile = -1;
@@ -286,17 +278,17 @@ static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fAutoCacheUpdate = -1;
 static gint hf_dnsserver_DnssrvEnumRecords2_pszNodeName = -1;
 static gint hf_dnsserver_DNS_RPC_ENLIST_DP_pszDpFqdn = -1;
 static gint hf_dnsserver_DnssrvUpdateRecord2_pszNodeName = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_DirectoryPartitionList = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_SecondariesW2K = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DWORD_Dword = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IPARRAY_IpArray = -1;
 static gint hf_dnsserver_DnssrvEnumRecords2_pwszServerName = -1;
 static gint hf_dnsserver_DnssrvEnumRecords_wRecordType = -1;
 static gint hf_dnsserver_DnssrvQuery2_dwSettingFlags = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_Forwarders = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_DATABASE_DOTNET_pszFileName = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_DOTNET_dwReserved0 = -1;
 static gint hf_dnsserver_DnssrvQuery_pszOperation = -1;
 static gint hf_dnsserver_DnssrvComplexOperation2_pDataIn = -1;
 static gint hf_dnsserver_DNS_ADDR_ARRAY_Reserved1 = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_NS_name = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_SRV_wPriority = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_aipServerAddrs = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fBindSecondaries = -1;
@@ -307,11 +299,11 @@ static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_dwRefreshInterval = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_fSecureSecondaries = -1;
 static gint hf_dnsserver_DNS_RPC_DP_REPLICA_pszReplicaDn = -1;
 static gint hf_dnsserver_DnssrvQuery_pdwTypeId = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_IpArray = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_FLAGS_DNS_RPC_ZONE_REVERSE = -1;
 static gint hf_dnsserver_DNS_RPC_IP_VALIDATE_pszContextName = -1;
 static gint hf_dnsserver_DNS_RPC_DP_ENUM_dwReserved0 = -1;
 static gint hf_dnsserver_DnssrvQuery2_ppData = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENLIST_DP_EnlistDirectoryPartition = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fShutdown = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_aipLogFilter = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_pvReserved3 = -1;
@@ -320,11 +312,13 @@ static gint hf_dnsserver_DnssrvEnumRecords2_wRecordType = -1;
 static gint hf_dnsserver_DnssrvOperation2_pData = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_pszDataFile = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_fAging = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MX_mx = -1;
 static gint hf_dnsserver_DnssrvEnumRecords2_pszZone = -1;
 static gint hf_dnsserver_DnssrvComplexOperation_dwTypeIn = -1;
 static gint hf_dnsserver_DNS_RPC_ENUM_ZONES_FILTER_dwReserved0 = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_DOTNET_dwRpcStructureVersion = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fDefaultAgingState = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_UTF8_STRING_LIST_Utf8StringList = -1;
 static gint hf_dnsserver_DnssrvComplexOperation_pwszServerName = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_pvReserved2 = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_dwReserved0 = -1;
@@ -333,9 +327,9 @@ static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_fShutdown = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_dwZoneType = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwReserveArray = -1;
 static gint hf_dnsserver_DnssrvEnumRecords2_dwClientVersion = -1;
+static gint hf_dnsserver_DNS_RPC_ZONE_CHANGE_DP_dwRpcStructureVersion = -1;
 static gint hf_dnsserver_DNS_RPC_NODE_dwFlags = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_NAME_PREFERENCE_nameExchange = -1;
-static gint hf_dnsserver_DNS_RPC_ZONE_CHANGE_DP_dwRpcStructureVersion = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_STRING_count = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_fSecureSecondaries = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_dwZoneType = -1;
@@ -354,28 +348,31 @@ static gint hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_NO_CHILDREN = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_dwDpFlags = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_pwszZoneDn = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_pszDsContainer = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_W2K_ForwardersW2K = -1;
 static gint hf_dnsserver_DNS_ADDR_ARRAY_MatchFlag = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwDefaultNoRefreshInterval = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CHANGE_DP_ZoneChangeDirectoryPartition = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwEventLogLevel = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_dwLastSuccessfulXfr = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_pszDomainName = -1;
 static gint hf_dnsserver_DnssrvEnumRecords2_pszStartChild = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_dwTimeout = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_aipSecondaries = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_DOTNET_ZoneInfoDotNet = -1;
 static gint hf_dnsserver_DNS_ADDR_ARRAY_WordReserved = -1;
 static gint hf_dnsserver_DNS_RPC_DP_FLAGS_DNS_DP_FOREST_DEFAULT = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_LONGHORN_pszZoneName = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_aipNotify = -1;
 static gint hf_dnsserver_DnssrvUpdateRecord_pDeleteRecord = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fBindSecondaries = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_ServerInfoDotNet = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_FLAGS_DNS_RPC_ZONE_DSINTEGRATED = -1;
 static gint hf_dnsserver_DNS_RPC_ENLIST_DP_dwOperation = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_SECONDARIES_W2K_aipNotify = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MG_name = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwLocalNetPriorityNetMask = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_dwFlags = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwRpcStructureVersion = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_ForwardersDotNet = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_DNAME_name = -1;
 static gint hf_dnsserver_DNS_RPC_DP_ENUM_pszDpFqdn = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_SOA_ZoneAdministratorEmail = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_FLAGS_DNS_RPC_ZONE_AUTOCREATED = -1;
@@ -390,25 +387,27 @@ static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_pExtension4 = -1;
 static gint hf_dnsserver_DNS_ADDR_ARRAY_Reserved2 = -1;
 static gint hf_dnsserver_DNS_RPC_AUTOCONFIGURE_dwRpcStructureVersion = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_dwReserved7 = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MD_name = -1;
 static gint hf_dnsserver_DNS_RPC_BUFFER_dwLength = -1;
-static gint hf_dnsserver_DNS_RPC_DATA_srv = -1;
 static gint hf_dnsserver_DnssrvComplexOperation2_pszZone = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_pszZoneName = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_Dword = -1;
 static gint hf_dnsserver_DnssrvEnumRecords2_fSelectFlag = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_pszDomainDirectoryPartition = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_Secondaries = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_fSecureSecondaries = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_aipLogFilter = -1;
 static gint hf_dnsserver_DNS_EVENT_LOG_TYPES_DNS_EVENT_LOG_ERROR_TYPE = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_dwReserved1 = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_W2K_ZoneW2K = -1;
 static gint hf_dnsserver_DnssrvEnumRecords2_dwSettingFlags = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwReserved0 = -1;
 static gint hf_dnsserver_DNS_ADDR_ARRAY_Flags = -1;
-static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwDsForestVersion = -1;
 static gint hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_AUTHORITY_DATA = -1;
+static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwDsForestVersion = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fPaused = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_pwszLogFilePath = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fStrictFileParsing = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_STATS_Stats = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_pszForestDirectoryPartition = -1;
 static gint hf_dnsserver_DNS_RPC_DP_LIST_dwDpCount = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_dwDebugLevel = -1;
@@ -418,7 +417,6 @@ static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_dwReserved0 = -1;
 static gint hf_dnsserver_DNSSRV_STAT_HEADER_fReserved = -1;
 static gint hf_dnsserver_DnssrvEnumRecords2_pdwBufferLength = -1;
 static gint hf_dnsserver_DNS_RPC_RECORDS_wLength = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_ZoneList = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_DATABASE_W2K_fDsIntegrated = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_pExtension5 = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwLastScavengeTime = -1;
@@ -426,9 +424,11 @@ static gint hf_dnsserver_DNS_RPC_ZONE_LIST_DOTNET_dwZoneCount = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_SECONDARIES_DOTNET_dwReserved0 = -1;
 static gint hf_dnsserver_DnssrvUpdateRecord2_pAddRecord = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_BUF_rec = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_DOTNET_ZoneCreateDotNet = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_dwLastXfrResult = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fSecureSecondaries = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_fBootMethod = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_W2K_ZoneListW2K = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_DATABASE_DOTNET_dwRpcStructureVersion = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_DOTNET_Version = -1;
 static gint hf_dnsserver_DnssrvOperation2_dwClientVersion = -1;
@@ -436,6 +436,7 @@ static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwDsDomainVersion = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_SOA_NamePrimaryServer = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_aipScavengeServers = -1;
 static gint hf_dnsserver_DNS_RPC_FORWARDERS_W2K_dwForwardTimeout = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPSTR_String = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_dwNameCheckFlag = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_pExtensions = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_fAllowUpdate = -1;
@@ -446,25 +447,27 @@ static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_aipSecondaries = -1;
 static gint hf_dnsserver_DNS_RPC_DP_LIST_dwReserved0 = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_dwLastSuccessfulXfr = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_SOA_dwMinimumTtl = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_HINFO_hinfo = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_SECONDARIES_LONGHORN_fSecureSecondaries = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MR_name = -1;
 static gint hf_dnsserver_DnssrvUpdateRecord_pszNodeName = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_pszZoneName = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_aipSecondaries = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_pwszLogFilePath = -1;
 static gint hf_dnsserver_DNS_RPC_FORWARDERS_DOTNET_dwRpcStructureVersion = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fBootMethod = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_AUTOCONFIGURE_AutoConfigure = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwRpcProtocol = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_DOTNET_SecondariesDotNet = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CHANGE_DP_dwReserved0 = -1;
 static gint hf_dnsserver_DnssrvComplexOperation_pdwTypeOut = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwNameCheckFlag = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_dwDefaultRefreshInterval = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_aipListenAddrs = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_EnumZonesFilter = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_ZoneW2K = -1;
 static gint hf_dnsserver_DNS_RPC_DP_INFO_dwFlags = -1;
 static gint hf_dnsserver_DNS_RPC_NODE_dwChildCount = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_pszDpFqdn = -1;
-static gint hf_dnsserver_DNS_RPC_DATA_ipv4 = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_ENUM_DirectoryPartitionEnum = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_SECONDARIES_W2K_aipSecondaries = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_pvReserved1 = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_fQueuedForBackgroundLoad = -1;
@@ -474,6 +477,7 @@ static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_aipLocalMasters = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_LONGHORN_dwTimeout = -1;
 static gint hf_dnsserver_DNS_RPC_AUTOCONFIGURE_pszNewDomainName = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwDefaultRefreshInterval = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_Database = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_fDsIntegrated = -1;
 static gint hf_dnsserver_DnssrvEnumRecords2_pBuffer = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_SECONDARIES_DOTNET_fSecureSecondaries = -1;
@@ -484,9 +488,10 @@ static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_aipServerAddrs = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_fRoundRobin = -1;
 static gint hf_dnsserver_DNS_RPC_NAME_len = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_pszServerName = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_Null = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NULL_Null = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_pvReserved4 = -1;
 static gint hf_dnsserver_DnssrvEnumRecords_pdwBufferLength = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_W2K_SecondariesW2K = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwLogFileMaxSize = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_cAddressAnswerLimit = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_fAutoReverseZones = -1;
@@ -501,7 +506,9 @@ static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_pszDomainName = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwLastScavengeTime = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_pvReserved1 = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_dwNoRefreshInterval = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_ZoneInfo = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fForwardDelegations = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_W2K_DatabaseW2K = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_dwReserved = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_LONGHORN_aipMasters = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fLooseWildcarding = -1;
@@ -521,11 +528,11 @@ static gint hf_dnsserver_DNS_RPC_ZONE_LIST_W2K_dwZoneCount = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_fPaused = -1;
 static gint hf_dnsserver_DNS_EXTENSION_extension = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_aipMasters = -1;
-static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_dwScavengingInterval = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_DOTNET_ServerInfoDotNet = -1;
 static gint hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_GLUE_DATA = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_NameAndParam = -1;
+static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_dwScavengingInterval = -1;
 static gint hf_dnsserver_DnssrvComplexOperation_pDataIn = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_ZoneExport = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_A_ipv4 = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_aipForwarders = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fAging = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_pvReserved8 = -1;
@@ -542,23 +549,25 @@ static gint hf_dnsserver_DNS_RPC_RECORD_SOA_dwRetry = -1;
 static gint hf_dnsserver_DNS_ADDR_DnsAddrUserDword = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwScavengingInterval = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_aipForwarders = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MB_name = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_fStrictFileParsing = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_W2K_ZoneType = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_aipServerAddrs = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwRecursionRetry = -1;
-static gint hf_dnsserver_DNS_RPC_DATA_hinfo = -1;
 static gint hf_dnsserver_DNS_RPC_DP_LIST_dwRpcStructureVersion = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_pszDataFile = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_dwReserved0 = -1;
 static gint hf_dnsserver_DnssrvOperation_pszOperation = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_SOA_soa = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_fRecurseAfterForwarding = -1;
 static gint hf_dnsserver_DNS_RPC_IP_VALIDATE_dwRpcStructureVersion = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwDefaultNoRefreshInterval = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fNoRecursion = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_fAdminConfigured = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_LONGHORN_fLoadExisting = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_WideString = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MF_name = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_fLoadExisting = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ADDRARRAY_AddrArray = -1;
 static gint hf_dnsserver_DNSSRV_STAT_HEADER_StatId = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fRoundRobin = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_dwRefreshInterval = -1;
@@ -575,12 +584,10 @@ static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_pszAdmin = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_dwLogLevel = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_pszDpFqdn = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_dwFlags = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_Stats = -1;
 static gint hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_ONLY_CHILDREN = -1;
 static gint hf_dnsserver_DNS_RPC_DP_INFO_dwReserved = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_fLocalNetPriority = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fReverse = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_ZoneCreate = -1;
 static gint hf_dnsserver_DNS_EVENT_LOG_TYPES_DNS_EVENT_LOG_WARNING_TYPE = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_SOA_dwSerialNo = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_dwRpcStructureVersion = -1;
@@ -600,22 +607,19 @@ static gint hf_dnsserver_DnssrvEnumRecords_pszFilterStart = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_pszZoneName = -1;
 static gint hf_dnsserver_DnssrvUpdateRecord2_pwszServerName = -1;
 static gint hf_dnsserver_DNS_ADDR_ARRAY_AddrCount = -1;
-static gint hf_dnsserver_DNS_RPC_DATA_name = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_LIST_DOTNET_ZoneArray = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_fAllowUpdate = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_EXPORT_ZoneExport = -1;
 static gint hf_dnsserver_DNS_RPC_FORWARDERS_DOTNET_fRecurseAfterForwarding = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_FLAGS_DNS_RPC_ZONE_READONLY = -1;
 static gint hf_dnsserver_DnssrvOperation2_dwContext = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_AutoConfigure = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_fNoRecursion = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_SECONDARIES_LONGHORN_dwRpcStructureVersion = -1;
-static gint hf_dnsserver_DNS_RPC_DATA_ipv6 = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_DATABASE_DOTNET_fDsIntegrated = -1;
 static gint hf_dnsserver_DNS_RPC_DP_ENUM_dwZoneCount = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fReserveArray = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_pwszZoneDn = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_dwForwarderTimeout = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_ZoneCreateDotNet = -1;
 static gint hf_dnsserver_DNS_RPC_DP_INFO_dwZoneCount = -1;
 static gint hf_dnsserver_DNS_RPC_RECORDS_ARRAY_rec = -1;
 static gint hf_dnsserver_DNS_RPC_NAME_str = -1;
@@ -635,7 +639,9 @@ static gint hf_dnsserver_DnssrvOperation2_pwszServerName = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fAutoCreated = -1;
 static gint hf_dnsserver_DnssrvEnumRecords_pBuffer_ = -1;
 static gint hf_dnsserver_DNS_RPC_RECORDS_ARRAY_count = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_ServerInfo = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fAutoReverseZones = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_CNAME_name = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_dwReserveArray = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwMaxCacheTtl = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fUseWins = -1;
@@ -649,8 +655,8 @@ static gint hf_dnsserver_DNS_RPC_ZONE_EXPORT_INFO_pszZoneExportFile = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_fAging = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_aipMasters = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_DATABASE_W2K_pszFileName = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_INFO_DirectoryPartition = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_dwForwarderTimeout = -1;
-static gint hf_dnsserver_DNS_RPC_DATA_soa = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fRoundRobin = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fAllowUpdate = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwVersion = -1;
@@ -663,25 +669,24 @@ static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_pszDsContainer = -1;
 static gint hf_dnsserver_DnssrvOperation2_pszZone = -1;
 static gint hf_dnsserver_DnssrvEnumRecords_pszFilterStop = -1;
 static gint hf_dnsserver_DNS_RPC_ENUM_ZONES_FILTER_dwRpcStructureVersion = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_BUFFER_Buffer = -1;
 static gint hf_dnsserver_DnssrvEnumRecords_pBuffer = -1;
 static gint hf_dnsserver_DNS_RPC_IP_VALIDATE_aipValidateAddrs = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_ZoneChangeDirectoryPartition = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fReadOnlyDC = -1;
 static gint hf_dnsserver_IP4_ARRAY_AddrCount = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_dwRpcProtocol = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_dwFlags = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fUseNbstat = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_ZoneList = -1;
 static gint hf_dnsserver_DNS_RPC_IP_VALIDATE_dwContext = -1;
 static gint hf_dnsserver_werror = -1;
 static gint hf_dnsserver_DnssrvQuery2_pdwTypeId = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_EnlistDirectoryPartition = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_fReverse = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fNotifyLevel = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_pReserved1 = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_LONGHORN_dwZoneType = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_LONGHORN_dwReserved = -1;
 static gint hf_dnsserver_DNS_EVENT_LOG_TYPES_DNS_EVENT_LOG_INFORMATION_TYPE = -1;
-static gint hf_dnsserver_DNS_RPC_DATA_ptr = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fUseDatabase = -1;
 static gint hf_dnsserver_DNS_RPC_FORWARDERS_DOTNET_dwReserved0 = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_fAutoCreated = -1;
@@ -696,6 +701,7 @@ static gint hf_dnsserver_DnssrvOperation_dwTypeId = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_LONGHORN_fAllowUpdate = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_fUseWins = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_pvReserved7 = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_TXT_txt = -1;
 static gint hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_ROOT_HINT_DATA = -1;
 static gint hf_dnsserver_DNS_RPC_ENLIST_DP_dwRpcStructureVersion = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwReserved0 = -1;
@@ -705,12 +711,12 @@ static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_dwNoRefreshInterval = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwDsDsaVersion = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fForwarderSlave = -1;
 static gint hf_dnsserver_DnssrvComplexOperation2_pszOperation = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_ZoneCreate = -1;
 static gint hf_dnsserver_DnssrvEnumRecords2_pBuffer_ = -1;
 static gint hf_dnsserver_DNS_RPC_FORWARDERS_W2K_aipForwarders = -1;
 static gint hf_dnsserver_DNS_RPC_NODE_dnsNodeName = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fLocalNetPriority = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_data_ = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_SecondariesDotNet = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_pszDomainDirectoryPartition = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwDefaultRefreshInterval = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_dwReserved8 = -1;
@@ -725,18 +731,19 @@ static gint hf_dnsserver_DNS_RPC_DP_INFO_pszCrDn = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fForwardDelegations = -1;
 static gint hf_dnsserver_DNS_RPC_RECORDS_wRecordCount = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwNameCheckFlag = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_Zone = -1;
 static gint hf_dnsserver_DNS_RPC_RECORD_wDataLength = -1;
 static gint hf_dnsserver_DnssrvEnumRecords2_pszFilterStart = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_dwReserved4 = -1;
 static gint hf_dnsserver_opnum = -1;
 static gint hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_pszForestDirectoryPartition = -1;
 static gint hf_dnsserver_DNS_RPC_DP_FLAGS_DNS_DP_DELETED = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_W2K_ServerInfoW2K = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_aipNotify = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_fAutoCreated = -1;
 static gint hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_dwLastXfrAttempt = -1;
 static gint hf_dnsserver_DNS_RPC_AUTOCONFIGURE_dwReserved1 = -1;
 static gint hf_dnsserver_DNS_RPC_UTF8_STRING_LIST_dwCount = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_ZoneInfoDotNet = -1;
 
 static gint proto_dcerpc_dnsserver = -1;
 /* Version information */
@@ -795,23 +802,23 @@ static int dnsserver_dissect_element_DNS_RPC_RECORD_SRV_wPriority(tvbuff_t *tvb
 static int dnsserver_dissect_element_DNS_RPC_RECORD_SRV_wWeight(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dnsserver_dissect_element_DNS_RPC_RECORD_SRV_wPort(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dnsserver_dissect_element_DNS_RPC_RECORD_SRV_nameTarget(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNS_RPC_DATA_timestamp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNS_RPC_DATA_ipv4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNS_RPC_DATA_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNS_RPC_DATA_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNS_RPC_DATA_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNS_RPC_DATA_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNS_RPC_DATA_soa(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNS_RPC_DATA_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNS_RPC_DATA_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNS_RPC_DATA_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNS_RPC_DATA_ptr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNS_RPC_DATA_hinfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNS_RPC_DATA_mx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNS_RPC_DATA_txt(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNS_RPC_DATA_ipv6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNS_RPC_DATA_srv(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNS_RPC_DATA_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_TOMBSTONE_timestamp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_A_ipv4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_NS_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MD_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MF_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_CNAME_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_SOA_soa(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MB_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MG_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MR_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_PTR_ptr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_HINFO_hinfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MX_mx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_TXT_txt(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_AAAA_ipv6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_SRV_srv(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_DNAME_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dnsserver_dissect_element_DNS_RPC_RECORD_wDataLength(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dnsserver_dissect_element_DNS_RPC_RECORD_wType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *wType);
 static int dnsserver_dissect_element_DNS_RPC_RECORD_dwFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1639,85 +1646,85 @@ const value_string dnsserver_DNS_RPC_TYPEID_vals[] = {
        { DNSSRV_TYPEID_UNICODE_STRING_LIST, "DNSSRV_TYPEID_UNICODE_STRING_LIST" },
 { 0, NULL }
 };
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_Null(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_Null_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_Dword(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_String(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_String_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_WideString(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_WideString_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_IpArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_IpArray_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_Buffer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_Buffer_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfoW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfoW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_Stats(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_Stats_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ForwardersW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ForwardersW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfoW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfoW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_SecondariesW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_SecondariesW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_DatabaseW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_DatabaseW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreateW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreateW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_NameAndParam(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_NameAndParam_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneListW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneListW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfoDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfoDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ForwardersDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ForwardersDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_Zone(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_Zone_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfoDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfoDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_SecondariesDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_SecondariesDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_Database(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_Database_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreateDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreateDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneList(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneList_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneExport(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneExport_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartition(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartition_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartitionEnum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartitionEnum_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartitionList(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartitionList_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_EnlistDirectoryPartition(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_EnlistDirectoryPartition_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneChangeDirectoryPartition(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneChangeDirectoryPartition_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_EnumZonesFilter(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_EnumZonesFilter_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_AddrArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_AddrArray_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfo_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreate(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreate_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_Forwarders(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_Forwarders_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_Secondaries(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_Secondaries_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_IpValidate(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_IpValidate_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfo_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_AutoConfigure(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_AutoConfigure_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_Utf8StringList(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dnsserver_dissect_element_DNSSRV_RPC_UNION_Utf8StringList_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NULL_Null(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NULL_Null_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DWORD_Dword(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPSTR_String(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPSTR_String_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPWSTR_WideString(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPWSTR_WideString_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IPARRAY_IpArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IPARRAY_IpArray_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_BUFFER_Buffer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_BUFFER_Buffer_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_W2K_ServerInfoW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_W2K_ServerInfoW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_STATS_Stats(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_STATS_Stats_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_W2K_ForwardersW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_W2K_ForwardersW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_W2K_ZoneW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_W2K_ZoneW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_W2K_ZoneInfoW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_W2K_ZoneInfoW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_W2K_SecondariesW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_W2K_SecondariesW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_W2K_DatabaseW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_W2K_DatabaseW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_W2K_ZoneCreateW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_W2K_ZoneCreateW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NAME_AND_PARAM_NameAndParam(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NAME_AND_PARAM_NameAndParam_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_W2K_ZoneListW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_W2K_ZoneListW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_DOTNET_ServerInfoDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_DOTNET_ServerInfoDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_DOTNET_ForwardersDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_DOTNET_ForwardersDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_Zone(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_Zone_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_DOTNET_ZoneInfoDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_DOTNET_ZoneInfoDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_DOTNET_SecondariesDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_DOTNET_SecondariesDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_Database(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_Database_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_DOTNET_ZoneCreateDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_DOTNET_ZoneCreateDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_ZoneList(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_ZoneList_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_EXPORT_ZoneExport(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_EXPORT_ZoneExport_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_INFO_DirectoryPartition(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_INFO_DirectoryPartition_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_ENUM_DirectoryPartitionEnum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_ENUM_DirectoryPartitionEnum_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_LIST_DirectoryPartitionList(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_LIST_DirectoryPartitionList_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENLIST_DP_EnlistDirectoryPartition(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENLIST_DP_EnlistDirectoryPartition_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CHANGE_DP_ZoneChangeDirectoryPartition(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CHANGE_DP_ZoneChangeDirectoryPartition_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENUM_ZONES_FILTER_EnumZonesFilter(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENUM_ZONES_FILTER_EnumZonesFilter_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ADDRARRAY_AddrArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ADDRARRAY_AddrArray_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_ServerInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_ServerInfo_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_ZoneCreate(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_ZoneCreate_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_Forwarders(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_Forwarders_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_Secondaries(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_Secondaries_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IP_VALIDATE_IpValidate(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IP_VALIDATE_IpValidate_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_ZoneInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_ZoneInfo_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_AUTOCONFIGURE_AutoConfigure(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_AUTOCONFIGURE_AutoConfigure_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_UTF8_STRING_LIST_Utf8StringList(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_UTF8_STRING_LIST_Utf8StringList_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dnsserver_dissect_element_DNS_RPC_RECORDS_wLength(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dnsserver_dissect_element_DNS_RPC_RECORDS_wRecordCount(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dnsserver_dissect_element_DNS_RPC_RECORDS_dwFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -2562,137 +2569,137 @@ dnsserver_dissect_struct_DNS_RPC_RECORD_SRV(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-dnsserver_dissect_element_DNS_RPC_DATA_timestamp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_TOMBSTONE_timestamp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep, hf_dnsserver_DNS_RPC_DATA_timestamp);
+       offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep, hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_TOMBSTONE_timestamp);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNS_RPC_DATA_ipv4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_A_ipv4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_ipv4address(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_ipv4,0);
+       offset = dnsserver_dissect_struct_ipv4address(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_A_ipv4,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNS_RPC_DATA_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_NS_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_name,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_NS_name,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNS_RPC_DATA_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MD_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_name,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MD_name,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNS_RPC_DATA_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MF_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_name,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MF_name,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNS_RPC_DATA_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_CNAME_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_name,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_CNAME_name,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNS_RPC_DATA_soa(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_SOA_soa(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_RECORD_SOA(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_soa,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_RECORD_SOA(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_SOA_soa,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNS_RPC_DATA_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MB_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_name,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MB_name,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNS_RPC_DATA_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MG_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_name,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MG_name,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNS_RPC_DATA_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MR_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_name,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MR_name,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNS_RPC_DATA_ptr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_PTR_ptr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_ptr,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_PTR_ptr,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNS_RPC_DATA_hinfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_HINFO_hinfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_hinfo,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_HINFO_hinfo,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNS_RPC_DATA_mx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MX_mx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_RECORD_NAME_PREFERENCE(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_mx,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_RECORD_NAME_PREFERENCE(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MX_mx,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNS_RPC_DATA_txt(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_TXT_txt(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_RECORD_STRING(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_txt,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_RECORD_STRING(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_TXT_txt,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNS_RPC_DATA_ipv6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_AAAA_ipv6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_ipv6address(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_ipv6,0);
+       offset = dnsserver_dissect_struct_ipv6address(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_AAAA_ipv6,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNS_RPC_DATA_srv(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_SRV_srv(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_RECORD_SRV(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_srv,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_RECORD_SRV(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_SRV_srv,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNS_RPC_DATA_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_DNAME_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_name,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_DNAME_name,0);
 
        return offset;
 }
@@ -2713,71 +2720,71 @@ dnsserver_dissect_DNS_RPC_DATA(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 
        switch(level) {
                case DNS_TYPE_TOMBSTONE:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_timestamp(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_TOMBSTONE_timestamp(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_A:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_ipv4(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_A_ipv4(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_NS:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_name(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_NS_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_MD:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_name(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MD_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_MF:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_name(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MF_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_CNAME:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_name(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_CNAME_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_SOA:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_soa(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_SOA_soa(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_MB:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_name(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MB_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_MG:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_name(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MG_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_MR:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_name(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MR_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_PTR:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_ptr(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_PTR_ptr(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_HINFO:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_hinfo(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_HINFO_hinfo(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_MX:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_mx(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MX_mx(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_TXT:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_txt(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_TXT_txt(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_AAAA:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_ipv6(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_AAAA_ipv6(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_SRV:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_srv(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_SRV_srv(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_DNAME:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_name(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_DNAME_name(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -11118,639 +11125,639 @@ dnsserver_dissect_enum_DNS_RPC_TYPEID(tvbuff_t *tvb _U_, int offset _U_, packet_
 /* IDL: } */
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_Null(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NULL_Null(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_Null_, NDR_POINTER_UNIQUE, "Pointer to Null (uint8)",hf_dnsserver_DNSSRV_RPC_UNION_Null);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NULL_Null_, NDR_POINTER_UNIQUE, "Pointer to Null (uint8)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NULL_Null);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_Null_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NULL_Null_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, drep, hf_dnsserver_DNSSRV_RPC_UNION_Null, 0);
+       offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, drep, hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NULL_Null, 0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_Dword(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DWORD_Dword(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_dnsserver_DNSSRV_RPC_UNION_Dword, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DWORD_Dword, 0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_String(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPSTR_String(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_String_, NDR_POINTER_UNIQUE, "Pointer to String (uint8)",hf_dnsserver_DNSSRV_RPC_UNION_String);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPSTR_String_, NDR_POINTER_UNIQUE, "Pointer to String (uint8)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPSTR_String);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_String_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPSTR_String_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        char *data;
 
-       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint8), hf_dnsserver_DNSSRV_RPC_UNION_String, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint8), hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPSTR_String, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_WideString(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPWSTR_WideString(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_WideString_, NDR_POINTER_UNIQUE, "Pointer to Widestring (uint16)",hf_dnsserver_DNSSRV_RPC_UNION_WideString);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPWSTR_WideString_, NDR_POINTER_UNIQUE, "Pointer to Widestring (uint16)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPWSTR_WideString);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_WideString_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPWSTR_WideString_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        char *data;
 
-       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_dnsserver_DNSSRV_RPC_UNION_WideString, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPWSTR_WideString, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_IpArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IPARRAY_IpArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_IpArray_, NDR_POINTER_UNIQUE, "Pointer to Iparray (IP4_ARRAY)",hf_dnsserver_DNSSRV_RPC_UNION_IpArray);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IPARRAY_IpArray_, NDR_POINTER_UNIQUE, "Pointer to Iparray (IP4_ARRAY)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IPARRAY_IpArray);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_IpArray_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IPARRAY_IpArray_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_IP4_ARRAY(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_IpArray,0);
+       offset = dnsserver_dissect_struct_IP4_ARRAY(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IPARRAY_IpArray,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_Buffer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_BUFFER_Buffer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_Buffer_, NDR_POINTER_UNIQUE, "Pointer to Buffer (DNS_RPC_BUFFER)",hf_dnsserver_DNSSRV_RPC_UNION_Buffer);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_BUFFER_Buffer_, NDR_POINTER_UNIQUE, "Pointer to Buffer (DNS_RPC_BUFFER)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_BUFFER_Buffer);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_Buffer_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_BUFFER_Buffer_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_BUFFER(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_Buffer,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_BUFFER(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_BUFFER_Buffer,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfoW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_W2K_ServerInfoW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfoW2K_, NDR_POINTER_UNIQUE, "Pointer to Serverinfow2k (DNS_RPC_SERVER_INFO_W2K)",hf_dnsserver_DNSSRV_RPC_UNION_ServerInfoW2K);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_W2K_ServerInfoW2K_, NDR_POINTER_UNIQUE, "Pointer to Serverinfow2k (DNS_RPC_SERVER_INFO_W2K)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_W2K_ServerInfoW2K);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfoW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_W2K_ServerInfoW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_SERVER_INFO_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ServerInfoW2K,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_SERVER_INFO_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_W2K_ServerInfoW2K,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_Stats(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_STATS_Stats(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_Stats_, NDR_POINTER_UNIQUE, "Pointer to Stats (DNSSRV_STAT)",hf_dnsserver_DNSSRV_RPC_UNION_Stats);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_STATS_Stats_, NDR_POINTER_UNIQUE, "Pointer to Stats (DNSSRV_STAT)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_STATS_Stats);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_Stats_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_STATS_Stats_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNSSRV_STAT(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_Stats,0);
+       offset = dnsserver_dissect_struct_DNSSRV_STAT(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_STATS_Stats,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ForwardersW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_W2K_ForwardersW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_ForwardersW2K_, NDR_POINTER_UNIQUE, "Pointer to Forwardersw2k (DNS_RPC_FORWARDERS_W2K)",hf_dnsserver_DNSSRV_RPC_UNION_ForwardersW2K);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_W2K_ForwardersW2K_, NDR_POINTER_UNIQUE, "Pointer to Forwardersw2k (DNS_RPC_FORWARDERS_W2K)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_W2K_ForwardersW2K);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ForwardersW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_W2K_ForwardersW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_FORWARDERS_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ForwardersW2K,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_FORWARDERS_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_W2K_ForwardersW2K,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_W2K_ZoneW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneW2K_, NDR_POINTER_UNIQUE, "Pointer to Zonew2k (DNS_RPC_ZONE_W2K)",hf_dnsserver_DNSSRV_RPC_UNION_ZoneW2K);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_W2K_ZoneW2K_, NDR_POINTER_UNIQUE, "Pointer to Zonew2k (DNS_RPC_ZONE_W2K)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_W2K_ZoneW2K);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_W2K_ZoneW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneW2K,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_W2K_ZoneW2K,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfoW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_W2K_ZoneInfoW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfoW2K_, NDR_POINTER_UNIQUE, "Pointer to Zoneinfow2k (DNS_RPC_ZONE_INFO_W2K)",hf_dnsserver_DNSSRV_RPC_UNION_ZoneInfoW2K);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_W2K_ZoneInfoW2K_, NDR_POINTER_UNIQUE, "Pointer to Zoneinfow2k (DNS_RPC_ZONE_INFO_W2K)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_W2K_ZoneInfoW2K);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfoW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_W2K_ZoneInfoW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_INFO_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneInfoW2K,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_INFO_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_W2K_ZoneInfoW2K,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_SecondariesW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_W2K_SecondariesW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_SecondariesW2K_, NDR_POINTER_UNIQUE, "Pointer to Secondariesw2k (DNS_RPC_ZONE_SECONDARIES_W2K)",hf_dnsserver_DNSSRV_RPC_UNION_SecondariesW2K);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_W2K_SecondariesW2K_, NDR_POINTER_UNIQUE, "Pointer to Secondariesw2k (DNS_RPC_ZONE_SECONDARIES_W2K)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_W2K_SecondariesW2K);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_SecondariesW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_W2K_SecondariesW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_SECONDARIES_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_SecondariesW2K,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_SECONDARIES_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_W2K_SecondariesW2K,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_DatabaseW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_W2K_DatabaseW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_DatabaseW2K_, NDR_POINTER_UNIQUE, "Pointer to Databasew2k (DNS_RPC_ZONE_DATABASE_W2K)",hf_dnsserver_DNSSRV_RPC_UNION_DatabaseW2K);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_W2K_DatabaseW2K_, NDR_POINTER_UNIQUE, "Pointer to Databasew2k (DNS_RPC_ZONE_DATABASE_W2K)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_W2K_DatabaseW2K);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_DatabaseW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_W2K_DatabaseW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_DATABASE_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_DatabaseW2K,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_DATABASE_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_W2K_DatabaseW2K,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreateW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_W2K_ZoneCreateW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreateW2K_, NDR_POINTER_UNIQUE, "Pointer to Zonecreatew2k (DNS_RPC_ZONE_CREATE_INFO_W2K)",hf_dnsserver_DNSSRV_RPC_UNION_ZoneCreateW2K);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_W2K_ZoneCreateW2K_, NDR_POINTER_UNIQUE, "Pointer to Zonecreatew2k (DNS_RPC_ZONE_CREATE_INFO_W2K)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_W2K_ZoneCreateW2K);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreateW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_W2K_ZoneCreateW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_CREATE_INFO_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneCreateW2K,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_CREATE_INFO_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_W2K_ZoneCreateW2K,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_NameAndParam(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NAME_AND_PARAM_NameAndParam(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_NameAndParam_, NDR_POINTER_UNIQUE, "Pointer to Nameandparam (DNS_RPC_NAME_AND_PARAM)",hf_dnsserver_DNSSRV_RPC_UNION_NameAndParam);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NAME_AND_PARAM_NameAndParam_, NDR_POINTER_UNIQUE, "Pointer to Nameandparam (DNS_RPC_NAME_AND_PARAM)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NAME_AND_PARAM_NameAndParam);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_NameAndParam_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NAME_AND_PARAM_NameAndParam_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME_AND_PARAM(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_NameAndParam,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME_AND_PARAM(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NAME_AND_PARAM_NameAndParam,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneListW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_W2K_ZoneListW2K(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneListW2K_, NDR_POINTER_UNIQUE, "Pointer to Zonelistw2k (DNS_RPC_ZONE_LIST_W2K)",hf_dnsserver_DNSSRV_RPC_UNION_ZoneListW2K);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_W2K_ZoneListW2K_, NDR_POINTER_UNIQUE, "Pointer to Zonelistw2k (DNS_RPC_ZONE_LIST_W2K)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_W2K_ZoneListW2K);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneListW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_W2K_ZoneListW2K_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_LIST_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneListW2K,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_LIST_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_W2K_ZoneListW2K,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfoDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_DOTNET_ServerInfoDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfoDotNet_, NDR_POINTER_UNIQUE, "Pointer to Serverinfodotnet (DNS_RPC_SERVER_INFO_DOTNET)",hf_dnsserver_DNSSRV_RPC_UNION_ServerInfoDotNet);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_DOTNET_ServerInfoDotNet_, NDR_POINTER_UNIQUE, "Pointer to Serverinfodotnet (DNS_RPC_SERVER_INFO_DOTNET)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_DOTNET_ServerInfoDotNet);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfoDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_DOTNET_ServerInfoDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_SERVER_INFO_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ServerInfoDotNet,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_SERVER_INFO_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_DOTNET_ServerInfoDotNet,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ForwardersDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_DOTNET_ForwardersDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_ForwardersDotNet_, NDR_POINTER_UNIQUE, "Pointer to Forwardersdotnet (DNS_RPC_FORWARDERS_DOTNET)",hf_dnsserver_DNSSRV_RPC_UNION_ForwardersDotNet);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_DOTNET_ForwardersDotNet_, NDR_POINTER_UNIQUE, "Pointer to Forwardersdotnet (DNS_RPC_FORWARDERS_DOTNET)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_DOTNET_ForwardersDotNet);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ForwardersDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_DOTNET_ForwardersDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_FORWARDERS_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ForwardersDotNet,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_FORWARDERS_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_DOTNET_ForwardersDotNet,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_Zone(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_Zone(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_Zone_, NDR_POINTER_UNIQUE, "Pointer to Zone (DNS_RPC_ZONE_DOTNET)",hf_dnsserver_DNSSRV_RPC_UNION_Zone);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_Zone_, NDR_POINTER_UNIQUE, "Pointer to Zone (DNS_RPC_ZONE_DOTNET)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_Zone);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_Zone_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_Zone_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_Zone,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_Zone,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfoDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_DOTNET_ZoneInfoDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfoDotNet_, NDR_POINTER_UNIQUE, "Pointer to Zoneinfodotnet (DNS_RPC_ZONE_INFO_DOTNET)",hf_dnsserver_DNSSRV_RPC_UNION_ZoneInfoDotNet);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_DOTNET_ZoneInfoDotNet_, NDR_POINTER_UNIQUE, "Pointer to Zoneinfodotnet (DNS_RPC_ZONE_INFO_DOTNET)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_DOTNET_ZoneInfoDotNet);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfoDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_DOTNET_ZoneInfoDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_INFO_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneInfoDotNet,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_INFO_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_DOTNET_ZoneInfoDotNet,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_SecondariesDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_DOTNET_SecondariesDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_SecondariesDotNet_, NDR_POINTER_UNIQUE, "Pointer to Secondariesdotnet (DNS_RPC_ZONE_SECONDARIES_DOTNET)",hf_dnsserver_DNSSRV_RPC_UNION_SecondariesDotNet);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_DOTNET_SecondariesDotNet_, NDR_POINTER_UNIQUE, "Pointer to Secondariesdotnet (DNS_RPC_ZONE_SECONDARIES_DOTNET)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_DOTNET_SecondariesDotNet);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_SecondariesDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_DOTNET_SecondariesDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_SECONDARIES_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_SecondariesDotNet,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_SECONDARIES_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_DOTNET_SecondariesDotNet,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_Database(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_Database(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_Database_, NDR_POINTER_UNIQUE, "Pointer to Database (DNS_RPC_ZONE_DATABASE_DOTNET)",hf_dnsserver_DNSSRV_RPC_UNION_Database);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_Database_, NDR_POINTER_UNIQUE, "Pointer to Database (DNS_RPC_ZONE_DATABASE_DOTNET)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_Database);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_Database_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_Database_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_DATABASE_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_Database,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_DATABASE_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_Database,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreateDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_DOTNET_ZoneCreateDotNet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreateDotNet_, NDR_POINTER_UNIQUE, "Pointer to Zonecreatedotnet (DNS_RPC_ZONE_CREATE_INFO_DOTNET)",hf_dnsserver_DNSSRV_RPC_UNION_ZoneCreateDotNet);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_DOTNET_ZoneCreateDotNet_, NDR_POINTER_UNIQUE, "Pointer to Zonecreatedotnet (DNS_RPC_ZONE_CREATE_INFO_DOTNET)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_DOTNET_ZoneCreateDotNet);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreateDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_DOTNET_ZoneCreateDotNet_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_CREATE_INFO_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneCreateDotNet,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_CREATE_INFO_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_DOTNET_ZoneCreateDotNet,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneList(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_ZoneList(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneList_, NDR_POINTER_UNIQUE, "Pointer to Zonelist (DNS_RPC_ZONE_LIST_DOTNET)",hf_dnsserver_DNSSRV_RPC_UNION_ZoneList);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_ZoneList_, NDR_POINTER_UNIQUE, "Pointer to Zonelist (DNS_RPC_ZONE_LIST_DOTNET)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_ZoneList);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneList_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_ZoneList_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_LIST_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneList,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_LIST_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_ZoneList,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneExport(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_EXPORT_ZoneExport(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneExport_, NDR_POINTER_UNIQUE, "Pointer to Zoneexport (DNS_RPC_ZONE_EXPORT_INFO)",hf_dnsserver_DNSSRV_RPC_UNION_ZoneExport);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_EXPORT_ZoneExport_, NDR_POINTER_UNIQUE, "Pointer to Zoneexport (DNS_RPC_ZONE_EXPORT_INFO)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_EXPORT_ZoneExport);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneExport_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_EXPORT_ZoneExport_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_EXPORT_INFO(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneExport,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_EXPORT_INFO(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_EXPORT_ZoneExport,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartition(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_INFO_DirectoryPartition(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartition_, NDR_POINTER_UNIQUE, "Pointer to Directorypartition (DNS_RPC_DP_INFO)",hf_dnsserver_DNSSRV_RPC_UNION_DirectoryPartition);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_INFO_DirectoryPartition_, NDR_POINTER_UNIQUE, "Pointer to Directorypartition (DNS_RPC_DP_INFO)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_INFO_DirectoryPartition);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartition_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_INFO_DirectoryPartition_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_DP_INFO(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_DirectoryPartition,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_DP_INFO(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_INFO_DirectoryPartition,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartitionEnum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_ENUM_DirectoryPartitionEnum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartitionEnum_, NDR_POINTER_UNIQUE, "Pointer to Directorypartitionenum (DNS_RPC_DP_ENUM)",hf_dnsserver_DNSSRV_RPC_UNION_DirectoryPartitionEnum);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_ENUM_DirectoryPartitionEnum_, NDR_POINTER_UNIQUE, "Pointer to Directorypartitionenum (DNS_RPC_DP_ENUM)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_ENUM_DirectoryPartitionEnum);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartitionEnum_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_ENUM_DirectoryPartitionEnum_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_DP_ENUM(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_DirectoryPartitionEnum,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_DP_ENUM(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_ENUM_DirectoryPartitionEnum,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartitionList(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_LIST_DirectoryPartitionList(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartitionList_, NDR_POINTER_UNIQUE, "Pointer to Directorypartitionlist (DNS_RPC_DP_LIST)",hf_dnsserver_DNSSRV_RPC_UNION_DirectoryPartitionList);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_LIST_DirectoryPartitionList_, NDR_POINTER_UNIQUE, "Pointer to Directorypartitionlist (DNS_RPC_DP_LIST)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_LIST_DirectoryPartitionList);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartitionList_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_LIST_DirectoryPartitionList_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_DP_LIST(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_DirectoryPartitionList,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_DP_LIST(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_LIST_DirectoryPartitionList,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_EnlistDirectoryPartition(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENLIST_DP_EnlistDirectoryPartition(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_EnlistDirectoryPartition_, NDR_POINTER_UNIQUE, "Pointer to Enlistdirectorypartition (DNS_RPC_ENLIST_DP)",hf_dnsserver_DNSSRV_RPC_UNION_EnlistDirectoryPartition);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENLIST_DP_EnlistDirectoryPartition_, NDR_POINTER_UNIQUE, "Pointer to Enlistdirectorypartition (DNS_RPC_ENLIST_DP)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENLIST_DP_EnlistDirectoryPartition);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_EnlistDirectoryPartition_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENLIST_DP_EnlistDirectoryPartition_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ENLIST_DP(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_EnlistDirectoryPartition,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ENLIST_DP(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENLIST_DP_EnlistDirectoryPartition,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneChangeDirectoryPartition(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CHANGE_DP_ZoneChangeDirectoryPartition(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneChangeDirectoryPartition_, NDR_POINTER_UNIQUE, "Pointer to Zonechangedirectorypartition (DNS_RPC_ZONE_CHANGE_DP)",hf_dnsserver_DNSSRV_RPC_UNION_ZoneChangeDirectoryPartition);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CHANGE_DP_ZoneChangeDirectoryPartition_, NDR_POINTER_UNIQUE, "Pointer to Zonechangedirectorypartition (DNS_RPC_ZONE_CHANGE_DP)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CHANGE_DP_ZoneChangeDirectoryPartition);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneChangeDirectoryPartition_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CHANGE_DP_ZoneChangeDirectoryPartition_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_CHANGE_DP(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneChangeDirectoryPartition,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_CHANGE_DP(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CHANGE_DP_ZoneChangeDirectoryPartition,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_EnumZonesFilter(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENUM_ZONES_FILTER_EnumZonesFilter(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_EnumZonesFilter_, NDR_POINTER_UNIQUE, "Pointer to Enumzonesfilter (DNS_RPC_ENUM_ZONES_FILTER)",hf_dnsserver_DNSSRV_RPC_UNION_EnumZonesFilter);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENUM_ZONES_FILTER_EnumZonesFilter_, NDR_POINTER_UNIQUE, "Pointer to Enumzonesfilter (DNS_RPC_ENUM_ZONES_FILTER)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENUM_ZONES_FILTER_EnumZonesFilter);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_EnumZonesFilter_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENUM_ZONES_FILTER_EnumZonesFilter_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ENUM_ZONES_FILTER(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_EnumZonesFilter,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ENUM_ZONES_FILTER(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENUM_ZONES_FILTER_EnumZonesFilter,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_AddrArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ADDRARRAY_AddrArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_AddrArray_, NDR_POINTER_UNIQUE, "Pointer to Addrarray (DNS_ADDR_ARRAY)",hf_dnsserver_DNSSRV_RPC_UNION_AddrArray);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ADDRARRAY_AddrArray_, NDR_POINTER_UNIQUE, "Pointer to Addrarray (DNS_ADDR_ARRAY)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ADDRARRAY_AddrArray);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_AddrArray_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ADDRARRAY_AddrArray_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_ADDR_ARRAY(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_AddrArray,0);
+       offset = dnsserver_dissect_struct_DNS_ADDR_ARRAY(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ADDRARRAY_AddrArray,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_ServerInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfo_, NDR_POINTER_UNIQUE, "Pointer to Serverinfo (DNS_RPC_SERVER_INFO_LONGHORN)",hf_dnsserver_DNSSRV_RPC_UNION_ServerInfo);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_ServerInfo_, NDR_POINTER_UNIQUE, "Pointer to Serverinfo (DNS_RPC_SERVER_INFO_LONGHORN)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_ServerInfo);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfo_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_ServerInfo_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_SERVER_INFO_LONGHORN(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ServerInfo,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_SERVER_INFO_LONGHORN(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_ServerInfo,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreate(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_ZoneCreate(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreate_, NDR_POINTER_UNIQUE, "Pointer to Zonecreate (DNS_RPC_ZONE_CREATE_INFO_LONGHORN)",hf_dnsserver_DNSSRV_RPC_UNION_ZoneCreate);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_ZoneCreate_, NDR_POINTER_UNIQUE, "Pointer to Zonecreate (DNS_RPC_ZONE_CREATE_INFO_LONGHORN)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_ZoneCreate);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreate_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_ZoneCreate_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_CREATE_INFO_LONGHORN(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneCreate,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_CREATE_INFO_LONGHORN(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_ZoneCreate,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_Forwarders(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_Forwarders(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_Forwarders_, NDR_POINTER_UNIQUE, "Pointer to Forwarders (DNS_RPC_FORWARDERS_LONGHORN)",hf_dnsserver_DNSSRV_RPC_UNION_Forwarders);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_Forwarders_, NDR_POINTER_UNIQUE, "Pointer to Forwarders (DNS_RPC_FORWARDERS_LONGHORN)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_Forwarders);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_Forwarders_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_Forwarders_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_FORWARDERS_LONGHORN(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_Forwarders,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_FORWARDERS_LONGHORN(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_Forwarders,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_Secondaries(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_Secondaries(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_Secondaries_, NDR_POINTER_UNIQUE, "Pointer to Secondaries (DNS_RPC_ZONE_SECONDARIES_LONGHORN)",hf_dnsserver_DNSSRV_RPC_UNION_Secondaries);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_Secondaries_, NDR_POINTER_UNIQUE, "Pointer to Secondaries (DNS_RPC_ZONE_SECONDARIES_LONGHORN)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_Secondaries);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_Secondaries_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_Secondaries_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_SECONDARIES_LONGHORN(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_Secondaries,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_SECONDARIES_LONGHORN(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_Secondaries,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_IpValidate(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IP_VALIDATE_IpValidate(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_IpValidate_, NDR_POINTER_UNIQUE, "Pointer to Ipvalidate (DNS_RPC_IP_VALIDATE)",hf_dnsserver_DNSSRV_RPC_UNION_IpValidate);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IP_VALIDATE_IpValidate_, NDR_POINTER_UNIQUE, "Pointer to Ipvalidate (DNS_RPC_IP_VALIDATE)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IP_VALIDATE_IpValidate);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_IpValidate_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IP_VALIDATE_IpValidate_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_IP_VALIDATE(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_IpValidate,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_IP_VALIDATE(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IP_VALIDATE_IpValidate,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_ZoneInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfo_, NDR_POINTER_UNIQUE, "Pointer to Zoneinfo (DNS_RPC_ZONE_INFO_LONGHORN)",hf_dnsserver_DNSSRV_RPC_UNION_ZoneInfo);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_ZoneInfo_, NDR_POINTER_UNIQUE, "Pointer to Zoneinfo (DNS_RPC_ZONE_INFO_LONGHORN)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_ZoneInfo);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfo_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_ZoneInfo_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_INFO_LONGHORN(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneInfo,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_INFO_LONGHORN(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_ZoneInfo,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_AutoConfigure(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_AUTOCONFIGURE_AutoConfigure(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_AutoConfigure_, NDR_POINTER_UNIQUE, "Pointer to Autoconfigure (DNS_RPC_AUTOCONFIGURE)",hf_dnsserver_DNSSRV_RPC_UNION_AutoConfigure);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_AUTOCONFIGURE_AutoConfigure_, NDR_POINTER_UNIQUE, "Pointer to Autoconfigure (DNS_RPC_AUTOCONFIGURE)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_AUTOCONFIGURE_AutoConfigure);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_AutoConfigure_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_AUTOCONFIGURE_AutoConfigure_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_AUTOCONFIGURE(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_AutoConfigure,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_AUTOCONFIGURE(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_AUTOCONFIGURE_AutoConfigure,0);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_Utf8StringList(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_UTF8_STRING_LIST_Utf8StringList(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_Utf8StringList_, NDR_POINTER_UNIQUE, "Pointer to Utf8stringlist (DNS_RPC_UTF8_STRING_LIST)",hf_dnsserver_DNSSRV_RPC_UNION_Utf8StringList);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_UTF8_STRING_LIST_Utf8StringList_, NDR_POINTER_UNIQUE, "Pointer to Utf8stringlist (DNS_RPC_UTF8_STRING_LIST)",hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_UTF8_STRING_LIST_Utf8StringList);
 
        return offset;
 }
 
 static int
-dnsserver_dissect_element_DNSSRV_RPC_UNION_Utf8StringList_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_UTF8_STRING_LIST_Utf8StringList_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_UTF8_STRING_LIST(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_Utf8StringList,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_UTF8_STRING_LIST(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_UTF8_STRING_LIST_Utf8StringList,0);
 
        return offset;
 }
@@ -11774,163 +11781,163 @@ dnsserver_dissect_DNSSRV_RPC_UNION(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 
        switch(level) {
                case DNSSRV_TYPEID_NULL:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Null(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NULL_Null(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_DWORD:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Dword(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DWORD_Dword(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_LPSTR:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_String(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPSTR_String(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_LPWSTR:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_WideString(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPWSTR_WideString(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_IPARRAY:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_IpArray(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IPARRAY_IpArray(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_BUFFER:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Buffer(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_BUFFER_Buffer(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_SERVER_INFO_W2K:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfoW2K(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_W2K_ServerInfoW2K(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_STATS:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Stats(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_STATS_Stats(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_FORWARDERS_W2K:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ForwardersW2K(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_W2K_ForwardersW2K(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_W2K:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneW2K(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_W2K_ZoneW2K(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_INFO_W2K:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfoW2K(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_W2K_ZoneInfoW2K(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_SECONDARIES_W2K:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_SecondariesW2K(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_W2K_SecondariesW2K(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_DATABASE_W2K:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_DatabaseW2K(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_W2K_DatabaseW2K(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_CREATE_W2K:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreateW2K(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_W2K_ZoneCreateW2K(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_NAME_AND_PARAM:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_NameAndParam(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NAME_AND_PARAM_NameAndParam(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_LIST_W2K:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneListW2K(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_W2K_ZoneListW2K(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_SERVER_INFO_DOTNET:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfoDotNet(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_DOTNET_ServerInfoDotNet(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_FORWARDERS_DOTNET:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ForwardersDotNet(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_DOTNET_ForwardersDotNet(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Zone(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_Zone(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_INFO_DOTNET:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfoDotNet(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_DOTNET_ZoneInfoDotNet(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_SECONDARIES_DOTNET:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_SecondariesDotNet(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_DOTNET_SecondariesDotNet(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_DATABASE:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Database(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_Database(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_CREATE_DOTNET:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreateDotNet(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_DOTNET_ZoneCreateDotNet(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_LIST:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneList(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_ZoneList(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_EXPORT:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneExport(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_EXPORT_ZoneExport(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_DP_INFO:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartition(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_INFO_DirectoryPartition(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_DP_ENUM:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartitionEnum(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_ENUM_DirectoryPartitionEnum(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_DP_LIST:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartitionList(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_LIST_DirectoryPartitionList(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ENLIST_DP:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_EnlistDirectoryPartition(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENLIST_DP_EnlistDirectoryPartition(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_CHANGE_DP:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneChangeDirectoryPartition(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CHANGE_DP_ZoneChangeDirectoryPartition(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ENUM_ZONES_FILTER:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_EnumZonesFilter(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENUM_ZONES_FILTER_EnumZonesFilter(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ADDRARRAY:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_AddrArray(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ADDRARRAY_AddrArray(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_SERVER_INFO:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfo(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_ServerInfo(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_CREATE:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreate(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_ZoneCreate(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_FORWARDERS:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Forwarders(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_Forwarders(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_SECONDARIES:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Secondaries(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_Secondaries(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_IP_VALIDATE:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_IpValidate(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IP_VALIDATE_IpValidate(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_INFO:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfo(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_ZoneInfo(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_AUTOCONFIGURE:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_AutoConfigure(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_AUTOCONFIGURE_AutoConfigure(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_UTF8_STRING_LIST:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Utf8StringList(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_UTF8_STRING_LIST_Utf8StringList(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -13816,14 +13823,12 @@ void proto_register_dcerpc_dnsserver(void)
          { "Fsecuresecondaries", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_W2K.fSecureSecondaries", FT_UINT32, BASE_DEC, VALS(dnsserver_DNS_ZONE_SECONDARY_SECURITY_vals), 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_BUFFER_Buffer,
          { "Buffer", "dnsserver.DNS_RPC_BUFFER.Buffer", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNS_RPC_DATA_timestamp,
-         { "Timestamp", "dnsserver.DNS_RPC_DATA.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_fForwarderSlave,
          { "Fforwarderslave", "dnsserver.DNS_RPC_ZONE_INFO_LONGHORN.fForwarderSlave", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_Buffer,
-         { "Buffer", "dnsserver.DNSSRV_RPC_UNION.Buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_DOTNET_Flags,
          { "Flags", "dnsserver.DNS_RPC_ZONE_DOTNET.Flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_Forwarders,
+         { "Forwarders", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS.Forwarders", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_dwReserved2,
          { "Dwreserved2", "dnsserver.DNS_RPC_ZONE_INFO_DOTNET.dwReserved2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvEnumRecords_pszZone,
@@ -13834,8 +13839,6 @@ void proto_register_dcerpc_dnsserver(void)
          { "Fdsintegrated", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_DOTNET.fDsIntegrated", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwReserveArray,
          { "Dwreservearray", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.dwReserveArray", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_ZoneListW2K,
-         { "Zonelistw2k", "dnsserver.DNSSRV_RPC_UNION.ZoneListW2K", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_pReserved2,
          { "Preserved2", "dnsserver.DNS_RPC_ZONE_INFO_DOTNET.pReserved2", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_LIST_DOTNET_dwReserved0,
@@ -13846,10 +13849,12 @@ void proto_register_dcerpc_dnsserver(void)
          { "Pszzone", "dnsserver.DnssrvUpdateRecord.pszZone", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwLogLevel,
          { "Dwloglevel", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.dwLogLevel", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_AAAA_ipv6,
+         { "Ipv6", "dnsserver.DNS_RPC_DATA_valDNS_TYPE_AAAA.ipv6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_DP_INFO_dwReplicaCount,
          { "Dwreplicacount", "dnsserver.DNS_RPC_DP_INFO.dwReplicaCount", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_DirectoryPartition,
-         { "Directorypartition", "dnsserver.DNSSRV_RPC_UNION.DirectoryPartition", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPWSTR_WideString,
+         { "Widestring", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPWSTR.WideString", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvOperation_dwContext,
          { "Dwcontext", "dnsserver.DnssrvOperation.dwContext", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_FORWARDERS_LONGHORN_fRecurseAfterForwarding,
@@ -13874,32 +13879,32 @@ void proto_register_dcerpc_dnsserver(void)
          { "Pszzone", "dnsserver.DnssrvComplexOperation.pszZone", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwLogLevel,
          { "Dwloglevel", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.dwLogLevel", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_ZoneInfoW2K,
-         { "Zoneinfow2k", "dnsserver.DNSSRV_RPC_UNION.ZoneInfoW2K", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fAutoReverseZones,
          { "Fautoreversezones", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.fAutoReverseZones", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_IpValidate,
-         { "Ipvalidate", "dnsserver.DNSSRV_RPC_UNION.IpValidate", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fReserveArray,
          { "Freservearray", "dnsserver.DNS_RPC_SERVER_INFO_W2K.fReserveArray", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_DirectoryPartitionEnum,
-         { "Directorypartitionenum", "dnsserver.DNSSRV_RPC_UNION.DirectoryPartitionEnum", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwForwardTimeout,
          { "Dwforwardtimeout", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.dwForwardTimeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_AddrArray,
-         { "Addrarray", "dnsserver.DNSSRV_RPC_UNION.AddrArray", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORD_SOA_dwRefresh,
          { "Dwrefresh", "dnsserver.DNS_RPC_RECORD_SOA.dwRefresh", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_PTR_ptr,
+         { "Ptr", "dnsserver.DNS_RPC_DATA_valDNS_TYPE_PTR.ptr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ENUM_ZONES_FILTER_pszQueryString,
          { "Pszquerystring", "dnsserver.DNS_RPC_ENUM_ZONES_FILTER.pszQueryString", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNSSRV_STAT_HEADER_fClear,
          { "Fclear", "dnsserver.DNSSRV_STAT_HEADER.fClear", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_W2K_ZoneCreateW2K,
+         { "Zonecreatew2k", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_W2K.ZoneCreateW2K", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IP_VALIDATE_IpValidate,
+         { "Ipvalidate", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IP_VALIDATE.IpValidate", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwDsPollingInterval,
          { "Dwdspollinginterval", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.dwDsPollingInterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORD_wType,
          { "Wtype", "dnsserver.DNS_RPC_RECORD.wType", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_aipListenAddrs,
          { "Aiplistenaddrs", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.aipListenAddrs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_TOMBSTONE_timestamp,
+         { "Timestamp", "dnsserver.DNS_RPC_DATA_valDNS_TYPE_TOMBSTONE.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvComplexOperation_ppDataOut,
          { "Ppdataout", "dnsserver.DnssrvComplexOperation.ppDataOut", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_pvReserved5,
@@ -13916,8 +13921,6 @@ void proto_register_dcerpc_dnsserver(void)
          { "Caddressanswerlimit", "dnsserver.DNS_RPC_SERVER_INFO_W2K.cAddressAnswerLimit", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwDsForestVersion,
          { "Dwdsforestversion", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.dwDsForestVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_Zone,
-         { "Zone", "dnsserver.DNSSRV_RPC_UNION.Zone", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_dwDefaultNoRefreshInterval,
          { "Dwdefaultnorefreshinterval", "dnsserver.DNS_RPC_SERVER_INFO_W2K.dwDefaultNoRefreshInterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_dwReserved6,
@@ -13960,12 +13963,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwrpcstructureversion", "dnsserver.DNS_RPC_DP_INFO.dwRpcStructureVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_dwZoneType,
          { "Dwzonetype", "dnsserver.DNS_RPC_ZONE_INFO_LONGHORN.dwZoneType", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_ForwardersW2K,
-         { "Forwardersw2k", "dnsserver.DNSSRV_RPC_UNION.ForwardersW2K", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_pszDpFqdn,
          { "Pszdpfqdn", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_DOTNET.pszDpFqdn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_Secondaries,
-         { "Secondaries", "dnsserver.DNSSRV_RPC_UNION.Secondaries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_LIST_DOTNET_dwRpcStructureVersion,
          { "Dwrpcstructureversion", "dnsserver.DNS_RPC_ZONE_LIST_DOTNET.dwRpcStructureVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_fAllowUpdate,
@@ -13974,6 +13973,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwrpcstructureversion", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_LONGHORN.dwRpcStructureVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_aipScavengeServers,
          { "Aipscavengeservers", "dnsserver.DNS_RPC_ZONE_INFO_W2K.aipScavengeServers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_LIST_DirectoryPartitionList,
+         { "Directorypartitionlist", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_LIST.DirectoryPartitionList", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_fShutdown,
          { "Fshutdown", "dnsserver.DNS_RPC_ZONE_INFO_LONGHORN.fShutdown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_DP_INFO_dwReserved0,
@@ -13982,8 +13983,6 @@ void proto_register_dcerpc_dnsserver(void)
          { "Aipforwarders", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.aipForwarders", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvComplexOperation_pszOperation,
          { "Pszoperation", "dnsserver.DnssrvComplexOperation.pszOperation", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_String,
-         { "String", "dnsserver.DNSSRV_RPC_UNION.String", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_dwReserved3,
          { "Dwreserved3", "dnsserver.DNS_RPC_ZONE_INFO_DOTNET.dwReserved3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fStrictFileParsing,
@@ -13992,8 +13991,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Fusedatabase", "dnsserver.DNS_RPC_ZONE_INFO_W2K.fUseDatabase", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_fPaused,
          { "Fpaused", "dnsserver.DNS_RPC_ZONE_INFO_W2K.fPaused", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_ServerInfoW2K,
-         { "Serverinfow2k", "dnsserver.DNSSRV_RPC_UNION.ServerInfoW2K", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_SRV_srv,
+         { "Srv", "dnsserver.DNS_RPC_DATA_valDNS_TYPE_SRV.srv", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORD_dwSerial,
          { "Dwserial", "dnsserver.DNS_RPC_RECORD.dwSerial", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORD_data,
@@ -14004,6 +14003,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwdspollinginterval", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.dwDsPollingInterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvOperation_pwszServerName,
          { "Pwszservername", "dnsserver.DnssrvOperation.pwszServerName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_W2K_ZoneInfoW2K,
+         { "Zoneinfow2k", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_W2K.ZoneInfoW2K", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_NODE_wLength,
          { "Wlength", "dnsserver.DNS_RPC_NODE.wLength", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_LONGHORN_fSecureSecondaries,
@@ -14016,8 +14017,6 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dns Rpc Zone Aging", "dnsserver.DNS_RPC_ZONE_FLAGS.DNS_RPC_ZONE_AGING", FT_BOOLEAN, 32, TFS(&DNS_RPC_ZONE_FLAGS_DNS_RPC_ZONE_AGING_tfs), ( 0x0020 ), NULL, HFILL }},
        { &hf_dnsserver_DnssrvQuery_pszZone,
          { "Pszzone", "dnsserver.DnssrvQuery.pszZone", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_DatabaseW2K,
-         { "Databasew2k", "dnsserver.DNSSRV_RPC_UNION.DatabaseW2K", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_pReserved3,
          { "Preserved3", "dnsserver.DNS_RPC_ZONE_INFO_DOTNET.pReserved3", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvComplexOperation2_dwSettingFlags,
@@ -14034,6 +14033,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Pdeleterecord", "dnsserver.DnssrvUpdateRecord2.pDeleteRecord", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_ADDR_MaxSa,
          { "Maxsa", "dnsserver.DNS_ADDR.MaxSa", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_DOTNET_ForwardersDotNet,
+         { "Forwardersdotnet", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_DOTNET.ForwardersDotNet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_dwDsPollingInterval,
          { "Dwdspollinginterval", "dnsserver.DNS_RPC_SERVER_INFO_W2K.dwDsPollingInterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvQuery2_pszOperation,
@@ -14054,16 +14055,12 @@ void proto_register_dcerpc_dnsserver(void)
          { "Floosewildcarding", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.fLooseWildcarding", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_fWriteAuthorityNs,
          { "Fwriteauthorityns", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.fWriteAuthorityNs", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNS_RPC_DATA_mx,
-         { "Mx", "dnsserver.DNS_RPC_DATA.mx", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_W2K_Version,
          { "Version", "dnsserver.DNS_RPC_ZONE_W2K.Version", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_fUseNbstat,
          { "Fusenbstat", "dnsserver.DNS_RPC_ZONE_INFO_LONGHORN.fUseNbstat", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_dwLastSuccessfulSoaCheck,
          { "Dwlastsuccessfulsoacheck", "dnsserver.DNS_RPC_ZONE_INFO_LONGHORN.dwLastSuccessfulSoaCheck", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_ZoneInfo,
-         { "Zoneinfo", "dnsserver.DNSSRV_RPC_UNION.ZoneInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_SECONDARIES_LONGHORN_dwReserved0,
          { "Dwreserved0", "dnsserver.DNS_RPC_ZONE_SECONDARIES_LONGHORN.dwReserved0", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_SECONDARIES_W2K_fSecureSecondaries,
@@ -14086,6 +14083,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwrecursiontimeout", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.dwRecursionTimeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORD_SRV_nameTarget,
          { "Nametarget", "dnsserver.DNS_RPC_RECORD_SRV.nameTarget", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NAME_AND_PARAM_NameAndParam,
+         { "Nameandparam", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NAME_AND_PARAM.NameAndParam", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_FORWARDERS_DOTNET_dwForwardTimeout,
          { "Dwforwardtimeout", "dnsserver.DNS_RPC_FORWARDERS_DOTNET.dwForwardTimeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ENLIST_DP_dwReserved0,
@@ -14104,10 +14103,10 @@ void proto_register_dcerpc_dnsserver(void)
          { "Wweight", "dnsserver.DNS_RPC_RECORD_SRV.wWeight", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_fUseNbstat,
          { "Fusenbstat", "dnsserver.DNS_RPC_ZONE_INFO_W2K.fUseNbstat", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENUM_ZONES_FILTER_EnumZonesFilter,
+         { "Enumzonesfilter", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENUM_ZONES_FILTER.EnumZonesFilter", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_FORWARDERS_DOTNET_aipForwarders,
          { "Aipforwarders", "dnsserver.DNS_RPC_FORWARDERS_DOTNET.aipForwarders", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_ZoneCreateW2K,
-         { "Zonecreatew2k", "dnsserver.DNSSRV_RPC_UNION.ZoneCreateW2K", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_fNotifyLevel,
          { "Fnotifylevel", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_DOTNET.fNotifyLevel", FT_UINT32, BASE_DEC, VALS(dnsserver_DNS_ZONE_NOTIFY_LEVEL_vals), 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_ADDR_ARRAY_MaxCount,
@@ -14122,8 +14121,6 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwfilter", "dnsserver.DNS_RPC_ENUM_ZONES_FILTER.dwFilter", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvEnumRecords_pszNodeName,
          { "Psznodename", "dnsserver.DnssrvEnumRecords.pszNodeName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_Database,
-         { "Database", "dnsserver.DNSSRV_RPC_UNION.Database", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_LONGHORN_fRecurseAfterForwarding,
          { "Frecurseafterforwarding", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_LONGHORN.fRecurseAfterForwarding", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_DP_ENUM_dwFlags,
@@ -14148,12 +14145,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Pszstartchild", "dnsserver.DnssrvEnumRecords.pszStartChild", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_pszAdmin,
          { "Pszadmin", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_W2K.pszAdmin", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNS_RPC_DATA_txt,
-         { "Txt", "dnsserver.DNS_RPC_DATA.txt", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwScavengingInterval,
          { "Dwscavenginginterval", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.dwScavengingInterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_Utf8StringList,
-         { "Utf8stringlist", "dnsserver.DNSSRV_RPC_UNION.Utf8StringList", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_FLAGS_DNS_RPC_ZONE_UPDATE_UNSECURE,
          { "Dns Rpc Zone Update Unsecure", "dnsserver.DNS_RPC_ZONE_FLAGS.DNS_RPC_ZONE_UPDATE_UNSECURE", FT_BOOLEAN, 32, TFS(&DNS_RPC_ZONE_FLAGS_DNS_RPC_ZONE_UPDATE_UNSECURE_tfs), ( 0x0040 ), NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_DP_INFO_pszDpDn,
@@ -14176,8 +14169,6 @@ void proto_register_dcerpc_dnsserver(void)
          { "Fwriteauthorityns", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.fWriteAuthorityNs", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_EXPORT_INFO_dwReserved0,
          { "Dwreserved0", "dnsserver.DNS_RPC_ZONE_EXPORT_INFO.dwReserved0", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_ServerInfo,
-         { "Serverinfo", "dnsserver.DNSSRV_RPC_UNION.ServerInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_DOTNET_pszDpFqdn,
          { "Pszdpfqdn", "dnsserver.DNS_RPC_ZONE_DOTNET.pszDpFqdn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_DOTNET_dwDpFlags,
@@ -14196,18 +14187,16 @@ void proto_register_dcerpc_dnsserver(void)
          { "Pszdpfqdn", "dnsserver.DNS_RPC_ENLIST_DP.pszDpFqdn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvUpdateRecord2_pszNodeName,
          { "Psznodename", "dnsserver.DnssrvUpdateRecord2.pszNodeName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_DirectoryPartitionList,
-         { "Directorypartitionlist", "dnsserver.DNSSRV_RPC_UNION.DirectoryPartitionList", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_SecondariesW2K,
-         { "Secondariesw2k", "dnsserver.DNSSRV_RPC_UNION.SecondariesW2K", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DWORD_Dword,
+         { "Dword", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DWORD.Dword", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IPARRAY_IpArray,
+         { "Iparray", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IPARRAY.IpArray", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvEnumRecords2_pwszServerName,
          { "Pwszservername", "dnsserver.DnssrvEnumRecords2.pwszServerName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvEnumRecords_wRecordType,
          { "Wrecordtype", "dnsserver.DnssrvEnumRecords.wRecordType", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvQuery2_dwSettingFlags,
          { "Dwsettingflags", "dnsserver.DnssrvQuery2.dwSettingFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_Forwarders,
-         { "Forwarders", "dnsserver.DNSSRV_RPC_UNION.Forwarders", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_DATABASE_DOTNET_pszFileName,
          { "Pszfilename", "dnsserver.DNS_RPC_ZONE_DATABASE_DOTNET.pszFileName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_DOTNET_dwReserved0,
@@ -14218,6 +14207,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Pdatain", "dnsserver.DnssrvComplexOperation2.pDataIn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_ADDR_ARRAY_Reserved1,
          { "Reserved1", "dnsserver.DNS_ADDR_ARRAY.Reserved1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_NS_name,
+         { "Name", "dnsserver.DNS_RPC_DATA_valDNS_TYPE_NS.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORD_SRV_wPriority,
          { "Wpriority", "dnsserver.DNS_RPC_RECORD_SRV.wPriority", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_aipServerAddrs,
@@ -14238,8 +14229,6 @@ void proto_register_dcerpc_dnsserver(void)
          { "Pszreplicadn", "dnsserver.DNS_RPC_DP_REPLICA.pszReplicaDn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvQuery_pdwTypeId,
          { "Pdwtypeid", "dnsserver.DnssrvQuery.pdwTypeId", FT_UINT32, BASE_DEC, VALS(dnsserver_DNS_RPC_TYPEID_vals), 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_IpArray,
-         { "Iparray", "dnsserver.DNSSRV_RPC_UNION.IpArray", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_FLAGS_DNS_RPC_ZONE_REVERSE,
          { "Dns Rpc Zone Reverse", "dnsserver.DNS_RPC_ZONE_FLAGS.DNS_RPC_ZONE_REVERSE", FT_BOOLEAN, 32, TFS(&DNS_RPC_ZONE_FLAGS_DNS_RPC_ZONE_REVERSE_tfs), ( 0x0004 ), NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_IP_VALIDATE_pszContextName,
@@ -14248,6 +14237,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwreserved0", "dnsserver.DNS_RPC_DP_ENUM.dwReserved0", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvQuery2_ppData,
          { "Ppdata", "dnsserver.DnssrvQuery2.ppData", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENLIST_DP_EnlistDirectoryPartition,
+         { "Enlistdirectorypartition", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENLIST_DP.EnlistDirectoryPartition", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fShutdown,
          { "Fshutdown", "dnsserver.DNS_RPC_ZONE_INFO_DOTNET.fShutdown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_aipLogFilter,
@@ -14264,6 +14255,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Pszdatafile", "dnsserver.DNS_RPC_ZONE_INFO_DOTNET.pszDataFile", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_fAging,
          { "Faging", "dnsserver.DNS_RPC_ZONE_INFO_LONGHORN.fAging", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MX_mx,
+         { "Mx", "dnsserver.DNS_RPC_DATA_valDNS_TYPE_MX.mx", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvEnumRecords2_pszZone,
          { "Pszzone", "dnsserver.DnssrvEnumRecords2.pszZone", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvComplexOperation_dwTypeIn,
@@ -14274,6 +14267,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwrpcstructureversion", "dnsserver.DNS_RPC_ZONE_DOTNET.dwRpcStructureVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fDefaultAgingState,
          { "Fdefaultagingstate", "dnsserver.DNS_RPC_SERVER_INFO_W2K.fDefaultAgingState", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_UTF8_STRING_LIST_Utf8StringList,
+         { "Utf8stringlist", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_UTF8_STRING_LIST.Utf8StringList", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvComplexOperation_pwszServerName,
          { "Pwszservername", "dnsserver.DnssrvComplexOperation.pwszServerName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_pvReserved2,
@@ -14290,12 +14285,12 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwreservearray", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.dwReserveArray", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvEnumRecords2_dwClientVersion,
          { "Dwclientversion", "dnsserver.DnssrvEnumRecords2.dwClientVersion", FT_UINT32, BASE_DEC, VALS(dnsserver_DNS_RPC_CLIENT_VERSION_vals), 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_ZONE_CHANGE_DP_dwRpcStructureVersion,
+         { "Dwrpcstructureversion", "dnsserver.DNS_RPC_ZONE_CHANGE_DP.dwRpcStructureVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_NODE_dwFlags,
          { "Dwflags", "dnsserver.DNS_RPC_NODE.dwFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORD_NAME_PREFERENCE_nameExchange,
          { "Nameexchange", "dnsserver.DNS_RPC_RECORD_NAME_PREFERENCE.nameExchange", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNS_RPC_ZONE_CHANGE_DP_dwRpcStructureVersion,
-         { "Dwrpcstructureversion", "dnsserver.DNS_RPC_ZONE_CHANGE_DP.dwRpcStructureVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORD_STRING_count,
          { "Count", "dnsserver.DNS_RPC_RECORD_STRING.count", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_fSecureSecondaries,
@@ -14332,10 +14327,14 @@ void proto_register_dcerpc_dnsserver(void)
          { "Pwszzonedn", "dnsserver.DNS_RPC_ZONE_INFO_DOTNET.pwszZoneDn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_pszDsContainer,
          { "Pszdscontainer", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.pszDsContainer", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_W2K_ForwardersW2K,
+         { "Forwardersw2k", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_W2K.ForwardersW2K", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_ADDR_ARRAY_MatchFlag,
          { "Matchflag", "dnsserver.DNS_ADDR_ARRAY.MatchFlag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwDefaultNoRefreshInterval,
          { "Dwdefaultnorefreshinterval", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.dwDefaultNoRefreshInterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CHANGE_DP_ZoneChangeDirectoryPartition,
+         { "Zonechangedirectorypartition", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CHANGE_DP.ZoneChangeDirectoryPartition", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwEventLogLevel,
          { "Dweventloglevel", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.dwEventLogLevel", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_dwLastSuccessfulXfr,
@@ -14348,6 +14347,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwtimeout", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_DOTNET.dwTimeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_aipSecondaries,
          { "Aipsecondaries", "dnsserver.DNS_RPC_ZONE_INFO_W2K.aipSecondaries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_DOTNET_ZoneInfoDotNet,
+         { "Zoneinfodotnet", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_DOTNET.ZoneInfoDotNet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_ADDR_ARRAY_WordReserved,
          { "Wordreserved", "dnsserver.DNS_ADDR_ARRAY.WordReserved", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_DP_FLAGS_DNS_DP_FOREST_DEFAULT,
@@ -14360,22 +14361,22 @@ void proto_register_dcerpc_dnsserver(void)
          { "Pdeleterecord", "dnsserver.DnssrvUpdateRecord.pDeleteRecord", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fBindSecondaries,
          { "Fbindsecondaries", "dnsserver.DNS_RPC_SERVER_INFO_W2K.fBindSecondaries", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_ServerInfoDotNet,
-         { "Serverinfodotnet", "dnsserver.DNSSRV_RPC_UNION.ServerInfoDotNet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_FLAGS_DNS_RPC_ZONE_DSINTEGRATED,
          { "Dns Rpc Zone Dsintegrated", "dnsserver.DNS_RPC_ZONE_FLAGS.DNS_RPC_ZONE_DSINTEGRATED", FT_BOOLEAN, 32, TFS(&DNS_RPC_ZONE_FLAGS_DNS_RPC_ZONE_DSINTEGRATED_tfs), ( 0x0010 ), NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ENLIST_DP_dwOperation,
          { "Dwoperation", "dnsserver.DNS_RPC_ENLIST_DP.dwOperation", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_SECONDARIES_W2K_aipNotify,
          { "Aipnotify", "dnsserver.DNS_RPC_ZONE_SECONDARIES_W2K.aipNotify", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MG_name,
+         { "Name", "dnsserver.DNS_RPC_DATA_valDNS_TYPE_MG.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwLocalNetPriorityNetMask,
          { "Dwlocalnetprioritynetmask", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.dwLocalNetPriorityNetMask", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORD_dwFlags,
          { "Dwflags", "dnsserver.DNS_RPC_RECORD.dwFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwRpcStructureVersion,
          { "Dwrpcstructureversion", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.dwRpcStructureVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_ForwardersDotNet,
-         { "Forwardersdotnet", "dnsserver.DNSSRV_RPC_UNION.ForwardersDotNet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_DNAME_name,
+         { "Name", "dnsserver.DNS_RPC_DATA_valDNS_TYPE_DNAME.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_DP_ENUM_pszDpFqdn,
          { "Pszdpfqdn", "dnsserver.DNS_RPC_DP_ENUM.pszDpFqdn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORD_SOA_ZoneAdministratorEmail,
@@ -14404,20 +14405,20 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwrpcstructureversion", "dnsserver.DNS_RPC_AUTOCONFIGURE.dwRpcStructureVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_dwReserved7,
          { "Dwreserved7", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_W2K.dwReserved7", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MD_name,
+         { "Name", "dnsserver.DNS_RPC_DATA_valDNS_TYPE_MD.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_BUFFER_dwLength,
          { "Dwlength", "dnsserver.DNS_RPC_BUFFER.dwLength", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNS_RPC_DATA_srv,
-         { "Srv", "dnsserver.DNS_RPC_DATA.srv", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvComplexOperation2_pszZone,
          { "Pszzone", "dnsserver.DnssrvComplexOperation2.pszZone", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_pszZoneName,
          { "Pszzonename", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_W2K.pszZoneName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_Dword,
-         { "Dword", "dnsserver.DNSSRV_RPC_UNION.Dword", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvEnumRecords2_fSelectFlag,
          { "Fselectflag", "dnsserver.DnssrvEnumRecords2.fSelectFlag", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_pszDomainDirectoryPartition,
          { "Pszdomaindirectorypartition", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.pszDomainDirectoryPartition", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_Secondaries,
+         { "Secondaries", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES.Secondaries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_fSecureSecondaries,
          { "Fsecuresecondaries", "dnsserver.DNS_RPC_ZONE_INFO_LONGHORN.fSecureSecondaries", FT_UINT32, BASE_DEC, VALS(dnsserver_DNS_ZONE_SECONDARY_SECURITY_vals), 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_aipLogFilter,
@@ -14426,22 +14427,26 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dns Event Log Error Type", "dnsserver.DNS_EVENT_LOG_TYPES.DNS_EVENT_LOG_ERROR_TYPE", FT_BOOLEAN, 32, TFS(&DNS_EVENT_LOG_TYPES_DNS_EVENT_LOG_ERROR_TYPE_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_dwReserved1,
          { "Dwreserved1", "dnsserver.DNS_RPC_ZONE_INFO_DOTNET.dwReserved1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_W2K_ZoneW2K,
+         { "Zonew2k", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_W2K.ZoneW2K", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvEnumRecords2_dwSettingFlags,
          { "Dwsettingflags", "dnsserver.DnssrvEnumRecords2.dwSettingFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwReserved0,
          { "Dwreserved0", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.dwReserved0", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_ADDR_ARRAY_Flags,
          { "Flags", "dnsserver.DNS_ADDR_ARRAY.Flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwDsForestVersion,
-         { "Dwdsforestversion", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.dwDsForestVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_AUTHORITY_DATA,
          { "Dns Rpc View Authority Data", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_AUTHORITY_DATA", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_AUTHORITY_DATA_tfs), ( 0x00000001 ), NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwDsForestVersion,
+         { "Dwdsforestversion", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.dwDsForestVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fPaused,
          { "Fpaused", "dnsserver.DNS_RPC_ZONE_INFO_DOTNET.fPaused", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_pwszLogFilePath,
          { "Pwszlogfilepath", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.pwszLogFilePath", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fStrictFileParsing,
          { "Fstrictfileparsing", "dnsserver.DNS_RPC_SERVER_INFO_W2K.fStrictFileParsing", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_STATS_Stats,
+         { "Stats", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_STATS.Stats", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_pszForestDirectoryPartition,
          { "Pszforestdirectorypartition", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.pszForestDirectoryPartition", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_DP_LIST_dwDpCount,
@@ -14460,8 +14465,6 @@ void proto_register_dcerpc_dnsserver(void)
          { "Pdwbufferlength", "dnsserver.DnssrvEnumRecords2.pdwBufferLength", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORDS_wLength,
          { "Wlength", "dnsserver.DNS_RPC_RECORDS.wLength", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_ZoneList,
-         { "Zonelist", "dnsserver.DNSSRV_RPC_UNION.ZoneList", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_DATABASE_W2K_fDsIntegrated,
          { "Fdsintegrated", "dnsserver.DNS_RPC_ZONE_DATABASE_W2K.fDsIntegrated", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_pExtension5,
@@ -14476,12 +14479,16 @@ void proto_register_dcerpc_dnsserver(void)
          { "Paddrecord", "dnsserver.DnssrvUpdateRecord2.pAddRecord", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORD_BUF_rec,
          { "Rec", "dnsserver.DNS_RPC_RECORD_BUF.rec", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_DOTNET_ZoneCreateDotNet,
+         { "Zonecreatedotnet", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_DOTNET.ZoneCreateDotNet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_dwLastXfrResult,
          { "Dwlastxfrresult", "dnsserver.DNS_RPC_ZONE_INFO_LONGHORN.dwLastXfrResult", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fSecureSecondaries,
          { "Fsecuresecondaries", "dnsserver.DNS_RPC_ZONE_INFO_DOTNET.fSecureSecondaries", FT_UINT32, BASE_DEC, VALS(dnsserver_DNS_ZONE_SECONDARY_SECURITY_vals), 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_fBootMethod,
          { "Fbootmethod", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.fBootMethod", FT_UINT8, BASE_DEC, VALS(dnsserver_DNS_BOOT_METHOD_vals), 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_W2K_ZoneListW2K,
+         { "Zonelistw2k", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_W2K.ZoneListW2K", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_DATABASE_DOTNET_dwRpcStructureVersion,
          { "Dwrpcstructureversion", "dnsserver.DNS_RPC_ZONE_DATABASE_DOTNET.dwRpcStructureVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_DOTNET_Version,
@@ -14496,6 +14503,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Aipscavengeservers", "dnsserver.DNS_RPC_ZONE_INFO_LONGHORN.aipScavengeServers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_FORWARDERS_W2K_dwForwardTimeout,
          { "Dwforwardtimeout", "dnsserver.DNS_RPC_FORWARDERS_W2K.dwForwardTimeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPSTR_String,
+         { "String", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPSTR.String", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_dwNameCheckFlag,
          { "Dwnamecheckflag", "dnsserver.DNS_RPC_SERVER_INFO_W2K.dwNameCheckFlag", FT_UINT32, BASE_DEC, VALS(dnsserver_DNS_NAME_CHECK_FLAG_vals), 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_pExtensions,
@@ -14516,8 +14525,12 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwlastsuccessfulxfr", "dnsserver.DNS_RPC_ZONE_INFO_LONGHORN.dwLastSuccessfulXfr", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORD_SOA_dwMinimumTtl,
          { "Dwminimumttl", "dnsserver.DNS_RPC_RECORD_SOA.dwMinimumTtl", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_HINFO_hinfo,
+         { "Hinfo", "dnsserver.DNS_RPC_DATA_valDNS_TYPE_HINFO.hinfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_SECONDARIES_LONGHORN_fSecureSecondaries,
          { "Fsecuresecondaries", "dnsserver.DNS_RPC_ZONE_SECONDARIES_LONGHORN.fSecureSecondaries", FT_UINT32, BASE_DEC, VALS(dnsserver_DNS_ZONE_SECONDARY_SECURITY_vals), 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MR_name,
+         { "Name", "dnsserver.DNS_RPC_DATA_valDNS_TYPE_MR.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvUpdateRecord_pszNodeName,
          { "Psznodename", "dnsserver.DnssrvUpdateRecord.pszNodeName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_pszZoneName,
@@ -14530,8 +14543,12 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwrpcstructureversion", "dnsserver.DNS_RPC_FORWARDERS_DOTNET.dwRpcStructureVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fBootMethod,
          { "Fbootmethod", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.fBootMethod", FT_UINT8, BASE_DEC, VALS(dnsserver_DNS_BOOT_METHOD_vals), 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_AUTOCONFIGURE_AutoConfigure,
+         { "Autoconfigure", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_AUTOCONFIGURE.AutoConfigure", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwRpcProtocol,
          { "Dwrpcprotocol", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.dwRpcProtocol", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_DOTNET_SecondariesDotNet,
+         { "Secondariesdotnet", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_DOTNET.SecondariesDotNet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CHANGE_DP_dwReserved0,
          { "Dwreserved0", "dnsserver.DNS_RPC_ZONE_CHANGE_DP.dwReserved0", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvComplexOperation_pdwTypeOut,
@@ -14542,18 +14559,14 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwdefaultrefreshinterval", "dnsserver.DNS_RPC_SERVER_INFO_W2K.dwDefaultRefreshInterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_aipListenAddrs,
          { "Aiplistenaddrs", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.aipListenAddrs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_EnumZonesFilter,
-         { "Enumzonesfilter", "dnsserver.DNSSRV_RPC_UNION.EnumZonesFilter", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_ZoneW2K,
-         { "Zonew2k", "dnsserver.DNSSRV_RPC_UNION.ZoneW2K", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_DP_INFO_dwFlags,
          { "Dwflags", "dnsserver.DNS_RPC_DP_INFO.dwFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_NODE_dwChildCount,
          { "Dwchildcount", "dnsserver.DNS_RPC_NODE.dwChildCount", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_pszDpFqdn,
          { "Pszdpfqdn", "dnsserver.DNS_RPC_ZONE_INFO_DOTNET.pszDpFqdn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNS_RPC_DATA_ipv4,
-         { "Ipv4", "dnsserver.DNS_RPC_DATA.ipv4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_ENUM_DirectoryPartitionEnum,
+         { "Directorypartitionenum", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_ENUM.DirectoryPartitionEnum", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_SECONDARIES_W2K_aipSecondaries,
          { "Aipsecondaries", "dnsserver.DNS_RPC_ZONE_SECONDARIES_W2K.aipSecondaries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_pvReserved1,
@@ -14572,6 +14585,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Psznewdomainname", "dnsserver.DNS_RPC_AUTOCONFIGURE.pszNewDomainName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwDefaultRefreshInterval,
          { "Dwdefaultrefreshinterval", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.dwDefaultRefreshInterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_Database,
+         { "Database", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE.Database", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_fDsIntegrated,
          { "Fdsintegrated", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_W2K.fDsIntegrated", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvEnumRecords2_pBuffer,
@@ -14592,12 +14607,14 @@ void proto_register_dcerpc_dnsserver(void)
          { "Len", "dnsserver.DNS_RPC_NAME.len", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_pszServerName,
          { "Pszservername", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.pszServerName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_Null,
-         { "Null", "dnsserver.DNSSRV_RPC_UNION.Null", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NULL_Null,
+         { "Null", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NULL.Null", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_pvReserved4,
          { "Pvreserved4", "dnsserver.DNS_RPC_ZONE_INFO_W2K.pvReserved4", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvEnumRecords_pdwBufferLength,
          { "Pdwbufferlength", "dnsserver.DnssrvEnumRecords.pdwBufferLength", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_W2K_SecondariesW2K,
+         { "Secondariesw2k", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_W2K.SecondariesW2K", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwLogFileMaxSize,
          { "Dwlogfilemaxsize", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.dwLogFileMaxSize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_cAddressAnswerLimit,
@@ -14626,8 +14643,12 @@ void proto_register_dcerpc_dnsserver(void)
          { "Pvreserved1", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_W2K.pvReserved1", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_dwNoRefreshInterval,
          { "Dwnorefreshinterval", "dnsserver.DNS_RPC_ZONE_INFO_LONGHORN.dwNoRefreshInterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_ZoneInfo,
+         { "Zoneinfo", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO.ZoneInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fForwardDelegations,
          { "Fforwarddelegations", "dnsserver.DNS_RPC_SERVER_INFO_W2K.fForwardDelegations", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_W2K_DatabaseW2K,
+         { "Databasew2k", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_W2K.DatabaseW2K", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORD_dwReserved,
          { "Dwreserved", "dnsserver.DNS_RPC_RECORD.dwReserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_LONGHORN_aipMasters,
@@ -14666,16 +14687,16 @@ void proto_register_dcerpc_dnsserver(void)
          { "Extension", "dnsserver.DNS_EXTENSION.extension", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_aipMasters,
          { "Aipmasters", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_W2K.aipMasters", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_dwScavengingInterval,
-         { "Dwscavenginginterval", "dnsserver.DNS_RPC_SERVER_INFO_W2K.dwScavengingInterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_DOTNET_ServerInfoDotNet,
+         { "Serverinfodotnet", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_DOTNET.ServerInfoDotNet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_GLUE_DATA,
          { "Dns Rpc View Glue Data", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_GLUE_DATA", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_GLUE_DATA_tfs), ( 0x00000004 ), NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_NameAndParam,
-         { "Nameandparam", "dnsserver.DNSSRV_RPC_UNION.NameAndParam", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_dwScavengingInterval,
+         { "Dwscavenginginterval", "dnsserver.DNS_RPC_SERVER_INFO_W2K.dwScavengingInterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvComplexOperation_pDataIn,
          { "Pdatain", "dnsserver.DnssrvComplexOperation.pDataIn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_ZoneExport,
-         { "Zoneexport", "dnsserver.DNSSRV_RPC_UNION.ZoneExport", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_A_ipv4,
+         { "Ipv4", "dnsserver.DNS_RPC_DATA_valDNS_TYPE_A.ipv4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_aipForwarders,
          { "Aipforwarders", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.aipForwarders", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fAging,
@@ -14708,6 +14729,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwscavenginginterval", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.dwScavengingInterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_aipForwarders,
          { "Aipforwarders", "dnsserver.DNS_RPC_SERVER_INFO_W2K.aipForwarders", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MB_name,
+         { "Name", "dnsserver.DNS_RPC_DATA_valDNS_TYPE_MB.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_fStrictFileParsing,
          { "Fstrictfileparsing", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.fStrictFileParsing", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_W2K_ZoneType,
@@ -14716,8 +14739,6 @@ void proto_register_dcerpc_dnsserver(void)
          { "Aipserveraddrs", "dnsserver.DNS_RPC_SERVER_INFO_W2K.aipServerAddrs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwRecursionRetry,
          { "Dwrecursionretry", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.dwRecursionRetry", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNS_RPC_DATA_hinfo,
-         { "Hinfo", "dnsserver.DNS_RPC_DATA.hinfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_DP_LIST_dwRpcStructureVersion,
          { "Dwrpcstructureversion", "dnsserver.DNS_RPC_DP_LIST.dwRpcStructureVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_pszDataFile,
@@ -14726,6 +14747,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwreserved0", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_DOTNET.dwReserved0", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvOperation_pszOperation,
          { "Pszoperation", "dnsserver.DnssrvOperation.pszOperation", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_SOA_soa,
+         { "Soa", "dnsserver.DNS_RPC_DATA_valDNS_TYPE_SOA.soa", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_fRecurseAfterForwarding,
          { "Frecurseafterforwarding", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_DOTNET.fRecurseAfterForwarding", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_IP_VALIDATE_dwRpcStructureVersion,
@@ -14738,10 +14761,12 @@ void proto_register_dcerpc_dnsserver(void)
          { "Fadminconfigured", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.fAdminConfigured", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_LONGHORN_fLoadExisting,
          { "Floadexisting", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_LONGHORN.fLoadExisting", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_WideString,
-         { "Widestring", "dnsserver.DNSSRV_RPC_UNION.WideString", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MF_name,
+         { "Name", "dnsserver.DNS_RPC_DATA_valDNS_TYPE_MF.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_fLoadExisting,
          { "Floadexisting", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_DOTNET.fLoadExisting", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ADDRARRAY_AddrArray,
+         { "Addrarray", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ADDRARRAY.AddrArray", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNSSRV_STAT_HEADER_StatId,
          { "Statid", "dnsserver.DNSSRV_STAT_HEADER.StatId", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fRoundRobin,
@@ -14774,8 +14799,6 @@ void proto_register_dcerpc_dnsserver(void)
          { "Pszdpfqdn", "dnsserver.DNS_RPC_ZONE_INFO_LONGHORN.pszDpFqdn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_dwFlags,
          { "Dwflags", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_W2K.dwFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_Stats,
-         { "Stats", "dnsserver.DNSSRV_RPC_UNION.Stats", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_ONLY_CHILDREN,
          { "Dns Rpc View Only Children", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_ONLY_CHILDREN", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_ONLY_CHILDREN_tfs), ( 0x00020000 ), NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_DP_INFO_dwReserved,
@@ -14784,8 +14807,6 @@ void proto_register_dcerpc_dnsserver(void)
          { "Flocalnetpriority", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.fLocalNetPriority", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fReverse,
          { "Freverse", "dnsserver.DNS_RPC_ZONE_INFO_DOTNET.fReverse", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_ZoneCreate,
-         { "Zonecreate", "dnsserver.DNSSRV_RPC_UNION.ZoneCreate", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_EVENT_LOG_TYPES_DNS_EVENT_LOG_WARNING_TYPE,
          { "Dns Event Log Warning Type", "dnsserver.DNS_EVENT_LOG_TYPES.DNS_EVENT_LOG_WARNING_TYPE", FT_BOOLEAN, 32, TFS(&DNS_EVENT_LOG_TYPES_DNS_EVENT_LOG_WARNING_TYPE_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORD_SOA_dwSerialNo,
@@ -14824,26 +14845,22 @@ void proto_register_dcerpc_dnsserver(void)
          { "Pwszservername", "dnsserver.DnssrvUpdateRecord2.pwszServerName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_ADDR_ARRAY_AddrCount,
          { "Addrcount", "dnsserver.DNS_ADDR_ARRAY.AddrCount", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNS_RPC_DATA_name,
-         { "Name", "dnsserver.DNS_RPC_DATA.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_LIST_DOTNET_ZoneArray,
          { "Zonearray", "dnsserver.DNS_RPC_ZONE_LIST_DOTNET.ZoneArray", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_DOTNET_fAllowUpdate,
          { "Fallowupdate", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_DOTNET.fAllowUpdate", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_EXPORT_ZoneExport,
+         { "Zoneexport", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_EXPORT.ZoneExport", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_FORWARDERS_DOTNET_fRecurseAfterForwarding,
          { "Frecurseafterforwarding", "dnsserver.DNS_RPC_FORWARDERS_DOTNET.fRecurseAfterForwarding", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_FLAGS_DNS_RPC_ZONE_READONLY,
          { "Dns Rpc Zone Readonly", "dnsserver.DNS_RPC_ZONE_FLAGS.DNS_RPC_ZONE_READONLY", FT_BOOLEAN, 32, TFS(&DNS_RPC_ZONE_FLAGS_DNS_RPC_ZONE_READONLY_tfs), ( 0x0100 ), NULL, HFILL }},
        { &hf_dnsserver_DnssrvOperation2_dwContext,
          { "Dwcontext", "dnsserver.DnssrvOperation2.dwContext", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_AutoConfigure,
-         { "Autoconfigure", "dnsserver.DNSSRV_RPC_UNION.AutoConfigure", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_fNoRecursion,
          { "Fnorecursion", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.fNoRecursion", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_SECONDARIES_LONGHORN_dwRpcStructureVersion,
          { "Dwrpcstructureversion", "dnsserver.DNS_RPC_ZONE_SECONDARIES_LONGHORN.dwRpcStructureVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNS_RPC_DATA_ipv6,
-         { "Ipv6", "dnsserver.DNS_RPC_DATA.ipv6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_DATABASE_DOTNET_fDsIntegrated,
          { "Fdsintegrated", "dnsserver.DNS_RPC_ZONE_DATABASE_DOTNET.fDsIntegrated", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_DP_ENUM_dwZoneCount,
@@ -14854,8 +14871,6 @@ void proto_register_dcerpc_dnsserver(void)
          { "Pwszzonedn", "dnsserver.DNS_RPC_ZONE_INFO_LONGHORN.pwszZoneDn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_dwForwarderTimeout,
          { "Dwforwardertimeout", "dnsserver.DNS_RPC_ZONE_INFO_DOTNET.dwForwarderTimeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_ZoneCreateDotNet,
-         { "Zonecreatedotnet", "dnsserver.DNSSRV_RPC_UNION.ZoneCreateDotNet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_DP_INFO_dwZoneCount,
          { "Dwzonecount", "dnsserver.DNS_RPC_DP_INFO.dwZoneCount", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORDS_ARRAY_rec,
@@ -14894,8 +14909,12 @@ void proto_register_dcerpc_dnsserver(void)
          { "Subcontext length", "dnsserver.DnssrvEnumRecords.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORDS_ARRAY_count,
          { "Count", "dnsserver.DNS_RPC_RECORDS_ARRAY.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_ServerInfo,
+         { "Serverinfo", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO.ServerInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_fAutoReverseZones,
          { "Fautoreversezones", "dnsserver.DNS_RPC_SERVER_INFO_W2K.fAutoReverseZones", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_CNAME_name,
+         { "Name", "dnsserver.DNS_RPC_DATA_valDNS_TYPE_CNAME.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_W2K_dwReserveArray,
          { "Dwreservearray", "dnsserver.DNS_RPC_SERVER_INFO_W2K.dwReserveArray", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwMaxCacheTtl,
@@ -14922,10 +14941,10 @@ void proto_register_dcerpc_dnsserver(void)
          { "Aipmasters", "dnsserver.DNS_RPC_ZONE_INFO_LONGHORN.aipMasters", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_DATABASE_W2K_pszFileName,
          { "Pszfilename", "dnsserver.DNS_RPC_ZONE_DATABASE_W2K.pszFileName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_INFO_DirectoryPartition,
+         { "Directorypartition", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_INFO.DirectoryPartition", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_dwForwarderTimeout,
          { "Dwforwardertimeout", "dnsserver.DNS_RPC_ZONE_INFO_LONGHORN.dwForwarderTimeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNS_RPC_DATA_soa,
-         { "Soa", "dnsserver.DNS_RPC_DATA.soa", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fRoundRobin,
          { "Froundrobin", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.fRoundRobin", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fAllowUpdate,
@@ -14950,12 +14969,12 @@ void proto_register_dcerpc_dnsserver(void)
          { "Pszfilterstop", "dnsserver.DnssrvEnumRecords.pszFilterStop", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ENUM_ZONES_FILTER_dwRpcStructureVersion,
          { "Dwrpcstructureversion", "dnsserver.DNS_RPC_ENUM_ZONES_FILTER.dwRpcStructureVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_BUFFER_Buffer,
+         { "Buffer", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_BUFFER.Buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvEnumRecords_pBuffer,
          { "Pbuffer", "dnsserver.DnssrvEnumRecords.pBuffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_IP_VALIDATE_aipValidateAddrs,
          { "Aipvalidateaddrs", "dnsserver.DNS_RPC_IP_VALIDATE.aipValidateAddrs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_ZoneChangeDirectoryPartition,
-         { "Zonechangedirectorypartition", "dnsserver.DNSSRV_RPC_UNION.ZoneChangeDirectoryPartition", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_fReadOnlyDC,
          { "Freadonlydc", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.fReadOnlyDC", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_IP4_ARRAY_AddrCount,
@@ -14966,14 +14985,14 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwflags", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_DOTNET.dwFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fUseNbstat,
          { "Fusenbstat", "dnsserver.DNS_RPC_ZONE_INFO_DOTNET.fUseNbstat", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_ZoneList,
+         { "Zonelist", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST.ZoneList", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_IP_VALIDATE_dwContext,
          { "Dwcontext", "dnsserver.DNS_RPC_IP_VALIDATE.dwContext", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_werror,
          { "Windows Error", "dnsserver.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvQuery2_pdwTypeId,
          { "Pdwtypeid", "dnsserver.DnssrvQuery2.pdwTypeId", FT_UINT32, BASE_DEC, VALS(dnsserver_DNS_RPC_TYPEID_vals), 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_EnlistDirectoryPartition,
-         { "Enlistdirectorypartition", "dnsserver.DNSSRV_RPC_UNION.EnlistDirectoryPartition", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_fReverse,
          { "Freverse", "dnsserver.DNS_RPC_ZONE_INFO_W2K.fReverse", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fNotifyLevel,
@@ -14986,8 +15005,6 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwreserved", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_LONGHORN.dwReserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_EVENT_LOG_TYPES_DNS_EVENT_LOG_INFORMATION_TYPE,
          { "Dns Event Log Information Type", "dnsserver.DNS_EVENT_LOG_TYPES.DNS_EVENT_LOG_INFORMATION_TYPE", FT_BOOLEAN, 32, TFS(&DNS_EVENT_LOG_TYPES_DNS_EVENT_LOG_INFORMATION_TYPE_tfs), ( 0x00000004 ), NULL, HFILL }},
-       { &hf_dnsserver_DNS_RPC_DATA_ptr,
-         { "Ptr", "dnsserver.DNS_RPC_DATA.ptr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_DOTNET_fUseDatabase,
          { "Fusedatabase", "dnsserver.DNS_RPC_ZONE_INFO_DOTNET.fUseDatabase", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_FORWARDERS_DOTNET_dwReserved0,
@@ -15016,6 +15033,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Fusewins", "dnsserver.DNS_RPC_ZONE_INFO_LONGHORN.fUseWins", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_CREATE_INFO_W2K_pvReserved7,
          { "Pvreserved7", "dnsserver.DNS_RPC_ZONE_CREATE_INFO_W2K.pvReserved7", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_TXT_txt,
+         { "Txt", "dnsserver.DNS_RPC_DATA_valDNS_TYPE_TXT.txt", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_ROOT_HINT_DATA,
          { "Dns Rpc View Root Hint Data", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_ROOT_HINT_DATA", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_ROOT_HINT_DATA_tfs), ( 0x00000008 ), NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ENLIST_DP_dwRpcStructureVersion,
@@ -15034,6 +15053,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Fforwarderslave", "dnsserver.DNS_RPC_ZONE_INFO_DOTNET.fForwarderSlave", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvComplexOperation2_pszOperation,
          { "Pszoperation", "dnsserver.DnssrvComplexOperation2.pszOperation", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_ZoneCreate,
+         { "Zonecreate", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE.ZoneCreate", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvEnumRecords2_pBuffer_,
          { "Subcontext length", "dnsserver.DnssrvEnumRecords2.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_FORWARDERS_W2K_aipForwarders,
@@ -15044,8 +15065,6 @@ void proto_register_dcerpc_dnsserver(void)
          { "Flocalnetpriority", "dnsserver.DNS_RPC_SERVER_INFO_W2K.fLocalNetPriority", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORD_data_,
          { "Subcontext length", "dnsserver.DNS_RPC_RECORD.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_SecondariesDotNet,
-         { "Secondariesdotnet", "dnsserver.DNSSRV_RPC_UNION.SecondariesDotNet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_pszDomainDirectoryPartition,
          { "Pszdomaindirectorypartition", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.pszDomainDirectoryPartition", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_LONGHORN_dwDefaultRefreshInterval,
@@ -15074,6 +15093,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Wrecordcount", "dnsserver.DNS_RPC_RECORDS.wRecordCount", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_dwNameCheckFlag,
          { "Dwnamecheckflag", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.dwNameCheckFlag", FT_UINT32, BASE_DEC, VALS(dnsserver_DNS_NAME_CHECK_FLAG_vals), 0, NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_Zone,
+         { "Zone", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE.Zone", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_RECORD_wDataLength,
          { "Wdatalength", "dnsserver.DNS_RPC_RECORD.wDataLength", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DnssrvEnumRecords2_pszFilterStart,
@@ -15086,6 +15107,8 @@ void proto_register_dcerpc_dnsserver(void)
          { "Pszforestdirectorypartition", "dnsserver.DNS_RPC_SERVER_INFO_LONGHORN.pszForestDirectoryPartition", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_DP_FLAGS_DNS_DP_DELETED,
          { "Dns Dp Deleted", "dnsserver.DNS_RPC_DP_FLAGS.DNS_DP_DELETED", FT_BOOLEAN, 32, TFS(&DNS_RPC_DP_FLAGS_DNS_DP_DELETED_tfs), ( 0x00000020 ), NULL, HFILL }},
+       { &hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_W2K_ServerInfoW2K,
+         { "Serverinfow2k", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_W2K.ServerInfoW2K", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_LONGHORN_aipNotify,
          { "Aipnotify", "dnsserver.DNS_RPC_ZONE_INFO_LONGHORN.aipNotify", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_ZONE_INFO_W2K_fAutoCreated,
@@ -15096,8 +15119,6 @@ void proto_register_dcerpc_dnsserver(void)
          { "Dwreserved1", "dnsserver.DNS_RPC_AUTOCONFIGURE.dwReserved1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_UTF8_STRING_LIST_dwCount,
          { "Dwcount", "dnsserver.DNS_RPC_UTF8_STRING_LIST.dwCount", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dnsserver_DNSSRV_RPC_UNION_ZoneInfoDotNet,
-         { "Zoneinfodotnet", "dnsserver.DNSSRV_RPC_UNION.ZoneInfoDotNet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        };