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

This reverts commit bd7d7078f689eaa20c07640c826ae7880fb6b248.

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-backupkey.c b/bin/default/librpc/gen_ndr/packet-dcerpc-backupkey.c
index 8488ba4ddcce7372466b4c6257eaf094b8869c07..d2aed6f2ae642992b88c4ec61fd5418ecb40226a 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-backupkey.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-backupkey.c
@@ -42,10 +42,9 @@ static gint ett_backupkey_bkrp_data_in_blob = -1;
 
 
 /* Header field declarations */
-static gint hf_backupkey_bkrp_data_in_blob_valBACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER_cert_req = -1;
 static gint hf_backupkey_bkrp_access_check_v2_nonce = -1;
 static gint hf_backupkey_bkrp_client_side_wrapped_access_check_len = -1;
-static gint hf_backupkey_bkrp_data_in_blob_valBACKUPKEY_RESTORE_GUID_INTEGER_restore_req = -1;
+static gint hf_backupkey_bkrp_data_in_blob_cert_req = -1;
 static gint hf_backupkey_bkrp_exported_RSA_key_pair_prime2 = -1;
 static gint hf_backupkey_bkrp_encrypted_secret_v3_payload_key = -1;
 static gint hf_backupkey_bkrp_client_side_wrapped_guid = -1;
@@ -53,6 +52,7 @@ static gint hf_backupkey_bkrp_exported_RSA_key_pair_modulus_ = -1;
 static gint hf_backupkey_bkrp_exported_RSA_key_pair_public_exponent_ = -1;
 static gint hf_backupkey_bkrp_exported_RSA_key_pair_header1 = -1;
 static gint hf_backupkey_bkrp_exported_RSA_key_pair_certificate_len = -1;
+static gint hf_backupkey_bkrp_data_in_blob_restore_req = -1;
 static gint hf_backupkey_bkrp_exported_RSA_key_pair_coefficient_ = -1;
 static gint hf_backupkey_bkrp_dc_serverwrap_key_magic = -1;
 static gint hf_backupkey_bkrp_exported_RSA_key_pair_magic2 = -1;
@@ -192,8 +192,8 @@ const value_string backupkey_bkrp_guid_to_integer_vals[] = {
        { BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER, "BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER" },
 { 0, NULL }
 };
-static int backupkey_dissect_element_bkrp_data_in_blob_valBACKUPKEY_RESTORE_GUID_INTEGER_restore_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int backupkey_dissect_element_bkrp_data_in_blob_valBACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER_cert_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int backupkey_dissect_element_bkrp_data_in_blob_restore_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int backupkey_dissect_element_bkrp_data_in_blob_cert_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int backupkey_dissect_element_bkrp_BackupKey_guidActionAgent(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int backupkey_dissect_element_bkrp_BackupKey_guidActionAgent_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int backupkey_dissect_element_bkrp_BackupKey_data_in(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1310,17 +1310,17 @@ backupkey_dissect_enum_bkrp_guid_to_integer(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-backupkey_dissect_element_bkrp_data_in_blob_valBACKUPKEY_RESTORE_GUID_INTEGER_restore_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+backupkey_dissect_element_bkrp_data_in_blob_restore_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = backupkey_dissect_struct_bkrp_client_side_wrapped(tvb,offset,pinfo,tree,drep,hf_backupkey_bkrp_data_in_blob_valBACKUPKEY_RESTORE_GUID_INTEGER_restore_req,0);
+       offset = backupkey_dissect_struct_bkrp_client_side_wrapped(tvb,offset,pinfo,tree,drep,hf_backupkey_bkrp_data_in_blob_restore_req,0);
 
        return offset;
 }
 
 static int
-backupkey_dissect_element_bkrp_data_in_blob_valBACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER_cert_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+backupkey_dissect_element_bkrp_data_in_blob_cert_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = backupkey_dissect_struct_bkrp_client_side_wrapped(tvb,offset,pinfo,tree,drep,hf_backupkey_bkrp_data_in_blob_valBACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER_cert_req,0);
+       offset = backupkey_dissect_struct_bkrp_client_side_wrapped(tvb,offset,pinfo,tree,drep,hf_backupkey_bkrp_data_in_blob_cert_req,0);
 
        return offset;
 }
@@ -1341,11 +1341,11 @@ backupkey_dissect_bkrp_data_in_blob(tvbuff_t *tvb _U_, int offset _U_, packet_in
 
        switch(level) {
                case BACKUPKEY_RESTORE_GUID_INTEGER:
-                       offset = backupkey_dissect_element_bkrp_data_in_blob_valBACKUPKEY_RESTORE_GUID_INTEGER_restore_req(tvb, offset, pinfo, tree, drep);
+                       offset = backupkey_dissect_element_bkrp_data_in_blob_restore_req(tvb, offset, pinfo, tree, drep);
                break;
 
                case BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER:
-                       offset = backupkey_dissect_element_bkrp_data_in_blob_valBACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER_cert_req(tvb, offset, pinfo, tree, drep);
+                       offset = backupkey_dissect_element_bkrp_data_in_blob_cert_req(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -1511,14 +1511,12 @@ static dcerpc_sub_dissector backupkey_dissectors[] = {
 void proto_register_dcerpc_backupkey(void)
 {
        static hf_register_info hf[] = {
-       { &hf_backupkey_bkrp_data_in_blob_valBACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER_cert_req,
-         { "Cert Req", "backupkey.bkrp_data_in_blob_valBACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER.cert_req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_backupkey_bkrp_access_check_v2_nonce,
          { "Nonce", "backupkey.bkrp_access_check_v2.nonce", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_backupkey_bkrp_client_side_wrapped_access_check_len,
          { "Access Check Len", "backupkey.bkrp_client_side_wrapped.access_check_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_backupkey_bkrp_data_in_blob_valBACKUPKEY_RESTORE_GUID_INTEGER_restore_req,
-         { "Restore Req", "backupkey.bkrp_data_in_blob_valBACKUPKEY_RESTORE_GUID_INTEGER.restore_req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_backupkey_bkrp_data_in_blob_cert_req,
+         { "Cert Req", "backupkey.bkrp_data_in_blob.cert_req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_backupkey_bkrp_exported_RSA_key_pair_prime2,
          { "Prime2", "backupkey.bkrp_exported_RSA_key_pair.prime2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_backupkey_bkrp_encrypted_secret_v3_payload_key,
@@ -1533,6 +1531,8 @@ void proto_register_dcerpc_backupkey(void)
          { "Header1", "backupkey.bkrp_exported_RSA_key_pair.header1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_backupkey_bkrp_exported_RSA_key_pair_certificate_len,
          { "Certificate Len", "backupkey.bkrp_exported_RSA_key_pair.certificate_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_backupkey_bkrp_data_in_blob_restore_req,
+         { "Restore Req", "backupkey.bkrp_data_in_blob.restore_req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_backupkey_bkrp_exported_RSA_key_pair_coefficient_,
          { "Subcontext length", "backupkey.bkrp_exported_RSA_key_pair.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_backupkey_bkrp_dc_serverwrap_key_magic,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-browser.c b/bin/default/librpc/gen_ndr/packet-dcerpc-browser.c
index 330fca4ff85bcd79837abc7637c3964c26d377b2..12010ddf63b699b269d39d14537299ae514df984 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-browser.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-browser.c
@@ -39,7 +39,6 @@ static gint ett_browser_BrowserrSrvInfo = -1;
 /* Header field declarations */
 static gint hf_browser_BrowserrQueryOtherDomains_info = -1;
 static gint hf_browser_BrowserrSrvInfo101Ctr_entries = -1;
-static gint hf_browser_BrowserrSrvInfoUnion_val101_info101 = -1;
 static gint hf_browser_BrowserrSrvInfo_info = -1;
 static gint hf_browser_BrowserrQueryOtherDomains_total_entries = -1;
 static gint hf_browser_werror = -1;
@@ -47,7 +46,8 @@ static gint hf_browser_BrowserrSrvInfo101Ctr_entries_read = -1;
 static gint hf_browser_BrowserrSrvInfo100Ctr_entries_read = -1;
 static gint hf_browser_opnum = -1;
 static gint hf_browser_BrowserrQueryOtherDomains_server_unc = -1;
-static gint hf_browser_BrowserrSrvInfoUnion_val100_info100 = -1;
+static gint hf_browser_BrowserrSrvInfoUnion_info101 = -1;
+static gint hf_browser_BrowserrSrvInfoUnion_info100 = -1;
 static gint hf_browser_BrowserrSrvInfo_level = -1;
 static gint hf_browser_BrowserrSrvInfo100Ctr_entries = -1;
 
@@ -69,10 +69,10 @@ static int browser_dissect_element_BrowserrSrvInfo101Ctr_entries_read(tvbuff_t *
 static int browser_dissect_element_BrowserrSrvInfo101Ctr_entries(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int browser_dissect_element_BrowserrSrvInfo101Ctr_entries_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int browser_dissect_element_BrowserrSrvInfo101Ctr_entries__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int browser_dissect_element_BrowserrSrvInfoUnion_val100_info100(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int browser_dissect_element_BrowserrSrvInfoUnion_val100_info100_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int browser_dissect_element_BrowserrSrvInfoUnion_val101_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int browser_dissect_element_BrowserrSrvInfoUnion_val101_info101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int browser_dissect_element_BrowserrSrvInfoUnion_info100(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int browser_dissect_element_BrowserrSrvInfoUnion_info100_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int browser_dissect_element_BrowserrSrvInfoUnion_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int browser_dissect_element_BrowserrSrvInfoUnion_info101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int browser_dissect_element_BrowserrSrvInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int browser_dissect_element_BrowserrSrvInfo_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int browser_dissect_element_BrowserrQueryOtherDomains_server_unc(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -230,33 +230,33 @@ browser_dissect_struct_BrowserrSrvInfo101Ctr(tvbuff_t *tvb _U_, int offset _U_,
 /* IDL: } */
 
 static int
-browser_dissect_element_BrowserrSrvInfoUnion_val100_info100(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+browser_dissect_element_BrowserrSrvInfoUnion_info100(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, browser_dissect_element_BrowserrSrvInfoUnion_val100_info100_, NDR_POINTER_UNIQUE, "Pointer to Info100 (BrowserrSrvInfo100Ctr)",hf_browser_BrowserrSrvInfoUnion_val100_info100);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, browser_dissect_element_BrowserrSrvInfoUnion_info100_, NDR_POINTER_UNIQUE, "Pointer to Info100 (BrowserrSrvInfo100Ctr)",hf_browser_BrowserrSrvInfoUnion_info100);
 
        return offset;
 }
 
 static int
-browser_dissect_element_BrowserrSrvInfoUnion_val100_info100_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+browser_dissect_element_BrowserrSrvInfoUnion_info100_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = browser_dissect_struct_BrowserrSrvInfo100Ctr(tvb,offset,pinfo,tree,drep,hf_browser_BrowserrSrvInfoUnion_val100_info100,0);
+       offset = browser_dissect_struct_BrowserrSrvInfo100Ctr(tvb,offset,pinfo,tree,drep,hf_browser_BrowserrSrvInfoUnion_info100,0);
 
        return offset;
 }
 
 static int
-browser_dissect_element_BrowserrSrvInfoUnion_val101_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+browser_dissect_element_BrowserrSrvInfoUnion_info101(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, browser_dissect_element_BrowserrSrvInfoUnion_val101_info101_, NDR_POINTER_UNIQUE, "Pointer to Info101 (BrowserrSrvInfo101Ctr)",hf_browser_BrowserrSrvInfoUnion_val101_info101);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, browser_dissect_element_BrowserrSrvInfoUnion_info101_, NDR_POINTER_UNIQUE, "Pointer to Info101 (BrowserrSrvInfo101Ctr)",hf_browser_BrowserrSrvInfoUnion_info101);
 
        return offset;
 }
 
 static int
-browser_dissect_element_BrowserrSrvInfoUnion_val101_info101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+browser_dissect_element_BrowserrSrvInfoUnion_info101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = browser_dissect_struct_BrowserrSrvInfo101Ctr(tvb,offset,pinfo,tree,drep,hf_browser_BrowserrSrvInfoUnion_val101_info101,0);
+       offset = browser_dissect_struct_BrowserrSrvInfo101Ctr(tvb,offset,pinfo,tree,drep,hf_browser_BrowserrSrvInfoUnion_info101,0);
 
        return offset;
 }
@@ -280,11 +280,11 @@ browser_dissect_BrowserrSrvInfoUnion(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
        switch(level) {
                case 100:
-                       offset = browser_dissect_element_BrowserrSrvInfoUnion_val100_info100(tvb, offset, pinfo, tree, drep);
+                       offset = browser_dissect_element_BrowserrSrvInfoUnion_info100(tvb, offset, pinfo, tree, drep);
                break;
 
                case 101:
-                       offset = browser_dissect_element_BrowserrSrvInfoUnion_val101_info101(tvb, offset, pinfo, tree, drep);
+                       offset = browser_dissect_element_BrowserrSrvInfoUnion_info101(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -672,8 +672,6 @@ void proto_register_dcerpc_browser(void)
          { "Info", "browser.BrowserrQueryOtherDomains.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_browser_BrowserrSrvInfo101Ctr_entries,
          { "Entries", "browser.BrowserrSrvInfo101Ctr.entries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_browser_BrowserrSrvInfoUnion_val101_info101,
-         { "Info101", "browser.BrowserrSrvInfoUnion_val101.info101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_browser_BrowserrSrvInfo_info,
          { "Info", "browser.BrowserrSrvInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_browser_BrowserrQueryOtherDomains_total_entries,
@@ -688,8 +686,10 @@ void proto_register_dcerpc_browser(void)
          { "Operation", "browser.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_browser_BrowserrQueryOtherDomains_server_unc,
          { "Server Unc", "browser.BrowserrQueryOtherDomains.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_browser_BrowserrSrvInfoUnion_val100_info100,
-         { "Info100", "browser.BrowserrSrvInfoUnion_val100.info100", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_browser_BrowserrSrvInfoUnion_info101,
+         { "Info101", "browser.BrowserrSrvInfoUnion.info101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_browser_BrowserrSrvInfoUnion_info100,
+         { "Info100", "browser.BrowserrSrvInfoUnion.info100", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_browser_BrowserrSrvInfo_level,
          { "Level", "browser.BrowserrSrvInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_browser_BrowserrSrvInfo100Ctr_entries,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-dcerpc.c b/bin/default/librpc/gen_ndr/packet-dcerpc-dcerpc.c
index 6586ee2a838c80734bdcd5af0484326ceb2e3b10..b05ef0278b4e0d747e8ffce83aa63e27e5b69372 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-dcerpc.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-dcerpc.c
@@ -82,165 +82,165 @@ static gint ett_dcerpc_ncadg_packet = -1;
 
 
 /* Header field declarations */
-static gint hf_dcerpc_dcerpc_rts_cmds_val0xE_PingTrafficSentNotify = -1;
 static gint hf_dcerpc_dcerpc_auth_auth_reserved = -1;
+static gint hf_dcerpc_dcerpc_payload_cancel_ack = -1;
 static gint hf_dcerpc_dcerpc_bind_ack_secondary_address_size = -1;
 static gint hf_dcerpc_dcerpc_request_stub_and_verifier = -1;
 static gint hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_PING = -1;
 static gint hf_dcerpc_ncadg_packet_u = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x2_ConnectionTimeout = -1;
 static gint hf_dcerpc_dcerpc_fack_serial_no = -1;
 static gint hf_dcerpc_dcerpc_cl_cancel_version = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x1_FlowControlAck = -1;
 static gint hf_dcerpc_dcerpc_orphaned_auth_info = -1;
 static gint hf_dcerpc_dcerpc_ack_ctx_result = -1;
+static gint hf_dcerpc_dcerpc_payload_response = -1;
 static gint hf_dcerpc_dcerpc_co_cancel_auth_info = -1;
 static gint hf_dcerpc_dcerpc_auth_auth_context_id = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_Command = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x8_Padding = -1;
+static gint hf_dcerpc_dcerpc_payload_fack = -1;
 static gint hf_dcerpc_ncadg_packet_fragnum = -1;
 static gint hf_dcerpc_ncadg_packet_pfc_flags = -1;
 static gint hf_dcerpc_ncacn_packet_u = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x4_ChannelLifetime = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_REQUEST_request = -1;
 static gint hf_dcerpc_dcerpc_bind_nak_versions_num_versions = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0xB_ClientAddress = -1;
 static gint hf_dcerpc_ncacn_packet_auth_length = -1;
 static gint hf_dcerpc_ncadg_packet_ihint = -1;
 static gint hf_dcerpc_ncadg_packet_iface = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_Padding_ConformanceCount = -1;
 static gint hf_dcerpc_dcerpc_request_object = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_AUTH3_auth3 = -1;
 static gint hf_dcerpc_ncacn_packet_call_id = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_ACK_bind_ack = -1;
+static gint hf_dcerpc_dcerpc_payload_nocall = -1;
 static gint hf_dcerpc_dcerpc_request_alloc_hint = -1;
 static gint hf_dcerpc_dcerpc_bind_ctx_list = -1;
 static gint hf_dcerpc_dcerpc_ack_ctx_reason = -1;
 static gint hf_dcerpc_dcerpc_bind_max_xmit_frag = -1;
 static gint hf_dcerpc_dcerpc_bind_num_contexts = -1;
 static gint hf_dcerpc_dcerpc_cl_cancel_id = -1;
+static gint hf_dcerpc_dcerpc_payload_auth3 = -1;
 static gint hf_dcerpc_dcerpc_ack_ctx_syntax = -1;
-static gint hf_dcerpc_ClientAddressType_valRTS_IPV4_ClientAddressIPV4 = -1;
 static gint hf_dcerpc_dcerpc_bind_ack_max_xmit_frag = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x6_Version = -1;
 static gint hf_dcerpc_dcerpc_fack_max_frag_size = -1;
 static gint hf_dcerpc_dcerpc_orphaned__pad = -1;
 static gint hf_dcerpc_dcerpc_bind_ack_max_recv_frag = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x0_ReceiveWindowSize = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CANCEL_ACK_cancel_ack = -1;
-static gint hf_dcerpc_ClientAddressType_valRTS_IPV6_ClientAddressIPV6 = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_SHUTDOWN_shutdown = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_PingTrafficSentNotify = -1;
+static gint hf_dcerpc_dcerpc_payload_co_cancel = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_Padding = -1;
 static gint hf_dcerpc_ncadg_packet_ncadg_flags = -1;
 static gint hf_dcerpc_dcerpc_ctx_list_context_id = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x5_ClientKeepalive = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_FlowControlAck_Ack = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x7_Empty = -1;
 static gint hf_dcerpc_dcerpc_bind_max_recv_frag = -1;
 static gint hf_dcerpc_dcerpc_fack_selack_size = -1;
+static gint hf_dcerpc_dcerpc_payload_request = -1;
 static gint hf_dcerpc_dcerpc_bind_ack_secondary_address = -1;
 static gint hf_dcerpc_dcerpc_response__pad = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_PingTrafficSentNotify_PingTrafficSent = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_FAULT_fault = -1;
+static gint hf_dcerpc_dcerpc_payload_orphaned = -1;
 static gint hf_dcerpc_dcerpc_rts_NumberOfCommands = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_ClientKeepalive_ClientKeepalive = -1;
 static gint hf_dcerpc_ncadg_packet_server_boot = -1;
 static gint hf_dcerpc_ncacn_packet_rpc_vers_minor = -1;
 static gint hf_dcerpc_dcerpc_rts_Commands = -1;
+static gint hf_dcerpc_dcerpc_payload_bind_nak = -1;
+static gint hf_dcerpc_dcerpc_payload_bind_ack = -1;
 static gint hf_dcerpc_dcerpc_fault__pad = -1;
 static gint hf_dcerpc_dcerpc_cancel_ack_id = -1;
+static gint hf_dcerpc_dcerpc_payload_alter_resp = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_ConnectionTimeout = -1;
+static gint hf_dcerpc_dcerpc_object_object = -1;
+static gint hf_dcerpc_dcerpc_payload_reject = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_Destination_ForwardDestination = -1;
 static gint hf_dcerpc_dcerpc_fack_selack = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_PING_ping = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_RESPONSE_response = -1;
 static gint hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_EOF = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0xD_Destination = -1;
 static gint hf_dcerpc_ClientAddress_Padding = -1;
 static gint hf_dcerpc_dcerpc_bind_assoc_group_id = -1;
 static gint hf_dcerpc_dcerpc_fault_cancel_count = -1;
 static gint hf_dcerpc_dcerpc_response_alloc_hint = -1;
 static gint hf_dcerpc_dcerpc_fack_window_size = -1;
+static gint hf_dcerpc_dcerpc_payload_ping = -1;
 static gint hf_dcerpc_dcerpc_auth_auth_pad_length = -1;
 static gint hf_dcerpc_ncadg_packet_serial_low = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_NOCALL_nocall = -1;
 static gint hf_dcerpc_ncadg_packet_opnum = -1;
 static gint hf_dcerpc_dcerpc_response_stub_and_verifier = -1;
 static gint hf_dcerpc_FlowControlAcknowledgment_BytesReceived = -1;
 static gint hf_dcerpc_dcerpc_auth_auth_type = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ACK_ack = -1;
+static gint hf_dcerpc_dcerpc_object_empty = -1;
 static gint hf_dcerpc_dcerpc_request_opnum = -1;
 static gint hf_dcerpc_ncadg_packet_seq_num = -1;
 static gint hf_dcerpc_dcerpc_cancel_ack_version = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x9_NegativeANCE = -1;
 static gint hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_IN_CHANNEL = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_ClientKeepalive = -1;
+static gint hf_dcerpc_dcerpc_payload_cl_cancel = -1;
 static gint hf_dcerpc_dcerpc_bind_ack_num_results = -1;
 static gint hf_dcerpc_FlowControlAcknowledgment_ChannelCookie = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_AssociationGroupId_AssociationGroupId = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_RTS_rts = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_ClientAddress = -1;
 static gint hf_dcerpc_dcerpc_co_cancel__pad = -1;
 static gint hf_dcerpc_dcerpc_request__pad = -1;
 static gint hf_dcerpc_dcerpc_auth_credentials = -1;
 static gint hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_OTHER_CMD = -1;
 static gint hf_dcerpc_dcerpc_bind_nak_versions_versions = -1;
 static gint hf_dcerpc_ncadg_packet_activity = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CL_CANCEL_cl_cancel = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_ChannelLifetime_ChannelLifetime = -1;
 static gint hf_dcerpc_ncadg_packet_auth_proto = -1;
 static gint hf_dcerpc_dcerpc_bind_ack_assoc_group_id = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ALTER_RESP_alter_resp = -1;
 static gint hf_dcerpc_dcerpc_fault_context_id = -1;
+static gint hf_dcerpc_dcerpc_payload_rts = -1;
 static gint hf_dcerpc_ncacn_packet_drep = -1;
+static gint hf_dcerpc_dcerpc_payload_ack = -1;
 static gint hf_dcerpc_dcerpc_bind_nak_reject_reason = -1;
 static gint hf_dcerpc_dcerpc_cancel_ack_server_is_accepting = -1;
+static gint hf_dcerpc_dcerpc_payload_bind = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_ClientAddress_ClientAddress = -1;
 static gint hf_dcerpc_dcerpc_auth3_auth_info = -1;
-static gint hf_dcerpc_dcerpc_object_valLIBNDR_FLAG_OBJECT_PRESENT_object = -1;
 static gint hf_dcerpc_FlowControlAcknowledgment_AvailableWindow = -1;
 static gint hf_dcerpc_ncacn_packet_frag_length = -1;
+static gint hf_dcerpc_dcerpc_payload_alter = -1;
 static gint hf_dcerpc_dcerpc_bind_ack__pad1 = -1;
 static gint hf_dcerpc_dcerpc_ctx_list_num_transfer_syntaxes = -1;
 static gint hf_dcerpc_dcerpc_bind_auth_info = -1;
 static gint hf_dcerpc_dcerpc_auth_auth_level = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_WORKING_working = -1;
 static gint hf_dcerpc_ncadg_packet_ptype = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CO_CANCEL_co_cancel = -1;
 static gint hf_dcerpc_ncacn_packet_ptype = -1;
 static gint hf_dcerpc_dcerpc_fault_status = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0xA_ANCE = -1;
+static gint hf_dcerpc_dcerpc_payload_fault = -1;
 static gint hf_dcerpc_ncadg_packet_serial_high = -1;
 static gint hf_dcerpc_dcerpc_auth3__pad = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_Padding_Padding = -1;
 static gint hf_dcerpc_ClientAddress_ClientAddress = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_Cookie_Cookie = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_FACK_fack = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_REJECT_reject = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_ChannelLifetime = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_ConnectionTimeout_ConnectionTimeout = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_ReceiveWindowSize = -1;
 static gint hf_dcerpc_ncadg_packet_iface_version = -1;
 static gint hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_ECHO = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0x3_Cookie = -1;
-static gint hf_dcerpc_dcerpc_bind_nak_versions_ctr_valDECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED_v = -1;
+static gint hf_dcerpc_dcerpc_bind_nak_versions_ctr_v = -1;
+static gint hf_dcerpc_ClientAddressType_ClientAddressIPV6 = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_NegativeANCE = -1;
 static gint hf_dcerpc_dcerpc_fack_max_tdsu = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_NAK_bind_nak = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_AssociationGroupId = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_CommandType = -1;
 static gint hf_dcerpc_ncacn_packet_rpc_vers = -1;
 static gint hf_dcerpc_dcerpc_bind_nak_versions = -1;
 static gint hf_dcerpc_dcerpc_request_context_id = -1;
 static gint hf_dcerpc_ncadg_packet_ahint = -1;
+static gint hf_dcerpc_dcerpc_payload_shutdown = -1;
+static gint hf_dcerpc_ClientAddressType_ClientAddressIPV4 = -1;
 static gint hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_OUT_CHANNEL = -1;
 static gint hf_dcerpc_dcerpc_bind_ack_ctx_list = -1;
 static gint hf_dcerpc_dcerpc_fack_version = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_Version_Version = -1;
-static gint hf_dcerpc_dcerpc_rts_cmds_val0xC_AssociationGroupId = -1;
 static gint hf_dcerpc_dcerpc_rts_cmd_ReceiveWindowSize_ReceiveWindowSize = -1;
 static gint hf_dcerpc_ncadg_packet_rpc_vers = -1;
+static gint hf_dcerpc_dcerpc_payload_working = -1;
 static gint hf_dcerpc_RTSCookie_Cookie = -1;
 static gint hf_dcerpc_dcerpc_rts_Flags = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ALTER_alter = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_Version = -1;
 static gint hf_dcerpc_ClientAddress_AddressType = -1;
 static gint hf_dcerpc_dcerpc_response_context_id = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_bind = -1;
 static gint hf_dcerpc_ncadg_packet_drep = -1;
 static gint hf_dcerpc_ncadg_packet_len = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_Empty = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_Destination = -1;
 static gint hf_dcerpc_opnum = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_ANCE = -1;
 static gint hf_dcerpc_dcerpc_fault_alloc_hint = -1;
 static gint hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_NONE = -1;
 static gint hf_dcerpc_ncadg_packet_object = -1;
@@ -249,8 +249,8 @@ static gint hf_dcerpc_dcerpc_fack__pad1 = -1;
 static gint hf_dcerpc_dcerpc_ctx_list_abstract_syntax = -1;
 static gint hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_RECYCLE_CHANNEL = -1;
 static gint hf_dcerpc_ncacn_packet_pfc_flags = -1;
-static gint hf_dcerpc_dcerpc_object_valdefault_empty = -1;
-static gint hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ORPHANED_orphaned = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_FlowControlAck = -1;
+static gint hf_dcerpc_dcerpc_rts_cmds_Cookie = -1;
 static gint hf_dcerpc_dcerpc_ctx_list_transfer_syntaxes = -1;
 static gint hf_dcerpc_dcerpc_bind_ack_auth_info = -1;
 
@@ -276,8 +276,8 @@ static int dcerpc_dissect_element_bind_num_contexts(tvbuff_t *tvb _U_, int offse
 static int dcerpc_dissect_element_bind_ctx_list(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_bind_ctx_list_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_bind_auth_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_object_valdefault_empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_object_valLIBNDR_FLAG_OBJECT_PRESENT_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_object_empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_object_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_request_alloc_hint(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_request_context_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_request_opnum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -301,7 +301,7 @@ static int dcerpc_dissect_element_bind_ack_auth_info(tvbuff_t *tvb _U_, int offs
 static int dcerpc_dissect_element_bind_nak_versions_num_versions(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_bind_nak_versions_versions(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_bind_nak_versions_versions_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_bind_nak_versions_ctr_valDECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED_v(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_bind_nak_versions_ctr_v(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_bind_nak_reject_reason(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *reject_reason);
 static int dcerpc_dissect_element_bind_nak_versions(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *reject_reason);
 static int dcerpc_dissect_element_response_alloc_hint(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -419,8 +419,8 @@ const value_string dcerpc_AddressType_vals[] = {
        { RTS_IPV6, "RTS_IPV6" },
 { 0, NULL }
 };
-static int dcerpc_dissect_element_ClientAddressType_valRTS_IPV4_ClientAddressIPV4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_ClientAddressType_valRTS_IPV6_ClientAddressIPV6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_ClientAddressType_ClientAddressIPV4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_ClientAddressType_ClientAddressIPV6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_ClientAddress_AddressType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *AddressType);
 static int dcerpc_dissect_element_ClientAddress_ClientAddress(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *AddressType);
 static int dcerpc_dissect_element_ClientAddress_Padding(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -449,21 +449,21 @@ static int dcerpc_dissect_element_rts_cmd_ClientAddress_ClientAddress(tvbuff_t *
 static int dcerpc_dissect_element_rts_cmd_AssociationGroupId_AssociationGroupId(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_rts_cmd_Destination_ForwardDestination(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_rts_cmd_PingTrafficSentNotify_PingTrafficSent(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x0_ReceiveWindowSize(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x1_FlowControlAck(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x2_ConnectionTimeout(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x3_Cookie(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x4_ChannelLifetime(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x5_ClientKeepalive(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x6_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x7_Empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x8_Padding(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0x9_NegativeANCE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0xA_ANCE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0xB_ClientAddress(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0xC_AssociationGroupId(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0xD_Destination(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmds_val0xE_PingTrafficSentNotify(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_ReceiveWindowSize(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_FlowControlAck(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_ConnectionTimeout(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_Cookie(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_ChannelLifetime(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_ClientKeepalive(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_Empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_Padding(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_NegativeANCE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_ANCE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_ClientAddress(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_AssociationGroupId(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_Destination(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_rts_cmds_PingTrafficSentNotify(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_rts_cmd_CommandType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *CommandType);
 static int dcerpc_dissect_element_rts_cmd_Command(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *CommandType);
 static const true_false_string dcerpc_rts_flags_RTS_FLAG_NONE_tfs = {
@@ -526,27 +526,27 @@ const value_string dcerpc_dcerpc_pkt_type_vals[] = {
        { DCERPC_PKT_RTS, "DCERPC_PKT_RTS" },
 { 0, NULL }
 };
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_REQUEST_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_PING_ping(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_RESPONSE_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_FAULT_fault(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_WORKING_working(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_NOCALL_nocall(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_REJECT_reject(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_ACK_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_CL_CANCEL_cl_cancel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_FACK_fack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_CANCEL_ACK_cancel_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_bind(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_ACK_bind_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_NAK_bind_nak(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_ALTER_alter(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_ALTER_RESP_alter_resp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_SHUTDOWN_shutdown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_CO_CANCEL_co_cancel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_ORPHANED_orphaned(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_AUTH3_auth3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_payload_valDCERPC_PKT_RTS_rts(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_ping(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_fault(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_working(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_nocall(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_reject(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_cl_cancel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_fack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_cancel_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_bind(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_bind_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_bind_nak(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_alter(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_alter_resp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_shutdown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_co_cancel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_orphaned(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_auth3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dcerpc_dissect_element_payload_rts(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_ncacn_packet_rpc_vers(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_ncacn_packet_rpc_vers_minor(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_ncacn_packet_ptype(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint8 *ptype);
@@ -800,17 +800,17 @@ dcerpc_dissect_struct_empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 /* IDL: } */
 
 static int
-dcerpc_dissect_element_object_valdefault_empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_object_empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_empty(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_object_valdefault_empty,0);
+       offset = dcerpc_dissect_struct_empty(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_object_empty,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_object_valLIBNDR_FLAG_OBJECT_PRESENT_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_object_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, drep, hf_dcerpc_dcerpc_object_valLIBNDR_FLAG_OBJECT_PRESENT_object, NULL);
+       offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, drep, hf_dcerpc_dcerpc_object_object, NULL);
 
        return offset;
 }
@@ -831,11 +831,11 @@ dcerpc_dissect_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_,
 
        switch(level) {
                default:
-                       offset = dcerpc_dissect_element_object_valdefault_empty(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_object_empty(tvb, offset, pinfo, tree, drep);
                break;
 
                case LIBNDR_FLAG_OBJECT_PRESENT:
-                       offset = dcerpc_dissect_element_object_valLIBNDR_FLAG_OBJECT_PRESENT_object(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_object_object(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -1219,9 +1219,9 @@ dcerpc_dissect_struct_bind_nak_versions(tvbuff_t *tvb _U_, int offset _U_, packe
 /* IDL: } */
 
 static int
-dcerpc_dissect_element_bind_nak_versions_ctr_valDECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED_v(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_bind_nak_versions_ctr_v(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_bind_nak_versions(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_bind_nak_versions_ctr_valDECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED_v,0);
+       offset = dcerpc_dissect_struct_bind_nak_versions(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_bind_nak_versions_ctr_v,0);
 
        return offset;
 }
@@ -1242,7 +1242,7 @@ dcerpc_dissect_bind_nak_versions_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
        switch(level) {
                case DECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED:
-                       offset = dcerpc_dissect_element_bind_nak_versions_ctr_valDECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED_v(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_bind_nak_versions_ctr_v(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -2280,17 +2280,17 @@ dcerpc_dissect_enum_AddressType(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 /* IDL: } */
 
 static int
-dcerpc_dissect_element_ClientAddressType_valRTS_IPV4_ClientAddressIPV4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_ClientAddressType_ClientAddressIPV4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_ipv4address(tvb,offset,pinfo,tree,drep,hf_dcerpc_ClientAddressType_valRTS_IPV4_ClientAddressIPV4,0);
+       offset = dcerpc_dissect_struct_ipv4address(tvb,offset,pinfo,tree,drep,hf_dcerpc_ClientAddressType_ClientAddressIPV4,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_ClientAddressType_valRTS_IPV6_ClientAddressIPV6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_ClientAddressType_ClientAddressIPV6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_ipv6address(tvb,offset,pinfo,tree,drep,hf_dcerpc_ClientAddressType_valRTS_IPV6_ClientAddressIPV6,0);
+       offset = dcerpc_dissect_struct_ipv6address(tvb,offset,pinfo,tree,drep,hf_dcerpc_ClientAddressType_ClientAddressIPV6,0);
 
        return offset;
 }
@@ -2311,11 +2311,11 @@ dcerpc_dissect_ClientAddressType(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
        switch(level) {
                case RTS_IPV4:
-                       offset = dcerpc_dissect_element_ClientAddressType_valRTS_IPV4_ClientAddressIPV4(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_ClientAddressType_ClientAddressIPV4(tvb, offset, pinfo, tree, drep);
                break;
 
                case RTS_IPV6:
-                       offset = dcerpc_dissect_element_ClientAddressType_valRTS_IPV6_ClientAddressIPV6(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_ClientAddressType_ClientAddressIPV6(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -3120,121 +3120,121 @@ dcerpc_dissect_struct_rts_cmd_PingTrafficSentNotify(tvbuff_t *tvb _U_, int offse
 /* IDL: } */
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x0_ReceiveWindowSize(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_ReceiveWindowSize(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_ReceiveWindowSize(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x0_ReceiveWindowSize,0);
+       offset = dcerpc_dissect_struct_rts_cmd_ReceiveWindowSize(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_ReceiveWindowSize,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x1_FlowControlAck(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_FlowControlAck(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_FlowControlAck(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x1_FlowControlAck,0);
+       offset = dcerpc_dissect_struct_rts_cmd_FlowControlAck(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_FlowControlAck,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x2_ConnectionTimeout(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_ConnectionTimeout(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_ConnectionTimeout(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x2_ConnectionTimeout,0);
+       offset = dcerpc_dissect_struct_rts_cmd_ConnectionTimeout(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_ConnectionTimeout,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x3_Cookie(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_Cookie(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_Cookie(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x3_Cookie,0);
+       offset = dcerpc_dissect_struct_rts_cmd_Cookie(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_Cookie,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x4_ChannelLifetime(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_ChannelLifetime(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_ChannelLifetime(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x4_ChannelLifetime,0);
+       offset = dcerpc_dissect_struct_rts_cmd_ChannelLifetime(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_ChannelLifetime,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x5_ClientKeepalive(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_ClientKeepalive(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_ClientKeepalive(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x5_ClientKeepalive,0);
+       offset = dcerpc_dissect_struct_rts_cmd_ClientKeepalive(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_ClientKeepalive,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x6_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_Version(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x6_Version,0);
+       offset = dcerpc_dissect_struct_rts_cmd_Version(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_Version,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x7_Empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_Empty(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_Empty(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x7_Empty,0);
+       offset = dcerpc_dissect_struct_rts_cmd_Empty(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_Empty,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x8_Padding(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_Padding(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_Padding(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x8_Padding,0);
+       offset = dcerpc_dissect_struct_rts_cmd_Padding(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_Padding,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0x9_NegativeANCE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_NegativeANCE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_NegativeANCE(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0x9_NegativeANCE,0);
+       offset = dcerpc_dissect_struct_rts_cmd_NegativeANCE(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_NegativeANCE,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0xA_ANCE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_ANCE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_ANCE(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0xA_ANCE,0);
+       offset = dcerpc_dissect_struct_rts_cmd_ANCE(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_ANCE,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0xB_ClientAddress(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_ClientAddress(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_ClientAddress(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0xB_ClientAddress,0);
+       offset = dcerpc_dissect_struct_rts_cmd_ClientAddress(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_ClientAddress,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0xC_AssociationGroupId(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_AssociationGroupId(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_AssociationGroupId(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0xC_AssociationGroupId,0);
+       offset = dcerpc_dissect_struct_rts_cmd_AssociationGroupId(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_AssociationGroupId,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0xD_Destination(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_Destination(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_Destination(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0xD_Destination,0);
+       offset = dcerpc_dissect_struct_rts_cmd_Destination(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_Destination,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_rts_cmds_val0xE_PingTrafficSentNotify(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_rts_cmds_PingTrafficSentNotify(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts_cmd_PingTrafficSentNotify(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_val0xE_PingTrafficSentNotify,0);
+       offset = dcerpc_dissect_struct_rts_cmd_PingTrafficSentNotify(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_rts_cmds_PingTrafficSentNotify,0);
 
        return offset;
 }
@@ -3255,63 +3255,63 @@ dcerpc_dissect_rts_cmds(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U
 
        switch(level) {
                case 0x0:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x0_ReceiveWindowSize(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_ReceiveWindowSize(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x1:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x1_FlowControlAck(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_FlowControlAck(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x2:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x2_ConnectionTimeout(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_ConnectionTimeout(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x3:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x3_Cookie(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_Cookie(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x4:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x4_ChannelLifetime(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_ChannelLifetime(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x5:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x5_ClientKeepalive(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_ClientKeepalive(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x6:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x6_Version(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_Version(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x7:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x7_Empty(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_Empty(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x8:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x8_Padding(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_Padding(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x9:
-                       offset = dcerpc_dissect_element_rts_cmds_val0x9_NegativeANCE(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_NegativeANCE(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0xA:
-                       offset = dcerpc_dissect_element_rts_cmds_val0xA_ANCE(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_ANCE(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0xB:
-                       offset = dcerpc_dissect_element_rts_cmds_val0xB_ClientAddress(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_ClientAddress(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0xC:
-                       offset = dcerpc_dissect_element_rts_cmds_val0xC_AssociationGroupId(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_AssociationGroupId(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0xD:
-                       offset = dcerpc_dissect_element_rts_cmds_val0xD_Destination(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_Destination(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0xE:
-                       offset = dcerpc_dissect_element_rts_cmds_val0xE_PingTrafficSentNotify(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_rts_cmds_PingTrafficSentNotify(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -3615,169 +3615,169 @@ dcerpc_dissect_enum_pkt_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
 /* IDL: } */
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_REQUEST_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_request(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_REQUEST_request,0);
+       offset = dcerpc_dissect_struct_request(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_request,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_PING_ping(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_ping(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_ping(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_PING_ping,0);
+       offset = dcerpc_dissect_struct_ping(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_ping,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_RESPONSE_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_response(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_RESPONSE_response,0);
+       offset = dcerpc_dissect_struct_response(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_response,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_FAULT_fault(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_fault(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_fault(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_FAULT_fault,0);
+       offset = dcerpc_dissect_struct_fault(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_fault,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_WORKING_working(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_working(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_working(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_WORKING_working,0);
+       offset = dcerpc_dissect_struct_working(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_working,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_NOCALL_nocall(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_nocall(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_fack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_NOCALL_nocall,0);
+       offset = dcerpc_dissect_struct_fack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_nocall,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_REJECT_reject(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_reject(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_fault(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_REJECT_reject,0);
+       offset = dcerpc_dissect_struct_fault(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_reject,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_ACK_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_ack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ACK_ack,0);
+       offset = dcerpc_dissect_struct_ack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_ack,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_CL_CANCEL_cl_cancel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_cl_cancel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_cl_cancel(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CL_CANCEL_cl_cancel,0);
+       offset = dcerpc_dissect_struct_cl_cancel(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_cl_cancel,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_FACK_fack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_fack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_fack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_FACK_fack,0);
+       offset = dcerpc_dissect_struct_fack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_fack,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_CANCEL_ACK_cancel_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_cancel_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_cancel_ack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CANCEL_ACK_cancel_ack,0);
+       offset = dcerpc_dissect_struct_cancel_ack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_cancel_ack,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_bind(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_bind(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_bind(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_bind,0);
+       offset = dcerpc_dissect_struct_bind(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_bind,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_ACK_bind_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_bind_ack(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_bind_ack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_ACK_bind_ack,0);
+       offset = dcerpc_dissect_struct_bind_ack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_bind_ack,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_NAK_bind_nak(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_bind_nak(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_bind_nak(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_NAK_bind_nak,0);
+       offset = dcerpc_dissect_struct_bind_nak(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_bind_nak,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_ALTER_alter(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_alter(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_bind(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ALTER_alter,0);
+       offset = dcerpc_dissect_struct_bind(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_alter,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_ALTER_RESP_alter_resp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_alter_resp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_bind_ack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ALTER_RESP_alter_resp,0);
+       offset = dcerpc_dissect_struct_bind_ack(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_alter_resp,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_SHUTDOWN_shutdown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_shutdown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_shutdown(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_SHUTDOWN_shutdown,0);
+       offset = dcerpc_dissect_struct_shutdown(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_shutdown,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_CO_CANCEL_co_cancel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_co_cancel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_co_cancel(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CO_CANCEL_co_cancel,0);
+       offset = dcerpc_dissect_struct_co_cancel(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_co_cancel,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_ORPHANED_orphaned(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_orphaned(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_orphaned(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ORPHANED_orphaned,0);
+       offset = dcerpc_dissect_struct_orphaned(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_orphaned,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_AUTH3_auth3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_auth3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_auth3(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_AUTH3_auth3,0);
+       offset = dcerpc_dissect_struct_auth3(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_auth3,0);
 
        return offset;
 }
 
 static int
-dcerpc_dissect_element_payload_valDCERPC_PKT_RTS_rts(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dcerpc_dissect_element_payload_rts(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dcerpc_dissect_struct_rts(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_valDCERPC_PKT_RTS_rts,0);
+       offset = dcerpc_dissect_struct_rts(tvb,offset,pinfo,tree,drep,hf_dcerpc_dcerpc_payload_rts,0);
 
        return offset;
 }
@@ -3798,87 +3798,87 @@ dcerpc_dissect_payload(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_
 
        switch(level) {
                case DCERPC_PKT_REQUEST:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_REQUEST_request(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_request(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_PING:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_PING_ping(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_ping(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_RESPONSE:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_RESPONSE_response(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_response(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_FAULT:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_FAULT_fault(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_fault(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_WORKING:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_WORKING_working(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_working(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_NOCALL:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_NOCALL_nocall(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_nocall(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_REJECT:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_REJECT_reject(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_reject(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_ACK:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_ACK_ack(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_ack(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_CL_CANCEL:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_CL_CANCEL_cl_cancel(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_cl_cancel(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_FACK:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_FACK_fack(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_fack(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_CANCEL_ACK:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_CANCEL_ACK_cancel_ack(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_cancel_ack(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_BIND:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_bind(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_bind(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_BIND_ACK:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_ACK_bind_ack(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_bind_ack(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_BIND_NAK:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_BIND_NAK_bind_nak(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_bind_nak(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_ALTER:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_ALTER_alter(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_alter(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_ALTER_RESP:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_ALTER_RESP_alter_resp(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_alter_resp(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_SHUTDOWN:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_SHUTDOWN_shutdown(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_shutdown(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_CO_CANCEL:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_CO_CANCEL_co_cancel(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_co_cancel(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_ORPHANED:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_ORPHANED_orphaned(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_orphaned(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_AUTH3:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_AUTH3_auth3(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_auth3(tvb, offset, pinfo, tree, drep);
                break;
 
                case DCERPC_PKT_RTS:
-                       offset = dcerpc_dissect_element_payload_valDCERPC_PKT_RTS_rts(tvb, offset, pinfo, tree, drep);
+                       offset = dcerpc_dissect_element_payload_rts(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -4303,10 +4303,10 @@ static dcerpc_sub_dissector dcerpc_dissectors[] = {
 void proto_register_dcerpc_dcerpc(void)
 {
        static hf_register_info hf[] = {
-       { &hf_dcerpc_dcerpc_rts_cmds_val0xE_PingTrafficSentNotify,
-         { "Pingtrafficsentnotify", "dcerpc.dcerpc_rts_cmds_val0xE.PingTrafficSentNotify", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_auth_auth_reserved,
          { "Auth Reserved", "dcerpc.dcerpc_auth.auth_reserved", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_cancel_ack,
+         { "Cancel Ack", "dcerpc.dcerpc_payload.cancel_ack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack_secondary_address_size,
          { "Secondary Address Size", "dcerpc.dcerpc_bind_ack.secondary_address_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_request_stub_and_verifier,
@@ -4315,40 +4315,32 @@ void proto_register_dcerpc_dcerpc(void)
          { "Rts Flag Ping", "dcerpc.dcerpc_rts_flags.RTS_FLAG_PING", FT_BOOLEAN, 16, TFS(&dcerpc_rts_flags_RTS_FLAG_PING_tfs), ( 0x0001 ), NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_u,
          { "U", "dcerpc.ncadg_packet.u", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x2_ConnectionTimeout,
-         { "Connectiontimeout", "dcerpc.dcerpc_rts_cmds_val0x2.ConnectionTimeout", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fack_serial_no,
          { "Serial No", "dcerpc.dcerpc_fack.serial_no", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_cl_cancel_version,
          { "Version", "dcerpc.dcerpc_cl_cancel.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x1_FlowControlAck,
-         { "Flowcontrolack", "dcerpc.dcerpc_rts_cmds_val0x1.FlowControlAck", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_orphaned_auth_info,
          { "Auth Info", "dcerpc.dcerpc_orphaned.auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_ack_ctx_result,
          { "Result", "dcerpc.dcerpc_ack_ctx.result", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_response,
+         { "Response", "dcerpc.dcerpc_payload.response", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_co_cancel_auth_info,
          { "Auth Info", "dcerpc.dcerpc_co_cancel.auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_auth_auth_context_id,
          { "Auth Context Id", "dcerpc.dcerpc_auth.auth_context_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_Command,
          { "Command", "dcerpc.dcerpc_rts_cmd.Command", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x8_Padding,
-         { "Padding", "dcerpc.dcerpc_rts_cmds_val0x8.Padding", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_fack,
+         { "Fack", "dcerpc.dcerpc_payload.fack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_fragnum,
          { "Fragnum", "dcerpc.ncadg_packet.fragnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_pfc_flags,
          { "Pfc Flags", "dcerpc.ncadg_packet.pfc_flags", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncacn_packet_u,
          { "U", "dcerpc.ncacn_packet.u", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x4_ChannelLifetime,
-         { "Channellifetime", "dcerpc.dcerpc_rts_cmds_val0x4.ChannelLifetime", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_REQUEST_request,
-         { "Request", "dcerpc.dcerpc_payload_valDCERPC_PKT_REQUEST.request", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_nak_versions_num_versions,
          { "Num Versions", "dcerpc.dcerpc_bind_nak_versions.num_versions", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0xB_ClientAddress,
-         { "Clientaddress", "dcerpc.dcerpc_rts_cmds_val0xB.ClientAddress", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncacn_packet_auth_length,
          { "Auth Length", "dcerpc.ncacn_packet.auth_length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_ihint,
@@ -4359,12 +4351,10 @@ void proto_register_dcerpc_dcerpc(void)
          { "Conformancecount", "dcerpc.dcerpc_rts_cmd_Padding.ConformanceCount", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_request_object,
          { "Object", "dcerpc.dcerpc_request.object", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_AUTH3_auth3,
-         { "Auth3", "dcerpc.dcerpc_payload_valDCERPC_PKT_AUTH3.auth3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncacn_packet_call_id,
          { "Call Id", "dcerpc.ncacn_packet.call_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_ACK_bind_ack,
-         { "Bind Ack", "dcerpc.dcerpc_payload_valDCERPC_PKT_BIND_ACK.bind_ack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_nocall,
+         { "Nocall", "dcerpc.dcerpc_payload.nocall", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_request_alloc_hint,
          { "Alloc Hint", "dcerpc.dcerpc_request.alloc_hint", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ctx_list,
@@ -4377,50 +4367,44 @@ void proto_register_dcerpc_dcerpc(void)
          { "Num Contexts", "dcerpc.dcerpc_bind.num_contexts", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_cl_cancel_id,
          { "Id", "dcerpc.dcerpc_cl_cancel.id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_auth3,
+         { "Auth3", "dcerpc.dcerpc_payload.auth3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_ack_ctx_syntax,
          { "Syntax", "dcerpc.dcerpc_ack_ctx.syntax", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_ClientAddressType_valRTS_IPV4_ClientAddressIPV4,
-         { "Clientaddressipv4", "dcerpc.ClientAddressType_valRTS_IPV4.ClientAddressIPV4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack_max_xmit_frag,
          { "Max Xmit Frag", "dcerpc.dcerpc_bind_ack.max_xmit_frag", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x6_Version,
-         { "Version", "dcerpc.dcerpc_rts_cmds_val0x6.Version", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fack_max_frag_size,
          { "Max Frag Size", "dcerpc.dcerpc_fack.max_frag_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_orphaned__pad,
          { " Pad", "dcerpc.dcerpc_orphaned._pad", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack_max_recv_frag,
          { "Max Recv Frag", "dcerpc.dcerpc_bind_ack.max_recv_frag", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x0_ReceiveWindowSize,
-         { "Receivewindowsize", "dcerpc.dcerpc_rts_cmds_val0x0.ReceiveWindowSize", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CANCEL_ACK_cancel_ack,
-         { "Cancel Ack", "dcerpc.dcerpc_payload_valDCERPC_PKT_CANCEL_ACK.cancel_ack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_ClientAddressType_valRTS_IPV6_ClientAddressIPV6,
-         { "Clientaddressipv6", "dcerpc.ClientAddressType_valRTS_IPV6.ClientAddressIPV6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_SHUTDOWN_shutdown,
-         { "Shutdown", "dcerpc.dcerpc_payload_valDCERPC_PKT_SHUTDOWN.shutdown", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_PingTrafficSentNotify,
+         { "Pingtrafficsentnotify", "dcerpc.dcerpc_rts_cmds.PingTrafficSentNotify", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_co_cancel,
+         { "Co Cancel", "dcerpc.dcerpc_payload.co_cancel", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_Padding,
+         { "Padding", "dcerpc.dcerpc_rts_cmds.Padding", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_ncadg_flags,
          { "Ncadg Flags", "dcerpc.ncadg_packet.ncadg_flags", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_ctx_list_context_id,
          { "Context Id", "dcerpc.dcerpc_ctx_list.context_id", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x5_ClientKeepalive,
-         { "Clientkeepalive", "dcerpc.dcerpc_rts_cmds_val0x5.ClientKeepalive", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_FlowControlAck_Ack,
          { "Ack", "dcerpc.dcerpc_rts_cmd_FlowControlAck.Ack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x7_Empty,
-         { "Empty", "dcerpc.dcerpc_rts_cmds_val0x7.Empty", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_max_recv_frag,
          { "Max Recv Frag", "dcerpc.dcerpc_bind.max_recv_frag", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fack_selack_size,
          { "Selack Size", "dcerpc.dcerpc_fack.selack_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_request,
+         { "Request", "dcerpc.dcerpc_payload.request", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack_secondary_address,
          { "Secondary Address", "dcerpc.dcerpc_bind_ack.secondary_address", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_response__pad,
          { " Pad", "dcerpc.dcerpc_response._pad", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_PingTrafficSentNotify_PingTrafficSent,
          { "Pingtrafficsent", "dcerpc.dcerpc_rts_cmd_PingTrafficSentNotify.PingTrafficSent", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_FAULT_fault,
-         { "Fault", "dcerpc.dcerpc_payload_valDCERPC_PKT_FAULT.fault", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_orphaned,
+         { "Orphaned", "dcerpc.dcerpc_payload.orphaned", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_NumberOfCommands,
          { "Numberofcommands", "dcerpc.dcerpc_rts.NumberOfCommands", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_ClientKeepalive_ClientKeepalive,
@@ -4431,22 +4415,28 @@ void proto_register_dcerpc_dcerpc(void)
          { "Rpc Vers Minor", "dcerpc.ncacn_packet.rpc_vers_minor", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_Commands,
          { "Commands", "dcerpc.dcerpc_rts.Commands", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_bind_nak,
+         { "Bind Nak", "dcerpc.dcerpc_payload.bind_nak", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_bind_ack,
+         { "Bind Ack", "dcerpc.dcerpc_payload.bind_ack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fault__pad,
          { " Pad", "dcerpc.dcerpc_fault._pad", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_cancel_ack_id,
          { "Id", "dcerpc.dcerpc_cancel_ack.id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_alter_resp,
+         { "Alter Resp", "dcerpc.dcerpc_payload.alter_resp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_ConnectionTimeout,
+         { "Connectiontimeout", "dcerpc.dcerpc_rts_cmds.ConnectionTimeout", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_object_object,
+         { "Object", "dcerpc.dcerpc_object.object", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_reject,
+         { "Reject", "dcerpc.dcerpc_payload.reject", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_Destination_ForwardDestination,
          { "Forwarddestination", "dcerpc.dcerpc_rts_cmd_Destination.ForwardDestination", FT_UINT32, BASE_DEC, VALS(dcerpc_ForwardDestination_vals), 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fack_selack,
          { "Selack", "dcerpc.dcerpc_fack.selack", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_PING_ping,
-         { "Ping", "dcerpc.dcerpc_payload_valDCERPC_PKT_PING.ping", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_RESPONSE_response,
-         { "Response", "dcerpc.dcerpc_payload_valDCERPC_PKT_RESPONSE.response", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_EOF,
          { "Rts Flag Eof", "dcerpc.dcerpc_rts_flags.RTS_FLAG_EOF", FT_BOOLEAN, 16, TFS(&dcerpc_rts_flags_RTS_FLAG_EOF_tfs), ( 0x0020 ), NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0xD_Destination,
-         { "Destination", "dcerpc.dcerpc_rts_cmds_val0xD.Destination", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ClientAddress_Padding,
          { "Padding", "dcerpc.ClientAddress.Padding", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_assoc_group_id,
@@ -4457,12 +4447,12 @@ void proto_register_dcerpc_dcerpc(void)
          { "Alloc Hint", "dcerpc.dcerpc_response.alloc_hint", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fack_window_size,
          { "Window Size", "dcerpc.dcerpc_fack.window_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_ping,
+         { "Ping", "dcerpc.dcerpc_payload.ping", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_auth_auth_pad_length,
          { "Auth Pad Length", "dcerpc.dcerpc_auth.auth_pad_length", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_serial_low,
          { "Serial Low", "dcerpc.ncadg_packet.serial_low", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_NOCALL_nocall,
-         { "Nocall", "dcerpc.dcerpc_payload_valDCERPC_PKT_NOCALL.nocall", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_opnum,
          { "Opnum", "dcerpc.ncadg_packet.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_response_stub_and_verifier,
@@ -4471,26 +4461,28 @@ void proto_register_dcerpc_dcerpc(void)
          { "Bytesreceived", "dcerpc.FlowControlAcknowledgment.BytesReceived", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_auth_auth_type,
          { "Auth Type", "dcerpc.dcerpc_auth.auth_type", FT_UINT8, BASE_DEC, VALS(dcerpc_dcerpc_AuthType_vals), 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ACK_ack,
-         { "Ack", "dcerpc.dcerpc_payload_valDCERPC_PKT_ACK.ack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_object_empty,
+         { "Empty", "dcerpc.dcerpc_object.empty", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_request_opnum,
          { "Opnum", "dcerpc.dcerpc_request.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_seq_num,
          { "Seq Num", "dcerpc.ncadg_packet.seq_num", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_cancel_ack_version,
          { "Version", "dcerpc.dcerpc_cancel_ack.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x9_NegativeANCE,
-         { "Negativeance", "dcerpc.dcerpc_rts_cmds_val0x9.NegativeANCE", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_IN_CHANNEL,
          { "Rts Flag In Channel", "dcerpc.dcerpc_rts_flags.RTS_FLAG_IN_CHANNEL", FT_BOOLEAN, 16, TFS(&dcerpc_rts_flags_RTS_FLAG_IN_CHANNEL_tfs), ( 0x0008 ), NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_ClientKeepalive,
+         { "Clientkeepalive", "dcerpc.dcerpc_rts_cmds.ClientKeepalive", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_cl_cancel,
+         { "Cl Cancel", "dcerpc.dcerpc_payload.cl_cancel", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack_num_results,
          { "Num Results", "dcerpc.dcerpc_bind_ack.num_results", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_FlowControlAcknowledgment_ChannelCookie,
          { "Channelcookie", "dcerpc.FlowControlAcknowledgment.ChannelCookie", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_AssociationGroupId_AssociationGroupId,
          { "Associationgroupid", "dcerpc.dcerpc_rts_cmd_AssociationGroupId.AssociationGroupId", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_RTS_rts,
-         { "Rts", "dcerpc.dcerpc_payload_valDCERPC_PKT_RTS.rts", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_ClientAddress,
+         { "Clientaddress", "dcerpc.dcerpc_rts_cmds.ClientAddress", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_co_cancel__pad,
          { " Pad", "dcerpc.dcerpc_co_cancel._pad", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_request__pad,
@@ -4503,34 +4495,36 @@ void proto_register_dcerpc_dcerpc(void)
          { "Versions", "dcerpc.dcerpc_bind_nak_versions.versions", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_activity,
          { "Activity", "dcerpc.ncadg_packet.activity", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CL_CANCEL_cl_cancel,
-         { "Cl Cancel", "dcerpc.dcerpc_payload_valDCERPC_PKT_CL_CANCEL.cl_cancel", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_ChannelLifetime_ChannelLifetime,
          { "Channellifetime", "dcerpc.dcerpc_rts_cmd_ChannelLifetime.ChannelLifetime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_auth_proto,
          { "Auth Proto", "dcerpc.ncadg_packet.auth_proto", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack_assoc_group_id,
          { "Assoc Group Id", "dcerpc.dcerpc_bind_ack.assoc_group_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ALTER_RESP_alter_resp,
-         { "Alter Resp", "dcerpc.dcerpc_payload_valDCERPC_PKT_ALTER_RESP.alter_resp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fault_context_id,
          { "Context Id", "dcerpc.dcerpc_fault.context_id", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_rts,
+         { "Rts", "dcerpc.dcerpc_payload.rts", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncacn_packet_drep,
          { "Drep", "dcerpc.ncacn_packet.drep", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_ack,
+         { "Ack", "dcerpc.dcerpc_payload.ack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_nak_reject_reason,
          { "Reject Reason", "dcerpc.dcerpc_bind_nak.reject_reason", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_cancel_ack_server_is_accepting,
          { "Server Is Accepting", "dcerpc.dcerpc_cancel_ack.server_is_accepting", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_bind,
+         { "Bind", "dcerpc.dcerpc_payload.bind", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_ClientAddress_ClientAddress,
          { "Clientaddress", "dcerpc.dcerpc_rts_cmd_ClientAddress.ClientAddress", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_auth3_auth_info,
          { "Auth Info", "dcerpc.dcerpc_auth3.auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_object_valLIBNDR_FLAG_OBJECT_PRESENT_object,
-         { "Object", "dcerpc.dcerpc_object_valLIBNDR_FLAG_OBJECT_PRESENT.object", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_FlowControlAcknowledgment_AvailableWindow,
          { "Availablewindow", "dcerpc.FlowControlAcknowledgment.AvailableWindow", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncacn_packet_frag_length,
          { "Frag Length", "dcerpc.ncacn_packet.frag_length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_alter,
+         { "Alter", "dcerpc.dcerpc_payload.alter", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack__pad1,
          { " Pad1", "dcerpc.dcerpc_bind_ack._pad1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_ctx_list_num_transfer_syntaxes,
@@ -4539,18 +4533,14 @@ void proto_register_dcerpc_dcerpc(void)
          { "Auth Info", "dcerpc.dcerpc_bind.auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_auth_auth_level,
          { "Auth Level", "dcerpc.dcerpc_auth.auth_level", FT_UINT8, BASE_DEC, VALS(dcerpc_dcerpc_AuthLevel_vals), 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_WORKING_working,
-         { "Working", "dcerpc.dcerpc_payload_valDCERPC_PKT_WORKING.working", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_ptype,
          { "Ptype", "dcerpc.ncadg_packet.ptype", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_CO_CANCEL_co_cancel,
-         { "Co Cancel", "dcerpc.dcerpc_payload_valDCERPC_PKT_CO_CANCEL.co_cancel", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncacn_packet_ptype,
          { "Ptype", "dcerpc.ncacn_packet.ptype", FT_UINT8, BASE_DEC, VALS(dcerpc_dcerpc_pkt_type_vals), 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fault_status,
          { "Status", "dcerpc.dcerpc_fault.status", FT_UINT32, BASE_DEC, VALS(dcerpc_dcerpc_nca_status_vals), 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0xA_ANCE,
-         { "Ance", "dcerpc.dcerpc_rts_cmds_val0xA.ANCE", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_fault,
+         { "Fault", "dcerpc.dcerpc_payload.fault", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_serial_high,
          { "Serial High", "dcerpc.ncadg_packet.serial_high", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_auth3__pad,
@@ -4561,24 +4551,26 @@ void proto_register_dcerpc_dcerpc(void)
          { "Clientaddress", "dcerpc.ClientAddress.ClientAddress", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_Cookie_Cookie,
          { "Cookie", "dcerpc.dcerpc_rts_cmd_Cookie.Cookie", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_FACK_fack,
-         { "Fack", "dcerpc.dcerpc_payload_valDCERPC_PKT_FACK.fack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_REJECT_reject,
-         { "Reject", "dcerpc.dcerpc_payload_valDCERPC_PKT_REJECT.reject", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_ChannelLifetime,
+         { "Channellifetime", "dcerpc.dcerpc_rts_cmds.ChannelLifetime", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_ConnectionTimeout_ConnectionTimeout,
          { "Connectiontimeout", "dcerpc.dcerpc_rts_cmd_ConnectionTimeout.ConnectionTimeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_ReceiveWindowSize,
+         { "Receivewindowsize", "dcerpc.dcerpc_rts_cmds.ReceiveWindowSize", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_iface_version,
          { "Iface Version", "dcerpc.ncadg_packet.iface_version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_ECHO,
          { "Rts Flag Echo", "dcerpc.dcerpc_rts_flags.RTS_FLAG_ECHO", FT_BOOLEAN, 16, TFS(&dcerpc_rts_flags_RTS_FLAG_ECHO_tfs), ( 0x0040 ), NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0x3_Cookie,
-         { "Cookie", "dcerpc.dcerpc_rts_cmds_val0x3.Cookie", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_bind_nak_versions_ctr_valDECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED_v,
-         { "V", "dcerpc.dcerpc_bind_nak_versions_ctr_valDECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_bind_nak_versions_ctr_v,
+         { "V", "dcerpc.dcerpc_bind_nak_versions_ctr.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_ClientAddressType_ClientAddressIPV6,
+         { "Clientaddressipv6", "dcerpc.ClientAddressType.ClientAddressIPV6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_NegativeANCE,
+         { "Negativeance", "dcerpc.dcerpc_rts_cmds.NegativeANCE", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fack_max_tdsu,
          { "Max Tdsu", "dcerpc.dcerpc_fack.max_tdsu", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_NAK_bind_nak,
-         { "Bind Nak", "dcerpc.dcerpc_payload_valDCERPC_PKT_BIND_NAK.bind_nak", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_AssociationGroupId,
+         { "Associationgroupid", "dcerpc.dcerpc_rts_cmds.AssociationGroupId", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_CommandType,
          { "Commandtype", "dcerpc.dcerpc_rts_cmd.CommandType", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncacn_packet_rpc_vers,
@@ -4589,6 +4581,10 @@ void proto_register_dcerpc_dcerpc(void)
          { "Context Id", "dcerpc.dcerpc_request.context_id", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_ahint,
          { "Ahint", "dcerpc.ncadg_packet.ahint", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_shutdown,
+         { "Shutdown", "dcerpc.dcerpc_payload.shutdown", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_ClientAddressType_ClientAddressIPV4,
+         { "Clientaddressipv4", "dcerpc.ClientAddressType.ClientAddressIPV4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_OUT_CHANNEL,
          { "Rts Flag Out Channel", "dcerpc.dcerpc_rts_flags.RTS_FLAG_OUT_CHANNEL", FT_BOOLEAN, 16, TFS(&dcerpc_rts_flags_RTS_FLAG_OUT_CHANNEL_tfs), ( 0x0010 ), NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack_ctx_list,
@@ -4597,30 +4593,34 @@ void proto_register_dcerpc_dcerpc(void)
          { "Version", "dcerpc.dcerpc_fack.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_Version_Version,
          { "Version", "dcerpc.dcerpc_rts_cmd_Version.Version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_rts_cmds_val0xC_AssociationGroupId,
-         { "Associationgroupid", "dcerpc.dcerpc_rts_cmds_val0xC.AssociationGroupId", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_cmd_ReceiveWindowSize_ReceiveWindowSize,
          { "Receivewindowsize", "dcerpc.dcerpc_rts_cmd_ReceiveWindowSize.ReceiveWindowSize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_rpc_vers,
          { "Rpc Vers", "dcerpc.ncadg_packet.rpc_vers", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_payload_working,
+         { "Working", "dcerpc.dcerpc_payload.working", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_RTSCookie_Cookie,
          { "Cookie", "dcerpc.RTSCookie.Cookie", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_Flags,
          { "Flags", "dcerpc.dcerpc_rts.Flags", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ALTER_alter,
-         { "Alter", "dcerpc.dcerpc_payload_valDCERPC_PKT_ALTER.alter", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_Version,
+         { "Version", "dcerpc.dcerpc_rts_cmds.Version", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ClientAddress_AddressType,
          { "Addresstype", "dcerpc.ClientAddress.AddressType", FT_UINT32, BASE_DEC, VALS(dcerpc_AddressType_vals), 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_response_context_id,
          { "Context Id", "dcerpc.dcerpc_response.context_id", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_BIND_bind,
-         { "Bind", "dcerpc.dcerpc_payload_valDCERPC_PKT_BIND.bind", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_drep,
          { "Drep", "dcerpc.ncadg_packet.drep", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_ncadg_packet_len,
          { "Len", "dcerpc.ncadg_packet.len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_Empty,
+         { "Empty", "dcerpc.dcerpc_rts_cmds.Empty", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_Destination,
+         { "Destination", "dcerpc.dcerpc_rts_cmds.Destination", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_opnum,
          { "Operation", "dcerpc.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_ANCE,
+         { "Ance", "dcerpc.dcerpc_rts_cmds.ANCE", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_fault_alloc_hint,
          { "Alloc Hint", "dcerpc.dcerpc_fault.alloc_hint", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_rts_flags_RTS_FLAG_NONE,
@@ -4637,10 +4637,10 @@ void proto_register_dcerpc_dcerpc(void)
          { "Rts Flag Recycle Channel", "dcerpc.dcerpc_rts_flags.RTS_FLAG_RECYCLE_CHANNEL", FT_BOOLEAN, 16, TFS(&dcerpc_rts_flags_RTS_FLAG_RECYCLE_CHANNEL_tfs), ( 0x0004 ), NULL, HFILL }},
        { &hf_dcerpc_ncacn_packet_pfc_flags,
          { "Pfc Flags", "dcerpc.ncacn_packet.pfc_flags", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_object_valdefault_empty,
-         { "Empty", "dcerpc.dcerpc_object_valdefault.empty", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dcerpc_dcerpc_payload_valDCERPC_PKT_ORPHANED_orphaned,
-         { "Orphaned", "dcerpc.dcerpc_payload_valDCERPC_PKT_ORPHANED.orphaned", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_FlowControlAck,
+         { "Flowcontrolack", "dcerpc.dcerpc_rts_cmds.FlowControlAck", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dcerpc_dcerpc_rts_cmds_Cookie,
+         { "Cookie", "dcerpc.dcerpc_rts_cmds.Cookie", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_ctx_list_transfer_syntaxes,
          { "Transfer Syntaxes", "dcerpc.dcerpc_ctx_list.transfer_syntaxes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dcerpc_dcerpc_bind_ack_auth_info,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-dfs.c b/bin/default/librpc/gen_ndr/packet-dcerpc-dfs.c
index 62d7397f5bece11e9a54aaf8557e73bddf3297b9..15c97396e9cef7fc2cd9b38d916db65f3dcefc88 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-dfs.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-dfs.c
@@ -72,7 +72,6 @@ static gint hf_netdfs_dfs_Add_share = -1;
 static gint hf_netdfs_dfs_FlushFtTable_rootshare = -1;
 static gint hf_netdfs_dfs_AddFtRoot_dfsname = -1;
 static gint hf_netdfs_dfs_Info105_comment = -1;
-static gint hf_netdfs_dfs_EnumInfo_val6_info6 = -1;
 static gint hf_netdfs_dfs_Info5_guid = -1;
 static gint hf_netdfs_dfs_Info5_path = -1;
 static gint hf_netdfs_dfs_Add_path = -1;
@@ -83,20 +82,22 @@ static gint hf_netdfs_dfs_Remove_dfs_entry_path = -1;
 static gint hf_netdfs_dfs_Info105_state = -1;
 static gint hf_netdfs_dfs_RemoveFtRoot_dfsname = -1;
 static gint hf_netdfs_dfs_UnknownStruct_unknown2 = -1;
+static gint hf_netdfs_dfs_Info_info7 = -1;
 static gint hf_netdfs_dfs_EnumArray3_s = -1;
+static gint hf_netdfs_dfs_Info_info4 = -1;
 static gint hf_netdfs_dfs_Info106_priority = -1;
 static gint hf_netdfs_dfs_SetDcAddress_ttl = -1;
 static gint hf_netdfs_dfs_Info5_timeout = -1;
 static gint hf_netdfs_dfs_EnumEx_info = -1;
 static gint hf_netdfs_dfs_Info6_entry_path = -1;
-static gint hf_netdfs_dfs_EnumInfo_val5_info5 = -1;
+static gint hf_netdfs_dfs_Info_info6 = -1;
 static gint hf_netdfs_dfs_EnumStruct_level = -1;
-static gint hf_netdfs_dfs_EnumInfo_val300_info300 = -1;
 static gint hf_netdfs_dfs_Info6_state = -1;
 static gint hf_netdfs_dfs_StorageInfo_server = -1;
 static gint hf_netdfs_dfs_SetInfo_dfs_entry_path = -1;
 static gint hf_netdfs_dfs_Info4_timeout = -1;
 static gint hf_netdfs_dfs_SetInfo_sharename = -1;
+static gint hf_netdfs_dfs_Info_info1 = -1;
 static gint hf_netdfs_dfs_Add_comment = -1;
 static gint hf_netdfs_dfs_Info105_property_flags = -1;
 static gint hf_netdfs_dfs_EnumEx_bufsize = -1;
@@ -104,10 +105,12 @@ static gint hf_netdfs_dfs_AddStdRootForced_store = -1;
 static gint hf_netdfs_dfs_Info2_num_stores = -1;
 static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_STANDALONE = -1;
 static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_OFFLINE = -1;
+static gint hf_netdfs_dfs_EnumInfo_info4 = -1;
 static gint hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_CLUSTER_ENABLED = -1;
 static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_AD_BLOB = -1;
 static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_INCONSISTENT = -1;
 static gint hf_netdfs_dfs_AddFtRoot_servername = -1;
+static gint hf_netdfs_dfs_Info_info101 = -1;
 static gint hf_netdfs_dfs_AddFtRoot_unknown2 = -1;
 static gint hf_netdfs_dfs_GetDcAddress_is_root = -1;
 static gint hf_netdfs_dfs_GetInfo_sharename = -1;
@@ -116,9 +119,9 @@ static gint hf_netdfs_dfs_Info6_num_stores = -1;
 static gint hf_netdfs_dfs_Add_flags = -1;
 static gint hf_netdfs_dfs_EnumArray5_count = -1;
 static gint hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_SITE_COSTING = -1;
-static gint hf_netdfs_dfs_Info_val6_info6 = -1;
+static gint hf_netdfs_dfs_Info_info103 = -1;
+static gint hf_netdfs_dfs_Info_info106 = -1;
 static gint hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ACTIVE = -1;
-static gint hf_netdfs_dfs_EnumInfo_val3_info3 = -1;
 static gint hf_netdfs_dfs_Info7_generation_guid = -1;
 static gint hf_netdfs_dfs_Info5_comment = -1;
 static gint hf_netdfs_dfs_Info5_flags = -1;
@@ -131,46 +134,41 @@ static gint hf_netdfs_dfs_GetDcAddress_ttl = -1;
 static gint hf_netdfs_dfs_RemoveStdRoot_flags = -1;
 static gint hf_netdfs_dfs_RemoveFtRoot_rootshare = -1;
 static gint hf_netdfs_dfs_EnumArray2_count = -1;
+static gint hf_netdfs_dfs_Info_info105 = -1;
 static gint hf_netdfs_dfs_AddStdRootForced_rootshare = -1;
 static gint hf_netdfs_dfs_GetInfo_info = -1;
 static gint hf_netdfs_dfs_Info3_path = -1;
-static gint hf_netdfs_dfs_Info_val2_info2 = -1;
 static gint hf_netdfs_dfs_EnumEx_dfs_name = -1;
-static gint hf_netdfs_dfs_EnumInfo_val1_info1 = -1;
 static gint hf_netdfs_dfs_Info4_state = -1;
 static gint hf_netdfs_dfs_EnumArray200_s = -1;
+static gint hf_netdfs_dfs_Info_info0 = -1;
 static gint hf_netdfs_dfs_AddFtRoot_flags = -1;
 static gint hf_netdfs_dfs_EnumArray300_s = -1;
 static gint hf_netdfs_dfs_Info4_path = -1;
-static gint hf_netdfs_dfs_Info_val0_info0 = -1;
 static gint hf_netdfs_dfs_EnumArray5_s = -1;
 static gint hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ONLINE = -1;
 static gint hf_netdfs_dfs_RemoveStdRoot_servername = -1;
-static gint hf_netdfs_dfs_Info_val106_info106 = -1;
 static gint hf_netdfs_dfs_Add_server = -1;
-static gint hf_netdfs_dfs_Info_val5_info5 = -1;
-static gint hf_netdfs_dfs_Info_val102_info102 = -1;
+static gint hf_netdfs_dfs_EnumInfo_info1 = -1;
 static gint hf_netdfs_dfs_Info300_dom_root = -1;
 static gint hf_netdfs_dfs_EnumEx_level = -1;
 static gint hf_netdfs_dfs_EnumArray200_count = -1;
-static gint hf_netdfs_dfs_Info_val104_info104 = -1;
 static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_ONLINE = -1;
 static gint hf_netdfs_dfs_Info106_state = -1;
 static gint hf_netdfs_dfs_GetManagerVersion_version = -1;
 static gint hf_netdfs_dfs_SetInfo_level = -1;
-static gint hf_netdfs_dfs_Info_val101_info101 = -1;
 static gint hf_netdfs_dfs_Enum_total = -1;
+static gint hf_netdfs_dfs_EnumInfo_info6 = -1;
 static gint hf_netdfs_dfs_SetDcAddress_flags = -1;
 static gint hf_netdfs_dfs_AddFtRoot_dfs_config_dn = -1;
 static gint hf_netdfs_dfs_RemoveFtRoot_unknown = -1;
 static gint hf_netdfs_dfs_Info1_path = -1;
 static gint hf_netdfs_dfs_SetInfo_servername = -1;
 static gint hf_netdfs_dfs_FlushFtTable_servername = -1;
-static gint hf_netdfs_dfs_Info_val100_info100 = -1;
 static gint hf_netdfs_dfs_EnumArray6_count = -1;
 static gint hf_netdfs_dfs_Info103_flags = -1;
 static gint hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_ROOT_SCALABILITY = -1;
-static gint hf_netdfs_dfs_Info_val1_info1 = -1;
+static gint hf_netdfs_dfs_EnumInfo_info3 = -1;
 static gint hf_netdfs_dfs_GetInfo_servername = -1;
 static gint hf_netdfs_dfs_Info4_guid = -1;
 static gint hf_netdfs_dfs_EnumArray4_s = -1;
@@ -180,28 +178,33 @@ static gint hf_netdfs_dfs_Info4_comment = -1;
 static gint hf_netdfs_dfs_AddFtRoot_rootshare = -1;
 static gint hf_netdfs_dfs_Info3_state = -1;
 static gint hf_netdfs_dfs_EnumArray1_s = -1;
+static gint hf_netdfs_dfs_Info_info2 = -1;
 static gint hf_netdfs_dfs_SetDcAddress_server_fullname = -1;
 static gint hf_netdfs_dfs_Enum_info = -1;
 static gint hf_netdfs_dfs_EnumStruct_e = -1;
+static gint hf_netdfs_dfs_Info_info5 = -1;
 static gint hf_netdfs_dfs_EnumArray300_count = -1;
 static gint hf_netdfs_dfs_ManagerInitialize_servername = -1;
 static gint hf_netdfs_dfs_RemoveStdRoot_rootshare = -1;
+static gint hf_netdfs_dfs_Info_info100 = -1;
 static gint hf_netdfs_dfs_Info100_comment = -1;
 static gint hf_netdfs_dfs_AddFtRoot_unknown1 = -1;
 static gint hf_netdfs_opnum = -1;
+static gint hf_netdfs_dfs_EnumInfo_info300 = -1;
 static gint hf_netdfs_dfs_Info6_flags = -1;
 static gint hf_netdfs_dfs_Info102_timeout = -1;
+static gint hf_netdfs_dfs_EnumInfo_info200 = -1;
 static gint hf_netdfs_dfs_Info3_num_stores = -1;
 static gint hf_netdfs_dfs_StorageInfo_state = -1;
 static gint hf_netdfs_dfs_EnumArray1_count = -1;
 static gint hf_netdfs_dfs_GetDcAddress_server_fullname = -1;
+static gint hf_netdfs_dfs_Info_info3 = -1;
 static gint hf_netdfs_dfs_AddStdRootForced_comment = -1;
 static gint hf_netdfs_dfs_Info104_priority = -1;
 static gint hf_netdfs_dfs_AddStdRoot_comment = -1;
 static gint hf_netdfs_dfs_Info3_comment = -1;
 static gint hf_netdfs_dfs_UnknownStruct_unknown1 = -1;
 static gint hf_netdfs_dfs_Info6_timeout = -1;
-static gint hf_netdfs_dfs_Info_val105_info105 = -1;
 static gint hf_netdfs_dfs_Info101_state = -1;
 static gint hf_netdfs_dfs_AddStdRootForced_servername = -1;
 static gint hf_netdfs_dfs_Info2_path = -1;
@@ -212,29 +215,27 @@ static gint hf_netdfs_dfs_Enum_bufsize = -1;
 static gint hf_netdfs_dfs_GetInfo_level = -1;
 static gint hf_netdfs_werror = -1;
 static gint hf_netdfs_dfs_AddFtRoot_comment = -1;
-static gint hf_netdfs_dfs_Info_val7_info7 = -1;
+static gint hf_netdfs_dfs_Info_info102 = -1;
 static gint hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_TARGET_FAILBACK = -1;
-static gint hf_netdfs_dfs_EnumInfo_val200_info200 = -1;
-static gint hf_netdfs_dfs_Info_val3_info3 = -1;
 static gint hf_netdfs_dfs_EnumArray3_count = -1;
 static gint hf_netdfs_dfs_ManagerInitialize_flags = -1;
 static gint hf_netdfs_dfs_SetInfo_info = -1;
 static gint hf_netdfs_dfs_Info4_stores = -1;
+static gint hf_netdfs_dfs_Info_info104 = -1;
 static gint hf_netdfs_dfs_RemoveFtRoot_dns_servername = -1;
 static gint hf_netdfs_dfs_StorageInfo2_target_priority = -1;
 static gint hf_netdfs_dfs_Target_Priority_target_priority_rank = -1;
 static gint hf_netdfs_dfs_Info5_num_stores = -1;
 static gint hf_netdfs_dfs_AddStdRoot_flags = -1;
-static gint hf_netdfs_dfs_EnumInfo_val2_info2 = -1;
 static gint hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_OK = -1;
 static gint hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_OFFLINE = -1;
 static gint hf_netdfs_dfs_EnumArray2_s = -1;
-static gint hf_netdfs_dfs_Info_val103_info103 = -1;
+static gint hf_netdfs_dfs_EnumInfo_info5 = -1;
 static gint hf_netdfs_dfs_EnumEx_total = -1;
 static gint hf_netdfs_dfs_AddStdRoot_servername = -1;
+static gint hf_netdfs_dfs_EnumInfo_info2 = -1;
 static gint hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_INSITE_REFERRALS = -1;
 static gint hf_netdfs_dfs_Info6_guid = -1;
-static gint hf_netdfs_dfs_Info_val4_info4 = -1;
 static gint hf_netdfs_dfs_Info2_comment = -1;
 static gint hf_netdfs_dfs_Info2_state = -1;
 static gint hf_netdfs_dfs_Info300_flavor = -1;
@@ -249,7 +250,6 @@ static gint hf_netdfs_dfs_AddStdRoot_rootshare = -1;
 static gint hf_netdfs_dfs_Info4_num_stores = -1;
 static gint hf_netdfs_dfs_RemoveFtRoot_servername = -1;
 static gint hf_netdfs_dfs_GetDcAddress_servername = -1;
-static gint hf_netdfs_dfs_EnumInfo_val4_info4 = -1;
 static gint hf_netdfs_dfs_Info105_property_flag_mask = -1;
 
 static gint proto_dcerpc_netdfs = -1;
@@ -420,36 +420,36 @@ const value_string netdfs_dfs_VolumeFlavor_vals[] = {
 static int netdfs_dissect_element_dfs_Info300_flavor(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netdfs_dissect_element_dfs_Info300_dom_root(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netdfs_dissect_element_dfs_Info300_dom_root_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val5_info5_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val6_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val7_info7_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val100_info100(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val100_info100_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val101_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val101_info101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val102_info102(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val102_info102_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val103_info103(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val103_info103_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val104_info104(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val104_info104_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val105_info105(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val105_info105_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val106_info106(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_Info_val106_info106_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info5_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info7_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info100(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info100_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info102(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info102_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info103(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info103_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info104(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info104_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info105(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info105_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info106(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_Info_info106_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netdfs_dissect_element_dfs_EnumArray1_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netdfs_dissect_element_dfs_EnumArray1_s(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netdfs_dissect_element_dfs_EnumArray1_s_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -482,22 +482,22 @@ static int netdfs_dissect_element_dfs_EnumArray300_count(tvbuff_t *tvb _U_, int
 static int netdfs_dissect_element_dfs_EnumArray300_s(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netdfs_dissect_element_dfs_EnumArray300_s_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netdfs_dissect_element_dfs_EnumArray300_s__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_EnumInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_EnumInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_EnumInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_EnumInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_EnumInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_EnumInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_EnumInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_EnumInfo_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_EnumInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_EnumInfo_val5_info5_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_EnumInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_EnumInfo_val6_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_EnumInfo_val200_info200(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_EnumInfo_val200_info200_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_EnumInfo_val300_info300(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_EnumInfo_val300_info300_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_EnumInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_EnumInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_EnumInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_EnumInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_EnumInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_EnumInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_EnumInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_EnumInfo_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_EnumInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_EnumInfo_info5_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_EnumInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_EnumInfo_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_EnumInfo_info200(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_EnumInfo_info200_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_EnumInfo_info300(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netdfs_dissect_element_dfs_EnumInfo_info300_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netdfs_dissect_element_dfs_EnumStruct_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int netdfs_dissect_element_dfs_EnumStruct_e(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int netdfs_dissect_element_dfs_UnknownStruct_unknown1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -2409,241 +2409,241 @@ netdfs_dissect_struct_dfs_Info300(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-netdfs_dissect_element_dfs_Info_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info0(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, netdfs_dissect_element_dfs_Info_val0_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (dfs_Info0)",hf_netdfs_dfs_Info_val0_info0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_Info_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (dfs_Info0)",hf_netdfs_dfs_Info_info0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_Info0(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_val0_info0,0);
+       offset = netdfs_dissect_struct_dfs_Info0(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_info0,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info1(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, netdfs_dissect_element_dfs_Info_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (dfs_Info1)",hf_netdfs_dfs_Info_val1_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_Info_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (dfs_Info1)",hf_netdfs_dfs_Info_info1);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_Info1(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_val1_info1,0);
+       offset = netdfs_dissect_struct_dfs_Info1(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_info1,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info2(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, netdfs_dissect_element_dfs_Info_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (dfs_Info2)",hf_netdfs_dfs_Info_val2_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_Info_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (dfs_Info2)",hf_netdfs_dfs_Info_info2);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_Info2(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_val2_info2,0);
+       offset = netdfs_dissect_struct_dfs_Info2(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_info2,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info3(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, netdfs_dissect_element_dfs_Info_val3_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (dfs_Info3)",hf_netdfs_dfs_Info_val3_info3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_Info_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (dfs_Info3)",hf_netdfs_dfs_Info_info3);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_Info3(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_val3_info3,0);
+       offset = netdfs_dissect_struct_dfs_Info3(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_info3,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info4(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, netdfs_dissect_element_dfs_Info_val4_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (dfs_Info4)",hf_netdfs_dfs_Info_val4_info4);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_Info_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (dfs_Info4)",hf_netdfs_dfs_Info_info4);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_Info4(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_val4_info4,0);
+       offset = netdfs_dissect_struct_dfs_Info4(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_info4,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info5(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, netdfs_dissect_element_dfs_Info_val5_info5_, NDR_POINTER_UNIQUE, "Pointer to Info5 (dfs_Info5)",hf_netdfs_dfs_Info_val5_info5);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_Info_info5_, NDR_POINTER_UNIQUE, "Pointer to Info5 (dfs_Info5)",hf_netdfs_dfs_Info_info5);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val5_info5_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info5_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_Info5(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_val5_info5,0);
+       offset = netdfs_dissect_struct_dfs_Info5(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_info5,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info6(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, netdfs_dissect_element_dfs_Info_val6_info6_, NDR_POINTER_UNIQUE, "Pointer to Info6 (dfs_Info6)",hf_netdfs_dfs_Info_val6_info6);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_Info_info6_, NDR_POINTER_UNIQUE, "Pointer to Info6 (dfs_Info6)",hf_netdfs_dfs_Info_info6);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val6_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_Info6(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_val6_info6,0);
+       offset = netdfs_dissect_struct_dfs_Info6(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_info6,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info7(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, netdfs_dissect_element_dfs_Info_val7_info7_, NDR_POINTER_UNIQUE, "Pointer to Info7 (dfs_Info7)",hf_netdfs_dfs_Info_val7_info7);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_Info_info7_, NDR_POINTER_UNIQUE, "Pointer to Info7 (dfs_Info7)",hf_netdfs_dfs_Info_info7);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val7_info7_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info7_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_Info7(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_val7_info7,0);
+       offset = netdfs_dissect_struct_dfs_Info7(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_info7,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val100_info100(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info100(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, netdfs_dissect_element_dfs_Info_val100_info100_, NDR_POINTER_UNIQUE, "Pointer to Info100 (dfs_Info100)",hf_netdfs_dfs_Info_val100_info100);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_Info_info100_, NDR_POINTER_UNIQUE, "Pointer to Info100 (dfs_Info100)",hf_netdfs_dfs_Info_info100);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val100_info100_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info100_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_Info100(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_val100_info100,0);
+       offset = netdfs_dissect_struct_dfs_Info100(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_info100,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val101_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info101(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, netdfs_dissect_element_dfs_Info_val101_info101_, NDR_POINTER_UNIQUE, "Pointer to Info101 (dfs_Info101)",hf_netdfs_dfs_Info_val101_info101);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_Info_info101_, NDR_POINTER_UNIQUE, "Pointer to Info101 (dfs_Info101)",hf_netdfs_dfs_Info_info101);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val101_info101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_Info101(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_val101_info101,0);
+       offset = netdfs_dissect_struct_dfs_Info101(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_info101,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val102_info102(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info102(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, netdfs_dissect_element_dfs_Info_val102_info102_, NDR_POINTER_UNIQUE, "Pointer to Info102 (dfs_Info102)",hf_netdfs_dfs_Info_val102_info102);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_Info_info102_, NDR_POINTER_UNIQUE, "Pointer to Info102 (dfs_Info102)",hf_netdfs_dfs_Info_info102);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val102_info102_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info102_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_Info102(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_val102_info102,0);
+       offset = netdfs_dissect_struct_dfs_Info102(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_info102,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val103_info103(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info103(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, netdfs_dissect_element_dfs_Info_val103_info103_, NDR_POINTER_UNIQUE, "Pointer to Info103 (dfs_Info103)",hf_netdfs_dfs_Info_val103_info103);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_Info_info103_, NDR_POINTER_UNIQUE, "Pointer to Info103 (dfs_Info103)",hf_netdfs_dfs_Info_info103);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val103_info103_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info103_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_Info103(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_val103_info103,0);
+       offset = netdfs_dissect_struct_dfs_Info103(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_info103,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val104_info104(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info104(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, netdfs_dissect_element_dfs_Info_val104_info104_, NDR_POINTER_UNIQUE, "Pointer to Info104 (dfs_Info104)",hf_netdfs_dfs_Info_val104_info104);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_Info_info104_, NDR_POINTER_UNIQUE, "Pointer to Info104 (dfs_Info104)",hf_netdfs_dfs_Info_info104);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val104_info104_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info104_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_Info104(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_val104_info104,0);
+       offset = netdfs_dissect_struct_dfs_Info104(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_info104,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val105_info105(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info105(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, netdfs_dissect_element_dfs_Info_val105_info105_, NDR_POINTER_UNIQUE, "Pointer to Info105 (dfs_Info105)",hf_netdfs_dfs_Info_val105_info105);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_Info_info105_, NDR_POINTER_UNIQUE, "Pointer to Info105 (dfs_Info105)",hf_netdfs_dfs_Info_info105);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val105_info105_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info105_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_Info105(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_val105_info105,0);
+       offset = netdfs_dissect_struct_dfs_Info105(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_info105,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val106_info106(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info106(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, netdfs_dissect_element_dfs_Info_val106_info106_, NDR_POINTER_UNIQUE, "Pointer to Info106 (dfs_Info106)",hf_netdfs_dfs_Info_val106_info106);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_Info_info106_, NDR_POINTER_UNIQUE, "Pointer to Info106 (dfs_Info106)",hf_netdfs_dfs_Info_info106);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_Info_val106_info106_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_Info_info106_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_Info106(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_val106_info106,0);
+       offset = netdfs_dissect_struct_dfs_Info106(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_Info_info106,0);
 
        return offset;
 }
@@ -2667,63 +2667,63 @@ netdfs_dissect_dfs_Info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U
 
        switch(level) {
                case 0:
-                       offset = netdfs_dissect_element_dfs_Info_val0_info0(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_Info_info0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = netdfs_dissect_element_dfs_Info_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_Info_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = netdfs_dissect_element_dfs_Info_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_Info_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = netdfs_dissect_element_dfs_Info_val3_info3(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_Info_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = netdfs_dissect_element_dfs_Info_val4_info4(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_Info_info4(tvb, offset, pinfo, tree, drep);
                break;
 
                case 5:
-                       offset = netdfs_dissect_element_dfs_Info_val5_info5(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_Info_info5(tvb, offset, pinfo, tree, drep);
                break;
 
                case 6:
-                       offset = netdfs_dissect_element_dfs_Info_val6_info6(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_Info_info6(tvb, offset, pinfo, tree, drep);
                break;
 
                case 7:
-                       offset = netdfs_dissect_element_dfs_Info_val7_info7(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_Info_info7(tvb, offset, pinfo, tree, drep);
                break;
 
                case 100:
-                       offset = netdfs_dissect_element_dfs_Info_val100_info100(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_Info_info100(tvb, offset, pinfo, tree, drep);
                break;
 
                case 101:
-                       offset = netdfs_dissect_element_dfs_Info_val101_info101(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_Info_info101(tvb, offset, pinfo, tree, drep);
                break;
 
                case 102:
-                       offset = netdfs_dissect_element_dfs_Info_val102_info102(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_Info_info102(tvb, offset, pinfo, tree, drep);
                break;
 
                case 103:
-                       offset = netdfs_dissect_element_dfs_Info_val103_info103(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_Info_info103(tvb, offset, pinfo, tree, drep);
                break;
 
                case 104:
-                       offset = netdfs_dissect_element_dfs_Info_val104_info104(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_Info_info104(tvb, offset, pinfo, tree, drep);
                break;
 
                case 105:
-                       offset = netdfs_dissect_element_dfs_Info_val105_info105(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_Info_info105(tvb, offset, pinfo, tree, drep);
                break;
 
                case 106:
-                       offset = netdfs_dissect_element_dfs_Info_val106_info106(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_Info_info106(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -3304,129 +3304,129 @@ netdfs_dissect_struct_dfs_EnumArray300(tvbuff_t *tvb _U_, int offset _U_, packet
 /* IDL: } */
 
 static int
-netdfs_dissect_element_dfs_EnumInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_EnumInfo_info1(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, netdfs_dissect_element_dfs_EnumInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (dfs_EnumArray1)",hf_netdfs_dfs_EnumInfo_val1_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_EnumInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (dfs_EnumArray1)",hf_netdfs_dfs_EnumInfo_info1);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_EnumInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_EnumInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_EnumArray1(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_EnumInfo_val1_info1,0);
+       offset = netdfs_dissect_struct_dfs_EnumArray1(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_EnumInfo_info1,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_EnumInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_EnumInfo_info2(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, netdfs_dissect_element_dfs_EnumInfo_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (dfs_EnumArray2)",hf_netdfs_dfs_EnumInfo_val2_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_EnumInfo_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (dfs_EnumArray2)",hf_netdfs_dfs_EnumInfo_info2);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_EnumInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_EnumInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_EnumArray2(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_EnumInfo_val2_info2,0);
+       offset = netdfs_dissect_struct_dfs_EnumArray2(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_EnumInfo_info2,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_EnumInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_EnumInfo_info3(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, netdfs_dissect_element_dfs_EnumInfo_val3_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (dfs_EnumArray3)",hf_netdfs_dfs_EnumInfo_val3_info3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_EnumInfo_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (dfs_EnumArray3)",hf_netdfs_dfs_EnumInfo_info3);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_EnumInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_EnumInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_EnumArray3(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_EnumInfo_val3_info3,0);
+       offset = netdfs_dissect_struct_dfs_EnumArray3(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_EnumInfo_info3,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_EnumInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_EnumInfo_info4(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, netdfs_dissect_element_dfs_EnumInfo_val4_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (dfs_EnumArray4)",hf_netdfs_dfs_EnumInfo_val4_info4);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_EnumInfo_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (dfs_EnumArray4)",hf_netdfs_dfs_EnumInfo_info4);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_EnumInfo_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_EnumInfo_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_EnumArray4(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_EnumInfo_val4_info4,0);
+       offset = netdfs_dissect_struct_dfs_EnumArray4(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_EnumInfo_info4,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_EnumInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_EnumInfo_info5(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, netdfs_dissect_element_dfs_EnumInfo_val5_info5_, NDR_POINTER_UNIQUE, "Pointer to Info5 (dfs_EnumArray5)",hf_netdfs_dfs_EnumInfo_val5_info5);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_EnumInfo_info5_, NDR_POINTER_UNIQUE, "Pointer to Info5 (dfs_EnumArray5)",hf_netdfs_dfs_EnumInfo_info5);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_EnumInfo_val5_info5_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_EnumInfo_info5_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_EnumArray5(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_EnumInfo_val5_info5,0);
+       offset = netdfs_dissect_struct_dfs_EnumArray5(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_EnumInfo_info5,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_EnumInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_EnumInfo_info6(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, netdfs_dissect_element_dfs_EnumInfo_val6_info6_, NDR_POINTER_UNIQUE, "Pointer to Info6 (dfs_EnumArray6)",hf_netdfs_dfs_EnumInfo_val6_info6);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_EnumInfo_info6_, NDR_POINTER_UNIQUE, "Pointer to Info6 (dfs_EnumArray6)",hf_netdfs_dfs_EnumInfo_info6);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_EnumInfo_val6_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_EnumInfo_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_EnumArray6(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_EnumInfo_val6_info6,0);
+       offset = netdfs_dissect_struct_dfs_EnumArray6(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_EnumInfo_info6,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_EnumInfo_val200_info200(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_EnumInfo_info200(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, netdfs_dissect_element_dfs_EnumInfo_val200_info200_, NDR_POINTER_UNIQUE, "Pointer to Info200 (dfs_EnumArray200)",hf_netdfs_dfs_EnumInfo_val200_info200);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_EnumInfo_info200_, NDR_POINTER_UNIQUE, "Pointer to Info200 (dfs_EnumArray200)",hf_netdfs_dfs_EnumInfo_info200);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_EnumInfo_val200_info200_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_EnumInfo_info200_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_EnumArray200(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_EnumInfo_val200_info200,0);
+       offset = netdfs_dissect_struct_dfs_EnumArray200(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_EnumInfo_info200,0);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_EnumInfo_val300_info300(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_EnumInfo_info300(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, netdfs_dissect_element_dfs_EnumInfo_val300_info300_, NDR_POINTER_UNIQUE, "Pointer to Info300 (dfs_EnumArray300)",hf_netdfs_dfs_EnumInfo_val300_info300);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netdfs_dissect_element_dfs_EnumInfo_info300_, NDR_POINTER_UNIQUE, "Pointer to Info300 (dfs_EnumArray300)",hf_netdfs_dfs_EnumInfo_info300);
 
        return offset;
 }
 
 static int
-netdfs_dissect_element_dfs_EnumInfo_val300_info300_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netdfs_dissect_element_dfs_EnumInfo_info300_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netdfs_dissect_struct_dfs_EnumArray300(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_EnumInfo_val300_info300,0);
+       offset = netdfs_dissect_struct_dfs_EnumArray300(tvb,offset,pinfo,tree,drep,hf_netdfs_dfs_EnumInfo_info300,0);
 
        return offset;
 }
@@ -3450,35 +3450,35 @@ netdfs_dissect_dfs_EnumInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 
        switch(level) {
                case 1:
-                       offset = netdfs_dissect_element_dfs_EnumInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_EnumInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = netdfs_dissect_element_dfs_EnumInfo_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_EnumInfo_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = netdfs_dissect_element_dfs_EnumInfo_val3_info3(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_EnumInfo_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = netdfs_dissect_element_dfs_EnumInfo_val4_info4(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_EnumInfo_info4(tvb, offset, pinfo, tree, drep);
                break;
 
                case 5:
-                       offset = netdfs_dissect_element_dfs_EnumInfo_val5_info5(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_EnumInfo_info5(tvb, offset, pinfo, tree, drep);
                break;
 
                case 6:
-                       offset = netdfs_dissect_element_dfs_EnumInfo_val6_info6(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_EnumInfo_info6(tvb, offset, pinfo, tree, drep);
                break;
 
                case 200:
-                       offset = netdfs_dissect_element_dfs_EnumInfo_val200_info200(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_EnumInfo_info200(tvb, offset, pinfo, tree, drep);
                break;
 
                case 300:
-                       offset = netdfs_dissect_element_dfs_EnumInfo_val300_info300(tvb, offset, pinfo, tree, drep);
+                       offset = netdfs_dissect_element_dfs_EnumInfo_info300(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -5312,8 +5312,6 @@ void proto_register_dcerpc_netdfs(void)
          { "Dfsname", "netdfs.dfs_AddFtRoot.dfsname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info105_comment,
          { "Comment", "netdfs.dfs_Info105.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_EnumInfo_val6_info6,
-         { "Info6", "netdfs.dfs_EnumInfo_val6.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info5_guid,
          { "Guid", "netdfs.dfs_Info5.guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info5_path,
@@ -5334,8 +5332,12 @@ void proto_register_dcerpc_netdfs(void)
          { "Dfsname", "netdfs.dfs_RemoveFtRoot.dfsname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_UnknownStruct_unknown2,
          { "Unknown2", "netdfs.dfs_UnknownStruct.unknown2", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_Info_info7,
+         { "Info7", "netdfs.dfs_Info.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_EnumArray3_s,
          { "S", "netdfs.dfs_EnumArray3.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_Info_info4,
+         { "Info4", "netdfs.dfs_Info.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info106_priority,
          { "Priority", "netdfs.dfs_Info106.priority", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_SetDcAddress_ttl,
@@ -5346,12 +5348,10 @@ void proto_register_dcerpc_netdfs(void)
          { "Info", "netdfs.dfs_EnumEx.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info6_entry_path,
          { "Entry Path", "netdfs.dfs_Info6.entry_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_EnumInfo_val5_info5,
-         { "Info5", "netdfs.dfs_EnumInfo_val5.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_Info_info6,
+         { "Info6", "netdfs.dfs_Info.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_EnumStruct_level,
          { "Level", "netdfs.dfs_EnumStruct.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_EnumInfo_val300_info300,
-         { "Info300", "netdfs.dfs_EnumInfo_val300.info300", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info6_state,
          { "State", "netdfs.dfs_Info6.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_StorageInfo_server,
@@ -5362,6 +5362,8 @@ void proto_register_dcerpc_netdfs(void)
          { "Timeout", "netdfs.dfs_Info4.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_SetInfo_sharename,
          { "Sharename", "netdfs.dfs_SetInfo.sharename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_Info_info1,
+         { "Info1", "netdfs.dfs_Info.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Add_comment,
          { "Comment", "netdfs.dfs_Add.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info105_property_flags,
@@ -5376,6 +5378,8 @@ void proto_register_dcerpc_netdfs(void)
          { "Dfs Volume State Standalone", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_STANDALONE", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_STANDALONE_tfs), ( DFS_VOLUME_FLAVOR_STANDALONE ), NULL, HFILL }},
        { &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_OFFLINE,
          { "Dfs Volume State Offline", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_OFFLINE", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_OFFLINE_tfs), ( 0x3 ), NULL, HFILL }},
+       { &hf_netdfs_dfs_EnumInfo_info4,
+         { "Info4", "netdfs.dfs_EnumInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_CLUSTER_ENABLED,
          { "Dfs Property Flag Cluster Enabled", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_CLUSTER_ENABLED", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_CLUSTER_ENABLED_tfs), ( 0x10 ), NULL, HFILL }},
        { &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_AD_BLOB,
@@ -5384,6 +5388,8 @@ void proto_register_dcerpc_netdfs(void)
          { "Dfs Volume State Inconsistent", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_INCONSISTENT", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_INCONSISTENT_tfs), ( 0x2 ), NULL, HFILL }},
        { &hf_netdfs_dfs_AddFtRoot_servername,
          { "Servername", "netdfs.dfs_AddFtRoot.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_Info_info101,
+         { "Info101", "netdfs.dfs_Info.info101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_AddFtRoot_unknown2,
          { "Unknown2", "netdfs.dfs_AddFtRoot.unknown2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_GetDcAddress_is_root,
@@ -5400,12 +5406,12 @@ void proto_register_dcerpc_netdfs(void)
          { "Count", "netdfs.dfs_EnumArray5.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_SITE_COSTING,
          { "Dfs Property Flag Site Costing", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_SITE_COSTING", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_SITE_COSTING_tfs), ( 0x04 ), NULL, HFILL }},
-       { &hf_netdfs_dfs_Info_val6_info6,
-         { "Info6", "netdfs.dfs_Info_val6.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_Info_info103,
+         { "Info103", "netdfs.dfs_Info.info103", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_Info_info106,
+         { "Info106", "netdfs.dfs_Info.info106", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ACTIVE,
          { "Dfs Storage State Active", "netdfs.dfs_StorageState.DFS_STORAGE_STATE_ACTIVE", FT_BOOLEAN, 32, TFS(&dfs_StorageState_DFS_STORAGE_STATE_ACTIVE_tfs), ( 4 ), NULL, HFILL }},
-       { &hf_netdfs_dfs_EnumInfo_val3_info3,
-         { "Info3", "netdfs.dfs_EnumInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info7_generation_guid,
          { "Generation Guid", "netdfs.dfs_Info7.generation_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info5_comment,
@@ -5430,52 +5436,44 @@ void proto_register_dcerpc_netdfs(void)
          { "Rootshare", "netdfs.dfs_RemoveFtRoot.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_EnumArray2_count,
          { "Count", "netdfs.dfs_EnumArray2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_Info_info105,
+         { "Info105", "netdfs.dfs_Info.info105", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_AddStdRootForced_rootshare,
          { "Rootshare", "netdfs.dfs_AddStdRootForced.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_GetInfo_info,
          { "Info", "netdfs.dfs_GetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info3_path,
          { "Path", "netdfs.dfs_Info3.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_Info_val2_info2,
-         { "Info2", "netdfs.dfs_Info_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_EnumEx_dfs_name,
          { "Dfs Name", "netdfs.dfs_EnumEx.dfs_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_EnumInfo_val1_info1,
-         { "Info1", "netdfs.dfs_EnumInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info4_state,
          { "State", "netdfs.dfs_Info4.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_EnumArray200_s,
          { "S", "netdfs.dfs_EnumArray200.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_Info_info0,
+         { "Info0", "netdfs.dfs_Info.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_AddFtRoot_flags,
          { "Flags", "netdfs.dfs_AddFtRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_EnumArray300_s,
          { "S", "netdfs.dfs_EnumArray300.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info4_path,
          { "Path", "netdfs.dfs_Info4.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_Info_val0_info0,
-         { "Info0", "netdfs.dfs_Info_val0.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_EnumArray5_s,
          { "S", "netdfs.dfs_EnumArray5.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ONLINE,
          { "Dfs Storage State Online", "netdfs.dfs_StorageState.DFS_STORAGE_STATE_ONLINE", FT_BOOLEAN, 32, TFS(&dfs_StorageState_DFS_STORAGE_STATE_ONLINE_tfs), ( 2 ), NULL, HFILL }},
        { &hf_netdfs_dfs_RemoveStdRoot_servername,
          { "Servername", "netdfs.dfs_RemoveStdRoot.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_Info_val106_info106,
-         { "Info106", "netdfs.dfs_Info_val106.info106", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Add_server,
          { "Server", "netdfs.dfs_Add.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_Info_val5_info5,
-         { "Info5", "netdfs.dfs_Info_val5.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_Info_val102_info102,
-         { "Info102", "netdfs.dfs_Info_val102.info102", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_EnumInfo_info1,
+         { "Info1", "netdfs.dfs_EnumInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info300_dom_root,
          { "Dom Root", "netdfs.dfs_Info300.dom_root", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_EnumEx_level,
          { "Level", "netdfs.dfs_EnumEx.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_EnumArray200_count,
          { "Count", "netdfs.dfs_EnumArray200.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_Info_val104_info104,
-         { "Info104", "netdfs.dfs_Info_val104.info104", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_ONLINE,
          { "Dfs Volume State Online", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_ONLINE", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_ONLINE_tfs), ( 0x4 ), NULL, HFILL }},
        { &hf_netdfs_dfs_Info106_state,
@@ -5484,10 +5482,10 @@ void proto_register_dcerpc_netdfs(void)
          { "Version", "netdfs.dfs_GetManagerVersion.version", FT_UINT32, BASE_DEC, VALS(netdfs_dfs_ManagerVersion_vals), 0, NULL, HFILL }},
        { &hf_netdfs_dfs_SetInfo_level,
          { "Level", "netdfs.dfs_SetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_Info_val101_info101,
-         { "Info101", "netdfs.dfs_Info_val101.info101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Enum_total,
          { "Total", "netdfs.dfs_Enum.total", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_EnumInfo_info6,
+         { "Info6", "netdfs.dfs_EnumInfo.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_SetDcAddress_flags,
          { "Flags", "netdfs.dfs_SetDcAddress.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_AddFtRoot_dfs_config_dn,
@@ -5500,16 +5498,14 @@ void proto_register_dcerpc_netdfs(void)
          { "Servername", "netdfs.dfs_SetInfo.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_FlushFtTable_servername,
          { "Servername", "netdfs.dfs_FlushFtTable.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_Info_val100_info100,
-         { "Info100", "netdfs.dfs_Info_val100.info100", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_EnumArray6_count,
          { "Count", "netdfs.dfs_EnumArray6.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info103_flags,
          { "Flags", "netdfs.dfs_Info103.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_ROOT_SCALABILITY,
          { "Dfs Property Flag Root Scalability", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_ROOT_SCALABILITY", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_ROOT_SCALABILITY_tfs), ( 0x02 ), NULL, HFILL }},
-       { &hf_netdfs_dfs_Info_val1_info1,
-         { "Info1", "netdfs.dfs_Info_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_EnumInfo_info3,
+         { "Info3", "netdfs.dfs_EnumInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_GetInfo_servername,
          { "Servername", "netdfs.dfs_GetInfo.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info4_guid,
@@ -5528,28 +5524,38 @@ void proto_register_dcerpc_netdfs(void)
          { "State", "netdfs.dfs_Info3.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_EnumArray1_s,
          { "S", "netdfs.dfs_EnumArray1.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_Info_info2,
+         { "Info2", "netdfs.dfs_Info.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_SetDcAddress_server_fullname,
          { "Server Fullname", "netdfs.dfs_SetDcAddress.server_fullname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Enum_info,
          { "Info", "netdfs.dfs_Enum.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_EnumStruct_e,
          { "E", "netdfs.dfs_EnumStruct.e", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_Info_info5,
+         { "Info5", "netdfs.dfs_Info.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_EnumArray300_count,
          { "Count", "netdfs.dfs_EnumArray300.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_ManagerInitialize_servername,
          { "Servername", "netdfs.dfs_ManagerInitialize.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_RemoveStdRoot_rootshare,
          { "Rootshare", "netdfs.dfs_RemoveStdRoot.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_Info_info100,
+         { "Info100", "netdfs.dfs_Info.info100", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info100_comment,
          { "Comment", "netdfs.dfs_Info100.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_AddFtRoot_unknown1,
          { "Unknown1", "netdfs.dfs_AddFtRoot.unknown1", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_opnum,
          { "Operation", "netdfs.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_EnumInfo_info300,
+         { "Info300", "netdfs.dfs_EnumInfo.info300", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info6_flags,
          { "Flags", "netdfs.dfs_Info6.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info102_timeout,
          { "Timeout", "netdfs.dfs_Info102.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_EnumInfo_info200,
+         { "Info200", "netdfs.dfs_EnumInfo.info200", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info3_num_stores,
          { "Num Stores", "netdfs.dfs_Info3.num_stores", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_StorageInfo_state,
@@ -5558,6 +5564,8 @@ void proto_register_dcerpc_netdfs(void)
          { "Count", "netdfs.dfs_EnumArray1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_GetDcAddress_server_fullname,
          { "Server Fullname", "netdfs.dfs_GetDcAddress.server_fullname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_Info_info3,
+         { "Info3", "netdfs.dfs_Info.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_AddStdRootForced_comment,
          { "Comment", "netdfs.dfs_AddStdRootForced.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info104_priority,
@@ -5570,8 +5578,6 @@ void proto_register_dcerpc_netdfs(void)
          { "Unknown1", "netdfs.dfs_UnknownStruct.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info6_timeout,
          { "Timeout", "netdfs.dfs_Info6.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_Info_val105_info105,
-         { "Info105", "netdfs.dfs_Info_val105.info105", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info101_state,
          { "State", "netdfs.dfs_Info101.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_AddStdRootForced_servername,
@@ -5592,14 +5598,10 @@ void proto_register_dcerpc_netdfs(void)
          { "Windows Error", "netdfs.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, NULL, HFILL }},
        { &hf_netdfs_dfs_AddFtRoot_comment,
          { "Comment", "netdfs.dfs_AddFtRoot.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_Info_val7_info7,
-         { "Info7", "netdfs.dfs_Info_val7.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_Info_info102,
+         { "Info102", "netdfs.dfs_Info.info102", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_TARGET_FAILBACK,
          { "Dfs Property Flag Target Failback", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_TARGET_FAILBACK", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_TARGET_FAILBACK_tfs), ( 0x08 ), NULL, HFILL }},
-       { &hf_netdfs_dfs_EnumInfo_val200_info200,
-         { "Info200", "netdfs.dfs_EnumInfo_val200.info200", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_Info_val3_info3,
-         { "Info3", "netdfs.dfs_Info_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_EnumArray3_count,
          { "Count", "netdfs.dfs_EnumArray3.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_ManagerInitialize_flags,
@@ -5608,6 +5610,8 @@ void proto_register_dcerpc_netdfs(void)
          { "Info", "netdfs.dfs_SetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info4_stores,
          { "Stores", "netdfs.dfs_Info4.stores", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_Info_info104,
+         { "Info104", "netdfs.dfs_Info.info104", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_RemoveFtRoot_dns_servername,
          { "Dns Servername", "netdfs.dfs_RemoveFtRoot.dns_servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_StorageInfo2_target_priority,
@@ -5618,26 +5622,24 @@ void proto_register_dcerpc_netdfs(void)
          { "Num Stores", "netdfs.dfs_Info5.num_stores", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_AddStdRoot_flags,
          { "Flags", "netdfs.dfs_AddStdRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_EnumInfo_val2_info2,
-         { "Info2", "netdfs.dfs_EnumInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_OK,
          { "Dfs Volume State Ok", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_OK", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_OK_tfs), ( 0x1 ), NULL, HFILL }},
        { &hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_OFFLINE,
          { "Dfs Storage State Offline", "netdfs.dfs_StorageState.DFS_STORAGE_STATE_OFFLINE", FT_BOOLEAN, 32, TFS(&dfs_StorageState_DFS_STORAGE_STATE_OFFLINE_tfs), ( 1 ), NULL, HFILL }},
        { &hf_netdfs_dfs_EnumArray2_s,
          { "S", "netdfs.dfs_EnumArray2.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_Info_val103_info103,
-         { "Info103", "netdfs.dfs_Info_val103.info103", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_EnumInfo_info5,
+         { "Info5", "netdfs.dfs_EnumInfo.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_EnumEx_total,
          { "Total", "netdfs.dfs_EnumEx.total", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_AddStdRoot_servername,
          { "Servername", "netdfs.dfs_AddStdRoot.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netdfs_dfs_EnumInfo_info2,
+         { "Info2", "netdfs.dfs_EnumInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_INSITE_REFERRALS,
          { "Dfs Property Flag Insite Referrals", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_INSITE_REFERRALS", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_INSITE_REFERRALS_tfs), ( 0x01 ), NULL, HFILL }},
        { &hf_netdfs_dfs_Info6_guid,
          { "Guid", "netdfs.dfs_Info6.guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_Info_val4_info4,
-         { "Info4", "netdfs.dfs_Info_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info2_comment,
          { "Comment", "netdfs.dfs_Info2.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info2_state,
@@ -5666,8 +5668,6 @@ void proto_register_dcerpc_netdfs(void)
          { "Servername", "netdfs.dfs_RemoveFtRoot.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_GetDcAddress_servername,
          { "Servername", "netdfs.dfs_GetDcAddress.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netdfs_dfs_EnumInfo_val4_info4,
-         { "Info4", "netdfs.dfs_EnumInfo_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netdfs_dfs_Info105_property_flag_mask,
          { "Property Flag Mask", "netdfs.dfs_Info105.property_flag_mask", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        };

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-dfsblobs.c b/bin/default/librpc/gen_ndr/packet-dcerpc-dfsblobs.c
index bd392035184984c73f3794c3e47e4830d59d1118..95be91772189622231e2aeccdbbd579080bd19fc 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-dfsblobs.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-dfsblobs.c
@@ -45,6 +45,7 @@ static gint ett_dfsblobs_dfs_GetDFSReferral_in = -1;
 
 
 /* Header field declarations */
+static gint hf_dfsblobs_dfs_referral_version_v4 = -1;
 static gint hf_dfsblobs_dfs_domain_referral_special_name = -1;
 static gint hf_dfsblobs_dfs_referral_v3_ttl = -1;
 static gint hf_dfsblobs_dfs_referral_v2_server_type = -1;
@@ -55,39 +56,38 @@ static gint hf_dfsblobs_dfs_referral_v2_size = -1;
 static gint hf_dfsblobs_dfs_referral_v3_server_type = -1;
 static gint hf_dfsblobs_DFS_HEADER_FLAG_DFS_HEADER_FLAG_REFERAL_SVR = -1;
 static gint hf_dfsblobs_dfs_referral_resp_path_consumed = -1;
-static gint hf_dfsblobs_dfs_referral_version_val1_v1 = -1;
+static gint hf_dfsblobs_dfs_referral_version_v3 = -1;
 static gint hf_dfsblobs_dfs_referral_v3_referrals = -1;
-static gint hf_dfsblobs_dfs_padding_val16_value = -1;
 static gint hf_dfsblobs_dfs_referral_v1_entry_flags = -1;
 static gint hf_dfsblobs_dfs_referral_resp_referral_entries = -1;
 static gint hf_dfsblobs_dfs_referral_type_referral = -1;
+static gint hf_dfsblobs_dfs_referral_r1 = -1;
+static gint hf_dfsblobs_dfs_referral_version_v1 = -1;
 static gint hf_dfsblobs_dfs_GetDFSReferral_req = -1;
 static gint hf_dfsblobs_dfs_referral_v1_share_name = -1;
 static gint hf_dfsblobs_dfs_referral_v2_netw_address = -1;
 static gint hf_dfsblobs_dfs_domain_referral_expanded_names_ = -1;
 static gint hf_dfsblobs_dfs_referral_type_version = -1;
-static gint hf_dfsblobs_dfs_referral_val2_r2 = -1;
 static gint hf_dfsblobs_dfs_domain_referral_nb_expanded_names = -1;
 static gint hf_dfsblobs_opnum = -1;
 static gint hf_dfsblobs_dfs_GetDFSReferral_in_max_referral_level = -1;
 static gint hf_dfsblobs_dfs_referral_v2_DFS_alt_path = -1;
 static gint hf_dfsblobs_dfs_domain_referral_expanded_names = -1;
-static gint hf_dfsblobs_dfs_referral_version_val3_v3 = -1;
+static gint hf_dfsblobs_dfs_referral_r2 = -1;
 static gint hf_dfsblobs_dfs_referral_v3_service_site_guid = -1;
 static gint hf_dfsblobs_dfs_GetDFSReferral_in_servername = -1;
 static gint hf_dfsblobs_dfs_referral_resp_nb_referrals = -1;
 static gint hf_dfsblobs_dfs_normal_referral_DFS_alt_path = -1;
-static gint hf_dfsblobs_dfs_referral_version_val4_v4 = -1;
-static gint hf_dfsblobs_dfs_referral_version_val2_v2 = -1;
 static gint hf_dfsblobs_DFS_HEADER_FLAG_DFS_HEADER_FLAG_STORAGE_SVR = -1;
 static gint hf_dfsblobs_dfs_referral_v1_size = -1;
+static gint hf_dfsblobs_dfs_padding_value = -1;
 static gint hf_dfsblobs_dfs_referral_resp_header_flags = -1;
 static gint hf_dfsblobs_dfs_normal_referral_DFS_path = -1;
-static gint hf_dfsblobs_dfs_referral_val0_r1 = -1;
 static gint hf_dfsblobs_dfs_referral_v3_entry_flags = -1;
 static gint hf_dfsblobs_dfs_referral_v3_size = -1;
 static gint hf_dfsblobs_dfs_GetDFSReferral_resp = -1;
 static gint hf_dfsblobs_dfs_referral_v2_entry_flags = -1;
+static gint hf_dfsblobs_dfs_referral_version_v2 = -1;
 static gint hf_dfsblobs_dfs_referral_v2_ttl = -1;
 static gint hf_dfsblobs_dfs_referral_v2_DFS_path = -1;
 static gint hf_dfsblobs_DFS_HEADER_FLAG_DFS_HEADER_FLAG_TARGET_BCK = -1;
@@ -152,20 +152,20 @@ static int dfsblobs_dissect_element_dfs_domain_referral_nb_expanded_names(tvbuff
 static int dfsblobs_dissect_element_dfs_domain_referral_expanded_names(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dfsblobs_dissect_element_dfs_domain_referral_expanded_names_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dfsblobs_dissect_element_dfs_domain_referral_expanded_names__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dfsblobs_dissect_element_dfs_referral_val0_r1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dfsblobs_dissect_element_dfs_referral_val2_r2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dfsblobs_dissect_element_dfs_padding_val16_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dfsblobs_dissect_element_dfs_padding_val16_value_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dfsblobs_dissect_element_dfs_referral_r1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dfsblobs_dissect_element_dfs_referral_r2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dfsblobs_dissect_element_dfs_padding_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dfsblobs_dissect_element_dfs_padding_value_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dfsblobs_dissect_element_dfs_referral_v3_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *size);
 static int dfsblobs_dissect_element_dfs_referral_v3_server_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dfsblobs_dissect_element_dfs_referral_v3_entry_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *entry_flags);
 static int dfsblobs_dissect_element_dfs_referral_v3_ttl(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dfsblobs_dissect_element_dfs_referral_v3_referrals(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
 static int dfsblobs_dissect_element_dfs_referral_v3_service_site_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
-static int dfsblobs_dissect_element_dfs_referral_version_val1_v1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dfsblobs_dissect_element_dfs_referral_version_val2_v2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dfsblobs_dissect_element_dfs_referral_version_val3_v3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dfsblobs_dissect_element_dfs_referral_version_val4_v4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dfsblobs_dissect_element_dfs_referral_version_v1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dfsblobs_dissect_element_dfs_referral_version_v2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dfsblobs_dissect_element_dfs_referral_version_v3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dfsblobs_dissect_element_dfs_referral_version_v4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dfsblobs_dissect_element_dfs_referral_type_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
 static int dfsblobs_dissect_element_dfs_referral_type_referral(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
 static int dfsblobs_dissect_element_dfs_referral_resp_path_consumed(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -704,17 +704,17 @@ dfsblobs_dissect_struct_dfs_domain_referral(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-dfsblobs_dissect_element_dfs_referral_val0_r1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dfsblobs_dissect_element_dfs_referral_r1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dfsblobs_dissect_struct_dfs_normal_referral(tvb,offset,pinfo,tree,drep,hf_dfsblobs_dfs_referral_val0_r1,0);
+       offset = dfsblobs_dissect_struct_dfs_normal_referral(tvb,offset,pinfo,tree,drep,hf_dfsblobs_dfs_referral_r1,0);
 
        return offset;
 }
 
 static int
-dfsblobs_dissect_element_dfs_referral_val2_r2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dfsblobs_dissect_element_dfs_referral_r2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dfsblobs_dissect_struct_dfs_domain_referral(tvb,offset,pinfo,tree,drep,hf_dfsblobs_dfs_referral_val2_r2,0);
+       offset = dfsblobs_dissect_struct_dfs_domain_referral(tvb,offset,pinfo,tree,drep,hf_dfsblobs_dfs_referral_r2,0);
 
        return offset;
 }
@@ -735,11 +735,11 @@ dfsblobs_dissect_dfs_referral(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 
        switch(level) {
                case 0:
-                       offset = dfsblobs_dissect_element_dfs_referral_val0_r1(tvb, offset, pinfo, tree, drep);
+                       offset = dfsblobs_dissect_element_dfs_referral_r1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = dfsblobs_dissect_element_dfs_referral_val2_r2(tvb, offset, pinfo, tree, drep);
+                       offset = dfsblobs_dissect_element_dfs_referral_r2(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -757,21 +757,21 @@ dfsblobs_dissect_dfs_referral(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 /* IDL: } */
 
 static int
-dfsblobs_dissect_element_dfs_padding_val16_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dfsblobs_dissect_element_dfs_padding_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        int conformant = di->conformant_run;
        if (!conformant) {
-               offset = dfsblobs_dissect_element_dfs_padding_val16_value_(tvb, offset, 16, pinfo, tree, drep);
+               offset = dfsblobs_dissect_element_dfs_padding_value_(tvb, offset, 16, pinfo, tree, drep);
        }
 
        return offset;
 }
 
 static int
-dfsblobs_dissect_element_dfs_padding_val16_value_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dfsblobs_dissect_element_dfs_padding_value_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       proto_tree_add_bytes(tree, hf_dfsblobs_dfs_padding_val16_value, tvb, offset, length, tvb_get_ptr(tvb, offset,length)); offset += length;
+       proto_tree_add_bytes(tree, hf_dfsblobs_dfs_padding_value, tvb, offset, length, tvb_get_ptr(tvb, offset,length)); offset += length;
 
        return offset;
 }
@@ -792,7 +792,7 @@ dfsblobs_dissect_dfs_padding(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
 
        switch(level) {
                case 16:
-                       offset = dfsblobs_dissect_element_dfs_padding_val16_value(tvb, offset, pinfo, tree, drep);
+                       offset = dfsblobs_dissect_element_dfs_padding_value(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -912,33 +912,33 @@ dfsblobs_dissect_struct_dfs_referral_v3(tvbuff_t *tvb _U_, int offset _U_, packe
 /* IDL: } */
 
 static int
-dfsblobs_dissect_element_dfs_referral_version_val1_v1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dfsblobs_dissect_element_dfs_referral_version_v1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dfsblobs_dissect_struct_dfs_referral_v1(tvb,offset,pinfo,tree,drep,hf_dfsblobs_dfs_referral_version_val1_v1,0);
+       offset = dfsblobs_dissect_struct_dfs_referral_v1(tvb,offset,pinfo,tree,drep,hf_dfsblobs_dfs_referral_version_v1,0);
 
        return offset;
 }
 
 static int
-dfsblobs_dissect_element_dfs_referral_version_val2_v2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dfsblobs_dissect_element_dfs_referral_version_v2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dfsblobs_dissect_struct_dfs_referral_v2(tvb,offset,pinfo,tree,drep,hf_dfsblobs_dfs_referral_version_val2_v2,0);
+       offset = dfsblobs_dissect_struct_dfs_referral_v2(tvb,offset,pinfo,tree,drep,hf_dfsblobs_dfs_referral_version_v2,0);
 
        return offset;
 }
 
 static int
-dfsblobs_dissect_element_dfs_referral_version_val3_v3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dfsblobs_dissect_element_dfs_referral_version_v3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dfsblobs_dissect_struct_dfs_referral_v3(tvb,offset,pinfo,tree,drep,hf_dfsblobs_dfs_referral_version_val3_v3,0);
+       offset = dfsblobs_dissect_struct_dfs_referral_v3(tvb,offset,pinfo,tree,drep,hf_dfsblobs_dfs_referral_version_v3,0);
 
        return offset;
 }
 
 static int
-dfsblobs_dissect_element_dfs_referral_version_val4_v4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dfsblobs_dissect_element_dfs_referral_version_v4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dfsblobs_dissect_struct_dfs_referral_v3(tvb,offset,pinfo,tree,drep,hf_dfsblobs_dfs_referral_version_val4_v4,0);
+       offset = dfsblobs_dissect_struct_dfs_referral_v3(tvb,offset,pinfo,tree,drep,hf_dfsblobs_dfs_referral_version_v4,0);
 
        return offset;
 }
@@ -959,19 +959,19 @@ dfsblobs_dissect_dfs_referral_version(tvbuff_t *tvb _U_, int offset _U_, packet_
 
        switch(level) {
                case 1:
-                       offset = dfsblobs_dissect_element_dfs_referral_version_val1_v1(tvb, offset, pinfo, tree, drep);
+                       offset = dfsblobs_dissect_element_dfs_referral_version_v1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = dfsblobs_dissect_element_dfs_referral_version_val2_v2(tvb, offset, pinfo, tree, drep);
+                       offset = dfsblobs_dissect_element_dfs_referral_version_v2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = dfsblobs_dissect_element_dfs_referral_version_val3_v3(tvb, offset, pinfo, tree, drep);
+                       offset = dfsblobs_dissect_element_dfs_referral_version_v3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = dfsblobs_dissect_element_dfs_referral_version_val4_v4(tvb, offset, pinfo, tree, drep);
+                       offset = dfsblobs_dissect_element_dfs_referral_version_v4(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -1231,6 +1231,8 @@ static dcerpc_sub_dissector dfsblobs_dissectors[] = {
 void proto_register_dcerpc_dfsblobs(void)
 {
        static hf_register_info hf[] = {
+       { &hf_dfsblobs_dfs_referral_version_v4,
+         { "V4", "dfsblobs.dfs_referral_version.v4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_domain_referral_special_name,
          { "Special Name", "dfsblobs.dfs_domain_referral.special_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_referral_v3_ttl,
@@ -1251,18 +1253,20 @@ void proto_register_dcerpc_dfsblobs(void)
          { "Dfs Header Flag Referal Svr", "dfsblobs.DFS_HEADER_FLAG.DFS_HEADER_FLAG_REFERAL_SVR", FT_BOOLEAN, 32, TFS(&DFS_HEADER_FLAG_DFS_HEADER_FLAG_REFERAL_SVR_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_dfsblobs_dfs_referral_resp_path_consumed,
          { "Path Consumed", "dfsblobs.dfs_referral_resp.path_consumed", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dfsblobs_dfs_referral_version_val1_v1,
-         { "V1", "dfsblobs.dfs_referral_version_val1.v1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dfsblobs_dfs_referral_version_v3,
+         { "V3", "dfsblobs.dfs_referral_version.v3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_referral_v3_referrals,
          { "Referrals", "dfsblobs.dfs_referral_v3.referrals", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dfsblobs_dfs_padding_val16_value,
-         { "Value", "dfsblobs.dfs_padding_val16.value", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_referral_v1_entry_flags,
          { "Entry Flags", "dfsblobs.dfs_referral_v1.entry_flags", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_referral_resp_referral_entries,
          { "Referral Entries", "dfsblobs.dfs_referral_resp.referral_entries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_referral_type_referral,
          { "Referral", "dfsblobs.dfs_referral_type.referral", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dfsblobs_dfs_referral_r1,
+         { "R1", "dfsblobs.dfs_referral.r1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dfsblobs_dfs_referral_version_v1,
+         { "V1", "dfsblobs.dfs_referral_version.v1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_GetDFSReferral_req,
          { "Req", "dfsblobs.dfs_GetDFSReferral.req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_referral_v1_share_name,
@@ -1273,8 +1277,6 @@ void proto_register_dcerpc_dfsblobs(void)
          { "Subcontext length", "dfsblobs.dfs_domain_referral.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_referral_type_version,
          { "Version", "dfsblobs.dfs_referral_type.version", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dfsblobs_dfs_referral_val2_r2,
-         { "R2", "dfsblobs.dfs_referral_val2.r2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_domain_referral_nb_expanded_names,
          { "Nb Expanded Names", "dfsblobs.dfs_domain_referral.nb_expanded_names", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_opnum,
@@ -1285,8 +1287,8 @@ void proto_register_dcerpc_dfsblobs(void)
          { "Dfs Alt Path", "dfsblobs.dfs_referral_v2.DFS_alt_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_domain_referral_expanded_names,
          { "Expanded Names", "dfsblobs.dfs_domain_referral.expanded_names", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dfsblobs_dfs_referral_version_val3_v3,
-         { "V3", "dfsblobs.dfs_referral_version_val3.v3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dfsblobs_dfs_referral_r2,
+         { "R2", "dfsblobs.dfs_referral.r2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_referral_v3_service_site_guid,
          { "Service Site Guid", "dfsblobs.dfs_referral_v3.service_site_guid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_GetDFSReferral_in_servername,
@@ -1295,20 +1297,16 @@ void proto_register_dcerpc_dfsblobs(void)
          { "Nb Referrals", "dfsblobs.dfs_referral_resp.nb_referrals", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_normal_referral_DFS_alt_path,
          { "Dfs Alt Path", "dfsblobs.dfs_normal_referral.DFS_alt_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dfsblobs_dfs_referral_version_val4_v4,
-         { "V4", "dfsblobs.dfs_referral_version_val4.v4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dfsblobs_dfs_referral_version_val2_v2,
-         { "V2", "dfsblobs.dfs_referral_version_val2.v2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_DFS_HEADER_FLAG_DFS_HEADER_FLAG_STORAGE_SVR,
          { "Dfs Header Flag Storage Svr", "dfsblobs.DFS_HEADER_FLAG.DFS_HEADER_FLAG_STORAGE_SVR", FT_BOOLEAN, 32, TFS(&DFS_HEADER_FLAG_DFS_HEADER_FLAG_STORAGE_SVR_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_dfsblobs_dfs_referral_v1_size,
          { "Size", "dfsblobs.dfs_referral_v1.size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dfsblobs_dfs_padding_value,
+         { "Value", "dfsblobs.dfs_padding.value", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_referral_resp_header_flags,
          { "Header Flags", "dfsblobs.dfs_referral_resp.header_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_normal_referral_DFS_path,
          { "Dfs Path", "dfsblobs.dfs_normal_referral.DFS_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dfsblobs_dfs_referral_val0_r1,
-         { "R1", "dfsblobs.dfs_referral_val0.r1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_referral_v3_entry_flags,
          { "Entry Flags", "dfsblobs.dfs_referral_v3.entry_flags", FT_UINT16, BASE_DEC, VALS(dfsblobs_DFS_FLAGS_REFERRAL_vals), 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_referral_v3_size,
@@ -1317,6 +1315,8 @@ void proto_register_dcerpc_dfsblobs(void)
          { "Resp", "dfsblobs.dfs_GetDFSReferral.resp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_referral_v2_entry_flags,
          { "Entry Flags", "dfsblobs.dfs_referral_v2.entry_flags", FT_UINT16, BASE_DEC, VALS(dfsblobs_DFS_FLAGS_REFERRAL_vals), 0, NULL, HFILL }},
+       { &hf_dfsblobs_dfs_referral_version_v2,
+         { "V2", "dfsblobs.dfs_referral_version.v2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_referral_v2_ttl,
          { "Ttl", "dfsblobs.dfs_referral_v2.ttl", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dfsblobs_dfs_referral_v2_DFS_path,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-dns.c b/bin/default/librpc/gen_ndr/packet-dcerpc-dns.c
index f6689646936c45da0c0fb85ffb5699cb9395f047..a29db104e2c21b3b1ef60ce8a86b701b2a8c0a51 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-dns.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-dns.c
@@ -58,18 +58,20 @@ static gint hf_dns_dns_operation_DNS_FLAG_REPLY = -1;
 static gint hf_dns_opnum = -1;
 static gint hf_dns_dns_srv_record_weight = -1;
 static gint hf_dns_dns_operation_DNS_FLAG_BROADCAST = -1;
-static gint hf_dns_dns_rdata_valDNS_QTYPE_A_ipv4_record = -1;
 static gint hf_dns_dns_tsig_record_algorithm_name = -1;
 static gint hf_dns_dns_tkey_record_inception = -1;
 static gint hf_dns_dns_res_rec_rdata = -1;
 static gint hf_dns_dns_tsig_record_error = -1;
+static gint hf_dns_dns_rdata_tkey_record = -1;
 static gint hf_dns_dns_tsig_record_original_id = -1;
 static gint hf_dns_dns_name_packet_arcount = -1;
 static gint hf_dns_dns_fake_tsig_rec_original_id = -1;
 static gint hf_dns_dns_fake_tsig_rec_time = -1;
+static gint hf_dns_dns_rdata_mx_record = -1;
 static gint hf_dns_dns_tsig_record_mac = -1;
 static gint hf_dns_dns_tsig_record_time_prefix = -1;
 static gint hf_dns_dns_res_rec_length = -1;
+static gint hf_dns_dns_rdata_soa_record = -1;
 static gint hf_dns_dns_fake_tsig_rec_error = -1;
 static gint hf_dns_dns_mx_record_preference = -1;
 static gint hf_dns_dns_soa_record_retry = -1;
@@ -78,9 +80,8 @@ static gint hf_dns_dns_fake_tsig_rec_ttl = -1;
 static gint hf_dns_dns_fake_tsig_rec_name = -1;
 static gint hf_dns_dns_tsig_record_fudge = -1;
 static gint hf_dns_dns_res_rec_rr_type = -1;
-static gint hf_dns_dns_rdata_valDNS_QTYPE_CNAME_cname_record = -1;
 static gint hf_dns_dns_operation_DNS_RCODE = -1;
-static gint hf_dns_dns_rdata_valDNS_QTYPE_NS_ns_record = -1;
+static gint hf_dns_dns_rdata_ipv4_record = -1;
 static gint hf_dns_dns_fake_tsig_rec_other_data = -1;
 static gint hf_dns_dns_fake_tsig_rec_rr_class = -1;
 static gint hf_dns_dns_hinfo_record_os = -1;
@@ -88,8 +89,9 @@ static gint hf_dns_dns_name_packet_additional = -1;
 static gint hf_dns_dns_srv_record_port = -1;
 static gint hf_dns_dns_name_packet_qdcount = -1;
 static gint hf_dns_dns_rdata_data_data = -1;
-static gint hf_dns_dns_rdata_valDNS_QTYPE_MX_mx_record = -1;
+static gint hf_dns_dns_rdata_ptr_record = -1;
 static gint hf_dns_dns_fake_tsig_rec_algorithm_name = -1;
+static gint hf_dns_dns_rdata_rp_record = -1;
 static gint hf_dns_dns_soa_record_mname = -1;
 static gint hf_dns_dns_tsig_record_mac_size = -1;
 static gint hf_dns_dns_fake_tsig_rec_time_prefix = -1;
@@ -101,14 +103,14 @@ static gint hf_dns_dns_operation_DNS_FLAG_RECURSION_DESIRED = -1;
 static gint hf_dns_dns_tkey_record_error = -1;
 static gint hf_dns_dns_hinfo_record_os_length = -1;
 static gint hf_dns_dns_tsig_record_other_data = -1;
-static gint hf_dns_dns_rdata_valDNS_QTYPE_TXT_txt_record = -1;
 static gint hf_dns_dns_txt_record_length = -1;
 static gint hf_dns_dns_operation_DNS_OPCODE = -1;
 static gint hf_dns_dns_soa_record_refresh = -1;
-static gint hf_dns_dns_rdata_valDNS_QTYPE_RP_rp_record = -1;
-static gint hf_dns_dns_rdata_valDNS_QTYPE_PTR_ptr_record = -1;
+static gint hf_dns_dns_rdata_ipv6_record = -1;
 static gint hf_dns_dns_operation_DNS_FLAG_AUTHORITATIVE = -1;
 static gint hf_dns_dns_fake_tsig_rec_fudge = -1;
+static gint hf_dns_dns_rdata_opt_record = -1;
+static gint hf_dns_dns_rdata_tsig_record = -1;
 static gint hf_dns_dns_tkey_record_other_size = -1;
 static gint hf_dns_dns_name_packet_nscount = -1;
 static gint hf_dns_dns_res_rec_name = -1;
@@ -119,31 +121,29 @@ static gint hf_dns_dns_name_question_question_type = -1;
 static gint hf_dns_dns_txt_record_txt = -1;
 static gint hf_dns_dns_tkey_record_other_data = -1;
 static gint hf_dns_dns_tkey_record_algorithm = -1;
+static gint hf_dns_dns_rdata_srv_record = -1;
 static gint hf_dns_dns_tkey_record_key_size = -1;
 static gint hf_dns_dns_tkey_record_key_data = -1;
 static gint hf_dns_dns_rdata_data_length = -1;
 static gint hf_dns_dns_name_packet_questions = -1;
 static gint hf_dns_dns_fake_tsig_rec_other_size = -1;
-static gint hf_dns_dns_rdata_valDNS_QTYPE_HINFO_hinfo_record = -1;
-static gint hf_dns_dns_rdata_valDNS_QTYPE_OPT_opt_record = -1;
+static gint hf_dns_dns_rdata_hinfo_record = -1;
 static gint hf_dns_dns_name_packet_answers = -1;
 static gint hf_dns_dns_res_rec_unexpected = -1;
 static gint hf_dns_dns_soa_record_expire = -1;
-static gint hf_dns_dns_rdata_valDNS_QTYPE_TKEY_tkey_record = -1;
 static gint hf_dns_dns_mx_record_exchange = -1;
+static gint hf_dns_dns_rdata_ns_record = -1;
 static gint hf_dns_dns_name_question_question_class = -1;
 static gint hf_dns_dns_operation_DNS_FLAG_RECURSION_AVAIL = -1;
 static gint hf_dns_dns_opt_record_option_code = -1;
-static gint hf_dns_dns_rdata_valDNS_QTYPE_AAAA_ipv6_record = -1;
 static gint hf_dns_dns_tsig_record_other_size = -1;
-static gint hf_dns_dns_rdata_valDNS_QTYPE_SOA_soa_record = -1;
-static gint hf_dns_dns_rdata_valDNS_QTYPE_SRV_srv_record = -1;
+static gint hf_dns_dns_rdata_cname_record = -1;
 static gint hf_dns_dns_operation_DNS_FLAG_TRUNCATION = -1;
 static gint hf_dns_dns_name_question_name = -1;
+static gint hf_dns_dns_rdata_txt_record = -1;
 static gint hf_dns_dns_name_packet_operation = -1;
 static gint hf_dns_dns_name_packet_id = -1;
 static gint hf_dns_dns_res_rec_rr_class = -1;
-static gint hf_dns_dns_rdata_valDNS_QTYPE_TSIG_tsig_record = -1;
 static gint hf_dns_dns_rp_record_txt = -1;
 static gint hf_dns_dns_opt_record_option_length = -1;
 static gint hf_dns_dns_opt_record_option_data = -1;
@@ -356,20 +356,20 @@ static int dns_dissect_element_fake_tsig_rec_error(tvbuff_t *tvb _U_, int offset
 static int dns_dissect_element_fake_tsig_rec_other_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dns_dissect_element_fake_tsig_rec_other_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dns_dissect_element_fake_tsig_rec_other_data_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dns_dissect_element_rdata_valDNS_QTYPE_A_ipv4_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dns_dissect_element_rdata_valDNS_QTYPE_NS_ns_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dns_dissect_element_rdata_valDNS_QTYPE_CNAME_cname_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dns_dissect_element_rdata_valDNS_QTYPE_SOA_soa_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dns_dissect_element_rdata_valDNS_QTYPE_PTR_ptr_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dns_dissect_element_rdata_valDNS_QTYPE_HINFO_hinfo_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dns_dissect_element_rdata_valDNS_QTYPE_MX_mx_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dns_dissect_element_rdata_valDNS_QTYPE_TXT_txt_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dns_dissect_element_rdata_valDNS_QTYPE_RP_rp_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dns_dissect_element_rdata_valDNS_QTYPE_AAAA_ipv6_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dns_dissect_element_rdata_valDNS_QTYPE_SRV_srv_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dns_dissect_element_rdata_valDNS_QTYPE_OPT_opt_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dns_dissect_element_rdata_valDNS_QTYPE_TSIG_tsig_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dns_dissect_element_rdata_valDNS_QTYPE_TKEY_tkey_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dns_dissect_element_rdata_ipv4_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dns_dissect_element_rdata_ns_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dns_dissect_element_rdata_cname_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dns_dissect_element_rdata_soa_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dns_dissect_element_rdata_ptr_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dns_dissect_element_rdata_hinfo_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dns_dissect_element_rdata_mx_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dns_dissect_element_rdata_txt_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dns_dissect_element_rdata_rp_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dns_dissect_element_rdata_ipv6_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dns_dissect_element_rdata_srv_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dns_dissect_element_rdata_opt_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dns_dissect_element_rdata_tsig_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dns_dissect_element_rdata_tkey_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dns_dissect_element_res_rec_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dns_dissect_element_res_rec_rr_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *rr_type);
 static int dns_dissect_element_res_rec_rr_class(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1776,113 +1776,113 @@ dns_dissect_struct_fake_tsig_rec(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-dns_dissect_element_rdata_valDNS_QTYPE_A_ipv4_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dns_dissect_element_rdata_ipv4_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dns_dissect_struct_ipv4address(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_valDNS_QTYPE_A_ipv4_record,0);
+       offset = dns_dissect_struct_ipv4address(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_ipv4_record,0);
 
        return offset;
 }
 
 static int
-dns_dissect_element_rdata_valDNS_QTYPE_NS_ns_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dns_dissect_element_rdata_ns_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dns_dissect_struct_dns_string(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_valDNS_QTYPE_NS_ns_record,0);
+       offset = dns_dissect_struct_dns_string(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_ns_record,0);
 
        return offset;
 }
 
 static int
-dns_dissect_element_rdata_valDNS_QTYPE_CNAME_cname_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dns_dissect_element_rdata_cname_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dns_dissect_struct_dns_string(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_valDNS_QTYPE_CNAME_cname_record,0);
+       offset = dns_dissect_struct_dns_string(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_cname_record,0);
 
        return offset;
 }
 
 static int
-dns_dissect_element_rdata_valDNS_QTYPE_SOA_soa_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dns_dissect_element_rdata_soa_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dns_dissect_struct_soa_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_valDNS_QTYPE_SOA_soa_record,0);
+       offset = dns_dissect_struct_soa_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_soa_record,0);
 
        return offset;
 }
 
 static int
-dns_dissect_element_rdata_valDNS_QTYPE_PTR_ptr_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dns_dissect_element_rdata_ptr_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dns_dissect_struct_dns_string(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_valDNS_QTYPE_PTR_ptr_record,0);
+       offset = dns_dissect_struct_dns_string(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_ptr_record,0);
 
        return offset;
 }
 
 static int
-dns_dissect_element_rdata_valDNS_QTYPE_HINFO_hinfo_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dns_dissect_element_rdata_hinfo_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dns_dissect_struct_hinfo_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_valDNS_QTYPE_HINFO_hinfo_record,0);
+       offset = dns_dissect_struct_hinfo_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_hinfo_record,0);
 
        return offset;
 }
 
 static int
-dns_dissect_element_rdata_valDNS_QTYPE_MX_mx_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dns_dissect_element_rdata_mx_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dns_dissect_struct_mx_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_valDNS_QTYPE_MX_mx_record,0);
+       offset = dns_dissect_struct_mx_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_mx_record,0);
 
        return offset;
 }
 
 static int
-dns_dissect_element_rdata_valDNS_QTYPE_TXT_txt_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dns_dissect_element_rdata_txt_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dns_dissect_struct_txt_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_valDNS_QTYPE_TXT_txt_record,0);
+       offset = dns_dissect_struct_txt_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_txt_record,0);
 
        return offset;
 }
 
 static int
-dns_dissect_element_rdata_valDNS_QTYPE_RP_rp_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dns_dissect_element_rdata_rp_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dns_dissect_struct_rp_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_valDNS_QTYPE_RP_rp_record,0);
+       offset = dns_dissect_struct_rp_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_rp_record,0);
 
        return offset;
 }
 
 static int
-dns_dissect_element_rdata_valDNS_QTYPE_AAAA_ipv6_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dns_dissect_element_rdata_ipv6_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dns_dissect_struct_ipv6address(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_valDNS_QTYPE_AAAA_ipv6_record,0);
+       offset = dns_dissect_struct_ipv6address(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_ipv6_record,0);
 
        return offset;
 }
 
 static int
-dns_dissect_element_rdata_valDNS_QTYPE_SRV_srv_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dns_dissect_element_rdata_srv_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dns_dissect_struct_srv_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_valDNS_QTYPE_SRV_srv_record,0);
+       offset = dns_dissect_struct_srv_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_srv_record,0);
 
        return offset;
 }
 
 static int
-dns_dissect_element_rdata_valDNS_QTYPE_OPT_opt_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dns_dissect_element_rdata_opt_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dns_dissect_struct_opt_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_valDNS_QTYPE_OPT_opt_record,0);
+       offset = dns_dissect_struct_opt_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_opt_record,0);
 
        return offset;
 }
 
 static int
-dns_dissect_element_rdata_valDNS_QTYPE_TSIG_tsig_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dns_dissect_element_rdata_tsig_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dns_dissect_struct_tsig_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_valDNS_QTYPE_TSIG_tsig_record,0);
+       offset = dns_dissect_struct_tsig_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_tsig_record,0);
 
        return offset;
 }
 
 static int
-dns_dissect_element_rdata_valDNS_QTYPE_TKEY_tkey_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dns_dissect_element_rdata_tkey_record(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dns_dissect_struct_tkey_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_valDNS_QTYPE_TKEY_tkey_record,0);
+       offset = dns_dissect_struct_tkey_record(tvb,offset,pinfo,tree,drep,hf_dns_dns_rdata_tkey_record,0);
 
        return offset;
 }
@@ -1903,59 +1903,59 @@ dns_dissect_rdata(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, pro
 
        switch(level) {
                case DNS_QTYPE_A:
-                       offset = dns_dissect_element_rdata_valDNS_QTYPE_A_ipv4_record(tvb, offset, pinfo, tree, drep);
+                       offset = dns_dissect_element_rdata_ipv4_record(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_QTYPE_NS:
-                       offset = dns_dissect_element_rdata_valDNS_QTYPE_NS_ns_record(tvb, offset, pinfo, tree, drep);
+                       offset = dns_dissect_element_rdata_ns_record(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_QTYPE_CNAME:
-                       offset = dns_dissect_element_rdata_valDNS_QTYPE_CNAME_cname_record(tvb, offset, pinfo, tree, drep);
+                       offset = dns_dissect_element_rdata_cname_record(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_QTYPE_SOA:
-                       offset = dns_dissect_element_rdata_valDNS_QTYPE_SOA_soa_record(tvb, offset, pinfo, tree, drep);
+                       offset = dns_dissect_element_rdata_soa_record(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_QTYPE_PTR:
-                       offset = dns_dissect_element_rdata_valDNS_QTYPE_PTR_ptr_record(tvb, offset, pinfo, tree, drep);
+                       offset = dns_dissect_element_rdata_ptr_record(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_QTYPE_HINFO:
-                       offset = dns_dissect_element_rdata_valDNS_QTYPE_HINFO_hinfo_record(tvb, offset, pinfo, tree, drep);
+                       offset = dns_dissect_element_rdata_hinfo_record(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_QTYPE_MX:
-                       offset = dns_dissect_element_rdata_valDNS_QTYPE_MX_mx_record(tvb, offset, pinfo, tree, drep);
+                       offset = dns_dissect_element_rdata_mx_record(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_QTYPE_TXT:
-                       offset = dns_dissect_element_rdata_valDNS_QTYPE_TXT_txt_record(tvb, offset, pinfo, tree, drep);
+                       offset = dns_dissect_element_rdata_txt_record(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_QTYPE_RP:
-                       offset = dns_dissect_element_rdata_valDNS_QTYPE_RP_rp_record(tvb, offset, pinfo, tree, drep);
+                       offset = dns_dissect_element_rdata_rp_record(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_QTYPE_AAAA:
-                       offset = dns_dissect_element_rdata_valDNS_QTYPE_AAAA_ipv6_record(tvb, offset, pinfo, tree, drep);
+                       offset = dns_dissect_element_rdata_ipv6_record(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_QTYPE_SRV:
-                       offset = dns_dissect_element_rdata_valDNS_QTYPE_SRV_srv_record(tvb, offset, pinfo, tree, drep);
+                       offset = dns_dissect_element_rdata_srv_record(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_QTYPE_OPT:
-                       offset = dns_dissect_element_rdata_valDNS_QTYPE_OPT_opt_record(tvb, offset, pinfo, tree, drep);
+                       offset = dns_dissect_element_rdata_opt_record(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_QTYPE_TSIG:
-                       offset = dns_dissect_element_rdata_valDNS_QTYPE_TSIG_tsig_record(tvb, offset, pinfo, tree, drep);
+                       offset = dns_dissect_element_rdata_tsig_record(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_QTYPE_TKEY:
-                       offset = dns_dissect_element_rdata_valDNS_QTYPE_TKEY_tkey_record(tvb, offset, pinfo, tree, drep);
+                       offset = dns_dissect_element_rdata_tkey_record(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -2300,8 +2300,6 @@ void proto_register_dcerpc_dns(void)
          { "Weight", "dns.dns_srv_record.weight", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_operation_DNS_FLAG_BROADCAST,
          { "Dns Flag Broadcast", "dns.dns_operation.DNS_FLAG_BROADCAST", FT_BOOLEAN, 16, TFS(&dns_operation_DNS_FLAG_BROADCAST_tfs), ( 0x0010 ), NULL, HFILL }},
-       { &hf_dns_dns_rdata_valDNS_QTYPE_A_ipv4_record,
-         { "Ipv4 Record", "dns.dns_rdata_valDNS_QTYPE_A.ipv4_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_tsig_record_algorithm_name,
          { "Algorithm Name", "dns.dns_tsig_record.algorithm_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_tkey_record_inception,
@@ -2310,6 +2308,8 @@ void proto_register_dcerpc_dns(void)
          { "Rdata", "dns.dns_res_rec.rdata", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_tsig_record_error,
          { "Error", "dns.dns_tsig_record.error", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dns_dns_rdata_tkey_record,
+         { "Tkey Record", "dns.dns_rdata.tkey_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_tsig_record_original_id,
          { "Original Id", "dns.dns_tsig_record.original_id", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_name_packet_arcount,
@@ -2318,12 +2318,16 @@ void proto_register_dcerpc_dns(void)
          { "Original Id", "dns.dns_fake_tsig_rec.original_id", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_fake_tsig_rec_time,
          { "Time", "dns.dns_fake_tsig_rec.time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dns_dns_rdata_mx_record,
+         { "Mx Record", "dns.dns_rdata.mx_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_tsig_record_mac,
          { "Mac", "dns.dns_tsig_record.mac", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_tsig_record_time_prefix,
          { "Time Prefix", "dns.dns_tsig_record.time_prefix", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_res_rec_length,
          { "Length", "dns.dns_res_rec.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dns_dns_rdata_soa_record,
+         { "Soa Record", "dns.dns_rdata.soa_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_fake_tsig_rec_error,
          { "Error", "dns.dns_fake_tsig_rec.error", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_mx_record_preference,
@@ -2340,12 +2344,10 @@ void proto_register_dcerpc_dns(void)
          { "Fudge", "dns.dns_tsig_record.fudge", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_res_rec_rr_type,
          { "Rr Type", "dns.dns_res_rec.rr_type", FT_UINT16, BASE_DEC, VALS(dns_dns_qtype_vals), 0, NULL, HFILL }},
-       { &hf_dns_dns_rdata_valDNS_QTYPE_CNAME_cname_record,
-         { "Cname Record", "dns.dns_rdata_valDNS_QTYPE_CNAME.cname_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_operation_DNS_RCODE,
          { "Dns Rcode", "dns.dns_operation.DNS_RCODE", FT_BOOLEAN, 16, TFS(&dns_operation_DNS_RCODE_tfs), ( 0x000F ), NULL, HFILL }},
-       { &hf_dns_dns_rdata_valDNS_QTYPE_NS_ns_record,
-         { "Ns Record", "dns.dns_rdata_valDNS_QTYPE_NS.ns_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dns_dns_rdata_ipv4_record,
+         { "Ipv4 Record", "dns.dns_rdata.ipv4_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_fake_tsig_rec_other_data,
          { "Other Data", "dns.dns_fake_tsig_rec.other_data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_fake_tsig_rec_rr_class,
@@ -2360,10 +2362,12 @@ void proto_register_dcerpc_dns(void)
          { "Qdcount", "dns.dns_name_packet.qdcount", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_rdata_data_data,
          { "Data", "dns.dns_rdata_data.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dns_dns_rdata_valDNS_QTYPE_MX_mx_record,
-         { "Mx Record", "dns.dns_rdata_valDNS_QTYPE_MX.mx_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dns_dns_rdata_ptr_record,
+         { "Ptr Record", "dns.dns_rdata.ptr_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_fake_tsig_rec_algorithm_name,
          { "Algorithm Name", "dns.dns_fake_tsig_rec.algorithm_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dns_dns_rdata_rp_record,
+         { "Rp Record", "dns.dns_rdata.rp_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_soa_record_mname,
          { "Mname", "dns.dns_soa_record.mname", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_tsig_record_mac_size,
@@ -2386,22 +2390,22 @@ void proto_register_dcerpc_dns(void)
          { "Os Length", "dns.dns_hinfo_record.os_length", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_tsig_record_other_data,
          { "Other Data", "dns.dns_tsig_record.other_data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dns_dns_rdata_valDNS_QTYPE_TXT_txt_record,
-         { "Txt Record", "dns.dns_rdata_valDNS_QTYPE_TXT.txt_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_txt_record_length,
          { "Length", "dns.dns_txt_record.length", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_operation_DNS_OPCODE,
          { "Dns Opcode", "dns.dns_operation.DNS_OPCODE", FT_BOOLEAN, 16, TFS(&dns_operation_DNS_OPCODE_tfs), ( 0x7800 ), NULL, HFILL }},
        { &hf_dns_dns_soa_record_refresh,
          { "Refresh", "dns.dns_soa_record.refresh", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dns_dns_rdata_valDNS_QTYPE_RP_rp_record,
-         { "Rp Record", "dns.dns_rdata_valDNS_QTYPE_RP.rp_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dns_dns_rdata_valDNS_QTYPE_PTR_ptr_record,
-         { "Ptr Record", "dns.dns_rdata_valDNS_QTYPE_PTR.ptr_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dns_dns_rdata_ipv6_record,
+         { "Ipv6 Record", "dns.dns_rdata.ipv6_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_operation_DNS_FLAG_AUTHORITATIVE,
          { "Dns Flag Authoritative", "dns.dns_operation.DNS_FLAG_AUTHORITATIVE", FT_BOOLEAN, 16, TFS(&dns_operation_DNS_FLAG_AUTHORITATIVE_tfs), ( 0x0400 ), NULL, HFILL }},
        { &hf_dns_dns_fake_tsig_rec_fudge,
          { "Fudge", "dns.dns_fake_tsig_rec.fudge", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_dns_dns_rdata_opt_record,
+         { "Opt Record", "dns.dns_rdata.opt_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dns_dns_rdata_tsig_record,
+         { "Tsig Record", "dns.dns_rdata.tsig_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_tkey_record_other_size,
          { "Other Size", "dns.dns_tkey_record.other_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_name_packet_nscount,
@@ -2422,6 +2426,8 @@ void proto_register_dcerpc_dns(void)
          { "Other Data", "dns.dns_tkey_record.other_data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_tkey_record_algorithm,
          { "Algorithm", "dns.dns_tkey_record.algorithm", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dns_dns_rdata_srv_record,
+         { "Srv Record", "dns.dns_rdata.srv_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_tkey_record_key_size,
          { "Key Size", "dns.dns_tkey_record.key_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_tkey_record_key_data,
@@ -2432,46 +2438,40 @@ void proto_register_dcerpc_dns(void)
          { "Questions", "dns.dns_name_packet.questions", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_fake_tsig_rec_other_size,
          { "Other Size", "dns.dns_fake_tsig_rec.other_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dns_dns_rdata_valDNS_QTYPE_HINFO_hinfo_record,
-         { "Hinfo Record", "dns.dns_rdata_valDNS_QTYPE_HINFO.hinfo_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dns_dns_rdata_valDNS_QTYPE_OPT_opt_record,
-         { "Opt Record", "dns.dns_rdata_valDNS_QTYPE_OPT.opt_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dns_dns_rdata_hinfo_record,
+         { "Hinfo Record", "dns.dns_rdata.hinfo_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_name_packet_answers,
          { "Answers", "dns.dns_name_packet.answers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_res_rec_unexpected,
          { "Unexpected", "dns.dns_res_rec.unexpected", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_soa_record_expire,
          { "Expire", "dns.dns_soa_record.expire", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dns_dns_rdata_valDNS_QTYPE_TKEY_tkey_record,
-         { "Tkey Record", "dns.dns_rdata_valDNS_QTYPE_TKEY.tkey_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_mx_record_exchange,
          { "Exchange", "dns.dns_mx_record.exchange", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dns_dns_rdata_ns_record,
+         { "Ns Record", "dns.dns_rdata.ns_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_name_question_question_class,
          { "Question Class", "dns.dns_name_question.question_class", FT_UINT16, BASE_DEC, VALS(dns_dns_qclass_vals), 0, NULL, HFILL }},
        { &hf_dns_dns_operation_DNS_FLAG_RECURSION_AVAIL,
          { "Dns Flag Recursion Avail", "dns.dns_operation.DNS_FLAG_RECURSION_AVAIL", FT_BOOLEAN, 16, TFS(&dns_operation_DNS_FLAG_RECURSION_AVAIL_tfs), ( 0x0080 ), NULL, HFILL }},
        { &hf_dns_dns_opt_record_option_code,
          { "Option Code", "dns.dns_opt_record.option_code", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dns_dns_rdata_valDNS_QTYPE_AAAA_ipv6_record,
-         { "Ipv6 Record", "dns.dns_rdata_valDNS_QTYPE_AAAA.ipv6_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_tsig_record_other_size,
          { "Other Size", "dns.dns_tsig_record.other_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_dns_dns_rdata_valDNS_QTYPE_SOA_soa_record,
-         { "Soa Record", "dns.dns_rdata_valDNS_QTYPE_SOA.soa_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dns_dns_rdata_valDNS_QTYPE_SRV_srv_record,
-         { "Srv Record", "dns.dns_rdata_valDNS_QTYPE_SRV.srv_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dns_dns_rdata_cname_record,
+         { "Cname Record", "dns.dns_rdata.cname_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_operation_DNS_FLAG_TRUNCATION,
          { "Dns Flag Truncation", "dns.dns_operation.DNS_FLAG_TRUNCATION", FT_BOOLEAN, 16, TFS(&dns_operation_DNS_FLAG_TRUNCATION_tfs), ( 0x0200 ), NULL, HFILL }},
        { &hf_dns_dns_name_question_name,
          { "Name", "dns.dns_name_question.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dns_dns_rdata_txt_record,
+         { "Txt Record", "dns.dns_rdata.txt_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_name_packet_operation,
          { "Operation", "dns.dns_name_packet.operation", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_name_packet_id,
          { "Id", "dns.dns_name_packet.id", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_res_rec_rr_class,
          { "Rr Class", "dns.dns_res_rec.rr_class", FT_UINT16, BASE_DEC, VALS(dns_dns_qclass_vals), 0, NULL, HFILL }},
-       { &hf_dns_dns_rdata_valDNS_QTYPE_TSIG_tsig_record,
-         { "Tsig Record", "dns.dns_rdata_valDNS_QTYPE_TSIG.tsig_record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_rp_record_txt,
          { "Txt", "dns.dns_rp_record.txt", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dns_dns_opt_record_option_length,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-dnsserver.c b/bin/default/librpc/gen_ndr/packet-dcerpc-dnsserver.c
index a3ae1b2609d0017e33beb6afc4aa3971db3f969c..5c6a92cccdb0732c2f5e944b98a699bd1f8199a4 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-dnsserver.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-dnsserver.c
@@ -96,22 +96,23 @@ 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_valDNSSRV_TYPEID_LPWSTR_WideString = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_DirectoryPartition = -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;
@@ -124,19 +125,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;
@@ -145,6 +146,7 @@ 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;
@@ -166,33 +168,35 @@ 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_DNS_RPC_DATA_valDNS_TYPE_SRV_srv = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_ServerInfoW2K = -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;
@@ -201,7 +205,6 @@ 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;
@@ -212,9 +215,11 @@ 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;
@@ -226,7 +231,6 @@ 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;
@@ -236,8 +240,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;
@@ -245,6 +249,7 @@ 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;
@@ -257,7 +262,9 @@ 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;
@@ -269,6 +276,7 @@ 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;
@@ -278,17 +286,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_valDNSSRV_TYPEID_DWORD_Dword = -1;
-static gint hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IPARRAY_IpArray = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_DirectoryPartitionList = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_SecondariesW2K = -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;
@@ -299,11 +307,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;
@@ -312,13 +320,11 @@ 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;
@@ -327,9 +333,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;
@@ -348,31 +354,28 @@ 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_DNS_RPC_DATA_valDNS_TYPE_DNAME_name = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_ForwardersDotNet = -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;
@@ -387,27 +390,25 @@ 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_SELECT_FLAGS_DNS_RPC_VIEW_AUTHORITY_DATA = -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_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;
@@ -417,6 +418,7 @@ 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;
@@ -424,11 +426,9 @@ 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,7 +436,6 @@ 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;
@@ -447,27 +446,25 @@ 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_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_ENUM_DirectoryPartitionEnum = -1;
+static gint hf_dnsserver_DNS_RPC_DATA_ipv4 = -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;
@@ -477,7 +474,6 @@ 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;
@@ -488,10 +484,9 @@ 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_valDNSSRV_TYPEID_NULL_Null = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_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;
@@ -506,9 +501,7 @@ 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;
@@ -528,11 +521,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_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_DNS_RPC_SERVER_INFO_W2K_dwScavengingInterval = -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_DnssrvComplexOperation_pDataIn = -1;
-static gint hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_A_ipv4 = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_ZoneExport = -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;
@@ -549,25 +542,23 @@ 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_DNS_RPC_DATA_valDNS_TYPE_MF_name = -1;
+static gint hf_dnsserver_DNSSRV_RPC_UNION_WideString = -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;
@@ -584,10 +575,12 @@ 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;
@@ -607,19 +600,22 @@ 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;
@@ -639,9 +635,7 @@ 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;
@@ -655,8 +649,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;
@@ -669,24 +663,25 @@ 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;
@@ -701,7 +696,6 @@ 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;
@@ -711,12 +705,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;
@@ -731,19 +725,18 @@ 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 */
@@ -802,23 +795,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_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_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_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_);
@@ -1646,85 +1639,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_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_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_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_);
@@ -2569,137 +2562,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_valDNS_TYPE_TOMBSTONE_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_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_valDNS_TYPE_TOMBSTONE_timestamp);
+       offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep, hf_dnsserver_DNS_RPC_DATA_timestamp);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_ipv4address(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_A_ipv4,0);
+       offset = dnsserver_dissect_struct_ipv4address(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_ipv4,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_NS_name,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_name,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MD_name,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_name,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MF_name,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_name,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_CNAME_name,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_name,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_RECORD_SOA(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_SOA_soa,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_RECORD_SOA(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_soa,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MB_name,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_name,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MG_name,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_name,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MR_name,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_name,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_PTR_ptr,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_ptr,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_HINFO_hinfo,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_hinfo,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_RECORD_NAME_PREFERENCE(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_MX_mx,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_RECORD_NAME_PREFERENCE(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_mx,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_RECORD_STRING(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_TXT_txt,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_RECORD_STRING(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_txt,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_ipv6address(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_AAAA_ipv6,0);
+       offset = dnsserver_dissect_struct_ipv6address(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_ipv6,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_RECORD_SRV(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_SRV_srv,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_RECORD_SRV(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_srv,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_valDNS_TYPE_DNAME_name,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNS_RPC_DATA_name,0);
 
        return offset;
 }
@@ -2720,71 +2713,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_valDNS_TYPE_TOMBSTONE_timestamp(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_timestamp(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_A:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_A_ipv4(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_ipv4(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_NS:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_NS_name(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_MD:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MD_name(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_MF:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MF_name(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_CNAME:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_CNAME_name(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_SOA:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_SOA_soa(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_soa(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_MB:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MB_name(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_MG:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MG_name(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_MR:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MR_name(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_PTR:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_PTR_ptr(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_ptr(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_HINFO:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_HINFO_hinfo(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_hinfo(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_MX:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_MX_mx(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_mx(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_TXT:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_TXT_txt(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_txt(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_AAAA:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_AAAA_ipv6(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_ipv6(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_SRV:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_SRV_srv(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_srv(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNS_TYPE_DNAME:
-                       offset = dnsserver_dissect_element_DNS_RPC_DATA_valDNS_TYPE_DNAME_name(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNS_RPC_DATA_name(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -11125,639 +11118,639 @@ dnsserver_dissect_enum_DNS_RPC_TYPEID(tvbuff_t *tvb _U_, int offset _U_, packet_
 /* IDL: } */
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, drep, hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NULL_Null, 0);
+       offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, drep, hf_dnsserver_DNSSRV_RPC_UNION_Null, 0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DWORD_Dword, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_dnsserver_DNSSRV_RPC_UNION_Dword, 0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
        char *data;
 
-       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint8), hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPSTR_String, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint8), hf_dnsserver_DNSSRV_RPC_UNION_String, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
        char *data;
 
-       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPWSTR_WideString, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_dnsserver_DNSSRV_RPC_UNION_WideString, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_IP4_ARRAY(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IPARRAY_IpArray,0);
+       offset = dnsserver_dissect_struct_IP4_ARRAY(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_IpArray,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_BUFFER(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_BUFFER_Buffer,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_BUFFER(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_Buffer,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_SERVER_INFO_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ServerInfoW2K,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNSSRV_STAT(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_STATS_Stats,0);
+       offset = dnsserver_dissect_struct_DNSSRV_STAT(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_Stats,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_FORWARDERS_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_W2K_ForwardersW2K,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_FORWARDERS_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ForwardersW2K,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_W2K_ZoneW2K,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneW2K,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_INFO_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneInfoW2K,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_SECONDARIES_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_SecondariesW2K,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_DATABASE_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_DatabaseW2K,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_CREATE_INFO_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneCreateW2K,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_NAME_AND_PARAM(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_NameAndParam,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_LIST_W2K(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneListW2K,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_SERVER_INFO_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ServerInfoDotNet,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_FORWARDERS_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_DOTNET_ForwardersDotNet,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_FORWARDERS_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ForwardersDotNet,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_Zone,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_Zone,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_INFO_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneInfoDotNet,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_SECONDARIES_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_SecondariesDotNet,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_DATABASE_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_Database,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_CREATE_INFO_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneCreateDotNet,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_LIST_DOTNET(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneList,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_EXPORT_INFO(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneExport,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_DP_INFO(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_INFO_DirectoryPartition,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_DP_INFO(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_DirectoryPartition,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_DP_ENUM(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_ENUM_DirectoryPartitionEnum,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_DP_ENUM(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_DirectoryPartitionEnum,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_DP_LIST(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_LIST_DirectoryPartitionList,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_DP_LIST(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_DirectoryPartitionList,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_ENLIST_DP(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENLIST_DP_EnlistDirectoryPartition,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_ENLIST_DP(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_EnlistDirectoryPartition,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_CHANGE_DP(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneChangeDirectoryPartition,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_ENUM_ZONES_FILTER(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_EnumZonesFilter,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_ADDR_ARRAY(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ADDRARRAY_AddrArray,0);
+       offset = dnsserver_dissect_struct_DNS_ADDR_ARRAY(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_AddrArray,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_SERVER_INFO_LONGHORN(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ServerInfo,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_CREATE_INFO_LONGHORN(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneCreate,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_FORWARDERS_LONGHORN(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_Forwarders,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_FORWARDERS_LONGHORN(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_Forwarders,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_SECONDARIES_LONGHORN(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_Secondaries,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_IP_VALIDATE(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IP_VALIDATE_IpValidate,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_IP_VALIDATE(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_IpValidate,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_ZONE_INFO_LONGHORN(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_ZoneInfo,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       offset = dnsserver_dissect_struct_DNS_RPC_AUTOCONFIGURE(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_AUTOCONFIGURE_AutoConfigure,0);
+       offset = dnsserver_dissect_struct_DNS_RPC_AUTOCONFIGURE(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_AutoConfigure,0);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       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);
 
        return offset;
 }
 
 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_)
+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_)
 {
-       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);
+       offset = dnsserver_dissect_struct_DNS_RPC_UTF8_STRING_LIST(tvb,offset,pinfo,tree,drep,hf_dnsserver_DNSSRV_RPC_UNION_Utf8StringList,0);
 
        return offset;
 }
@@ -11781,163 +11774,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_valDNSSRV_TYPEID_NULL_Null(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Null(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_DWORD:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DWORD_Dword(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Dword(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_LPSTR:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPSTR_String(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_String(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_LPWSTR:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPWSTR_WideString(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_WideString(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_IPARRAY:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IPARRAY_IpArray(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_IpArray(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_BUFFER:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_BUFFER_Buffer(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Buffer(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_SERVER_INFO_W2K:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_W2K_ServerInfoW2K(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfoW2K(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_STATS:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_STATS_Stats(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Stats(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_FORWARDERS_W2K:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_W2K_ForwardersW2K(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ForwardersW2K(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_W2K:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_W2K_ZoneW2K(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneW2K(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_INFO_W2K:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_W2K_ZoneInfoW2K(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfoW2K(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_SECONDARIES_W2K:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_W2K_SecondariesW2K(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_SecondariesW2K(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_DATABASE_W2K:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_W2K_DatabaseW2K(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_DatabaseW2K(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_CREATE_W2K:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_W2K_ZoneCreateW2K(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreateW2K(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_NAME_AND_PARAM:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NAME_AND_PARAM_NameAndParam(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_NameAndParam(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_LIST_W2K:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_W2K_ZoneListW2K(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneListW2K(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_SERVER_INFO_DOTNET:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_DOTNET_ServerInfoDotNet(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfoDotNet(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_FORWARDERS_DOTNET:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_DOTNET_ForwardersDotNet(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ForwardersDotNet(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_Zone(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Zone(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_INFO_DOTNET:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_DOTNET_ZoneInfoDotNet(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfoDotNet(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_SECONDARIES_DOTNET:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_DOTNET_SecondariesDotNet(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_SecondariesDotNet(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_DATABASE:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_DATABASE_Database(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Database(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_CREATE_DOTNET:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_DOTNET_ZoneCreateDotNet(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreateDotNet(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_LIST:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_LIST_ZoneList(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneList(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_EXPORT:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_EXPORT_ZoneExport(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneExport(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_DP_INFO:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_INFO_DirectoryPartition(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartition(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_DP_ENUM:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_ENUM_DirectoryPartitionEnum(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartitionEnum(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_DP_LIST:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_DP_LIST_DirectoryPartitionList(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_DirectoryPartitionList(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ENLIST_DP:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENLIST_DP_EnlistDirectoryPartition(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_EnlistDirectoryPartition(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_CHANGE_DP:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CHANGE_DP_ZoneChangeDirectoryPartition(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneChangeDirectoryPartition(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ENUM_ZONES_FILTER:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ENUM_ZONES_FILTER_EnumZonesFilter(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_EnumZonesFilter(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ADDRARRAY:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ADDRARRAY_AddrArray(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_AddrArray(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_SERVER_INFO:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_SERVER_INFO_ServerInfo(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ServerInfo(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_CREATE:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_CREATE_ZoneCreate(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneCreate(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_FORWARDERS:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_FORWARDERS_Forwarders(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Forwarders(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_SECONDARIES:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_SECONDARIES_Secondaries(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Secondaries(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_IP_VALIDATE:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_IP_VALIDATE_IpValidate(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_IpValidate(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_ZONE_INFO:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_ZONE_INFO_ZoneInfo(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_ZoneInfo(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_AUTOCONFIGURE:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_AUTOCONFIGURE_AutoConfigure(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_AutoConfigure(tvb, offset, pinfo, tree, drep);
                break;
 
                case DNSSRV_TYPEID_UTF8_STRING_LIST:
-                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_valDNSSRV_TYPEID_UTF8_STRING_LIST_Utf8StringList(tvb, offset, pinfo, tree, drep);
+                       offset = dnsserver_dissect_element_DNSSRV_RPC_UNION_Utf8StringList(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -13823,12 +13816,14 @@ 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,
@@ -13839,6 +13834,8 @@ 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,
@@ -13849,12 +13846,10 @@ 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_valDNSSRV_TYPEID_LPWSTR_WideString,
-         { "Widestring", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_LPWSTR.WideString", FT_STRING, BASE_NONE, 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_DnssrvOperation_dwContext,
          { "Dwcontext", "dnsserver.DnssrvOperation.dwContext", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dnsserver_DNS_RPC_FORWARDERS_LONGHORN_fRecurseAfterForwarding,
@@ -13879,32 +13874,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,
@@ -13921,6 +13916,8 @@ 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,
@@ -13963,8 +13960,12 @@ 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,
@@ -13973,8 +13974,6 @@ 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,
@@ -13983,6 +13982,8 @@ 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,
@@ -13991,8 +13992,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_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_DNSSRV_RPC_UNION_ServerInfoW2K,
+         { "Serverinfow2k", "dnsserver.DNSSRV_RPC_UNION.ServerInfoW2K", 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,
@@ -14003,8 +14004,6 @@ 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,
@@ -14017,6 +14016,8 @@ 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,
@@ -14033,8 +14034,6 @@ 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,
@@ -14055,12 +14054,16 @@ 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,
@@ -14083,8 +14086,6 @@ 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,
@@ -14103,10 +14104,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,
@@ -14121,6 +14122,8 @@ 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,
@@ -14145,8 +14148,12 @@ 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,
@@ -14169,6 +14176,8 @@ 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,
@@ -14187,16 +14196,18 @@ 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_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_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_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,
@@ -14207,8 +14218,6 @@ 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,
@@ -14229,6 +14238,8 @@ 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,
@@ -14237,8 +14248,6 @@ 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,
@@ -14255,8 +14264,6 @@ 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,
@@ -14267,8 +14274,6 @@ 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,
@@ -14285,12 +14290,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,
@@ -14327,14 +14332,10 @@ 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,
@@ -14347,8 +14348,6 @@ 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,
@@ -14361,22 +14360,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_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_DNSSRV_RPC_UNION_ForwardersDotNet,
+         { "Forwardersdotnet", "dnsserver.DNSSRV_RPC_UNION.ForwardersDotNet", 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,
@@ -14405,20 +14404,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,
@@ -14427,26 +14426,22 @@ 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_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_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_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,
@@ -14465,6 +14460,8 @@ 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,
@@ -14479,16 +14476,12 @@ 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,
@@ -14503,8 +14496,6 @@ 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,
@@ -14525,12 +14516,8 @@ 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,
@@ -14543,12 +14530,8 @@ 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,
@@ -14559,14 +14542,18 @@ 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_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_DATA_ipv4,
+         { "Ipv4", "dnsserver.DNS_RPC_DATA.ipv4", 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,
@@ -14585,8 +14572,6 @@ 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,
@@ -14607,14 +14592,12 @@ 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_valDNSSRV_TYPEID_NULL_Null,
-         { "Null", "dnsserver.DNSSRV_RPC_UNION_valDNSSRV_TYPEID_NULL.Null", FT_UINT8, BASE_DEC, 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_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,
@@ -14643,12 +14626,8 @@ 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,
@@ -14687,16 +14666,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_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_DNS_RPC_SERVER_INFO_W2K_dwScavengingInterval,
          { "Dwscavenginginterval", "dnsserver.DNS_RPC_SERVER_INFO_W2K.dwScavengingInterval", FT_UINT32, BASE_DEC, 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_DnssrvComplexOperation_pDataIn,
          { "Pdatain", "dnsserver.DnssrvComplexOperation.pDataIn", 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_DNSSRV_RPC_UNION_ZoneExport,
+         { "Zoneexport", "dnsserver.DNSSRV_RPC_UNION.ZoneExport", 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,
@@ -14729,8 +14708,6 @@ 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,
@@ -14739,6 +14716,8 @@ 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,
@@ -14747,8 +14726,6 @@ 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,
@@ -14761,12 +14738,10 @@ 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_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_DNSSRV_RPC_UNION_WideString,
+         { "Widestring", "dnsserver.DNSSRV_RPC_UNION.WideString", FT_STRING, 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,
@@ -14799,6 +14774,8 @@ 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,
@@ -14807,6 +14784,8 @@ 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,
@@ -14845,22 +14824,26 @@ 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,
@@ -14871,6 +14854,8 @@ 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,
@@ -14909,12 +14894,8 @@ 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,
@@ -14941,10 +14922,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,
@@ -14969,12 +14950,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,
@@ -14985,14 +14966,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,
@@ -15005,6 +14986,8 @@ 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,
@@ -15033,8 +15016,6 @@ 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,
@@ -15053,8 +15034,6 @@ 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,
@@ -15065,6 +15044,8 @@ 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,
@@ -15093,8 +15074,6 @@ 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,
@@ -15107,8 +15086,6 @@ 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,
@@ -15119,6 +15096,8 @@ 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 }},
        };
 
 

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-drsblobs.c b/bin/default/librpc/gen_ndr/packet-dcerpc-drsblobs.c
index 34a8f3bcae3ae62f12d78305066b807fc595ea3c..0087284e5372b9e10667b8e8d65edb6202cbdf39 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-drsblobs.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-drsblobs.c
@@ -104,12 +104,10 @@ static gint ett_drsblobs_ForestTrustInfo = -1;
 /* Header field declarations */
 static gint hf_drsblobs_ExtendedErrorInfo_num_params = -1;
 static gint hf_drsblobs_ForestTrustDataDomainInfo_netbios_name = -1;
-static gint hf_drsblobs_replUpToDateVectorCtr_val2_ctr2 = -1;
 static gint hf_drsblobs_package_PrimaryKerberosString_length = -1;
 static gint hf_drsblobs_ForestTrustInfoRecordArmor_record_size = -1;
 static gint hf_drsblobs_package_PrimaryKerberosCtr4_num_old_keys = -1;
 static gint hf_drsblobs_ForestTrustInfoRecord_flags = -1;
-static gint hf_drsblobs_ForestTrustData_valFOREST_TRUST_DOMAIN_INFO_info = -1;
 static gint hf_drsblobs_repsFromTo2_consecutive_sync_failures = -1;
 static gint hf_drsblobs_decode_trustDomainPasswords_blob = -1;
 static gint hf_drsblobs_decode_supplementalCredentials_blob = -1;
@@ -136,14 +134,12 @@ static gint hf_drsblobs_trustAuthInOutBlob_current_ = -1;
 static gint hf_drsblobs_repsFromTo1_other_info_length = -1;
 static gint hf_drsblobs_supplementalCredentialsPackage_name_len = -1;
 static gint hf_drsblobs_package_PrimaryKerberosCtr4_default_iteration_count = -1;
-static gint hf_drsblobs_ldapControlDirSyncExtra_valdefault_uptodateness_vector = -1;
 static gint hf_drsblobs_ForestTrustDataBinaryData_data = -1;
 static gint hf_drsblobs_repsFromTo2OtherInfo___ndr_size = -1;
 static gint hf_drsblobs_package_PrimaryKerberosKey4_reserved3 = -1;
 static gint hf_drsblobs_package_PrimaryKerberosCtr3_padding4 = -1;
 static gint hf_drsblobs_ExtendedErrorComputerName_n = -1;
 static gint hf_drsblobs_trustAuthInOutBlob_current = -1;
-static gint hf_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT32_uint32 = -1;
 static gint hf_drsblobs_repsFromTo1_replica_flags = -1;
 static gint hf_drsblobs_repsFromTo2_source_dsa_obj_guid = -1;
 static gint hf_drsblobs_repsFromToBlob_version = -1;
@@ -154,8 +150,10 @@ static gint hf_drsblobs_decode_trustAuthInOut_blob = -1;
 static gint hf_drsblobs_decode_PrimaryKerberos_blob = -1;
 static gint hf_drsblobs_replUpToDateVectorCtr2_reserved = -1;
 static gint hf_drsblobs_decode_partialAttributeSet_blob = -1;
+static gint hf_drsblobs_partialAttributeSetCtr_ctr1 = -1;
 static gint hf_drsblobs_scheduleHeader_offset = -1;
 static gint hf_drsblobs_ExtendedErrorInfo_status = -1;
+static gint hf_drsblobs_AuthInfo_none = -1;
 static gint hf_drsblobs_package_PrimaryKerberosCtr3_num_keys = -1;
 static gint hf_drsblobs_ldapControlDirSyncBlob_extra = -1;
 static gint hf_drsblobs_repsFromTo2_blobsize = -1;
@@ -165,13 +163,11 @@ static gint hf_drsblobs_decode_Packages_blob = -1;
 static gint hf_drsblobs_trustAuthInOutBlob_previous_offset = -1;
 static gint hf_drsblobs_package_PrimaryKerberosCtr4_keys = -1;
 static gint hf_drsblobs_package_PrimaryKerberosKey3_reserved3 = -1;
-static gint hf_drsblobs_ForestTrustData_valFOREST_TRUST_TOP_LEVEL_NAME_name = -1;
 static gint hf_drsblobs_schemaInfoBlob_invocation_id = -1;
 static gint hf_drsblobs_AuthInfoNT4Owf_size = -1;
 static gint hf_drsblobs_package_PrimaryKerberosBlob_ctr = -1;
+static gint hf_drsblobs_ExtendedErrorParamU_u_string = -1;
 static gint hf_drsblobs_replPropertyMetaData1_originating_invocation_id = -1;
-static gint hf_drsblobs_repsFromTo_val1_ctr1 = -1;
-static gint hf_drsblobs_ForestTrustData_valFOREST_TRUST_TOP_LEVEL_NAME_EX_name = -1;
 static gint hf_drsblobs_package_PrimaryKerberosString_size = -1;
 static gint hf_drsblobs_replUpToDateVectorCtr1_reserved = -1;
 static gint hf_drsblobs_supplementalCredentialsSubBlob_packages = -1;
@@ -179,6 +175,7 @@ static gint hf_drsblobs_package_PrimaryKerberosCtr3_salt = -1;
 static gint hf_drsblobs_prefixMapBlob_version = -1;
 static gint hf_drsblobs_trustAuthInOutBlob_count = -1;
 static gint hf_drsblobs_supplementalCredentialsBlob_unknown1 = -1;
+static gint hf_drsblobs_replUpToDateVectorCtr_ctr2 = -1;
 static gint hf_drsblobs_supplementalCredentialsPackage_reserved = -1;
 static gint hf_drsblobs_ForestTrustDataDomainInfo_sid_size = -1;
 static gint hf_drsblobs_AuthInfoClear_password = -1;
@@ -186,29 +183,26 @@ static gint hf_drsblobs_repsFromTo2OtherInfo_unknown2 = -1;
 static gint hf_drsblobs_repsFromTo1_highwatermark = -1;
 static gint hf_drsblobs_partialAttributeSetCtr1_array = -1;
 static gint hf_drsblobs_ForestTrustInfoRecord_type = -1;
-static gint hf_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UNICODE_STRING_u_string = -1;
-static gint hf_drsblobs_ForestTrustData_valdefault_data = -1;
 static gint hf_drsblobs_repsFromTo2_last_success = -1;
 static gint hf_drsblobs_DsCompressedChunk_data = -1;
 static gint hf_drsblobs_package_PrimaryWDigestBlob_unknown2 = -1;
 static gint hf_drsblobs_package_PrimaryKerberosCtr4_old_keys = -1;
 static gint hf_drsblobs_repsFromTo2_unknown1 = -1;
 static gint hf_drsblobs_replPropertyMetaDataBlob_version = -1;
+static gint hf_drsblobs_replPropertyMetaDataCtr_ctr1 = -1;
 static gint hf_drsblobs_repsFromTo2_other_info_length = -1;
 static gint hf_drsblobs_package_PrimaryWDigestBlob_hashes = -1;
 static gint hf_drsblobs_package_PrimaryKerberosKey4_reserved1 = -1;
-static gint hf_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_ASCII_STRING_a_string = -1;
 static gint hf_drsblobs_DsCompressedChunk_marker = -1;
 static gint hf_drsblobs_schedule_numberOfSchedules = -1;
 static gint hf_drsblobs_package_PrimaryKerberosKey3_value = -1;
 static gint hf_drsblobs_partialAttributeSetBlob_version = -1;
 static gint hf_drsblobs_ExtendedErrorAString_string = -1;
+static gint hf_drsblobs_prefixMapCtr_dsdb = -1;
 static gint hf_drsblobs_repsFromTo2_source_dsa_invocation_id = -1;
 static gint hf_drsblobs_replPropertyMetaDataCtr1_reserved = -1;
 static gint hf_drsblobs_supplementalCredentialsSubBlob_prefix = -1;
-static gint hf_drsblobs_AuthInfo_valTRUST_AUTH_TYPE_VERSION_version = -1;
 static gint hf_drsblobs_trustAuthInOutBlob_current_offset = -1;
-static gint hf_drsblobs_package_PrimaryKerberosCtr_val3_ctr3 = -1;
 static gint hf_drsblobs_package_PrimaryKerberosCtr4_salt = -1;
 static gint hf_drsblobs_supplementalCredentialsBlob_sub = -1;
 static gint hf_drsblobs_ExtendedErrorParam_type = -1;
@@ -219,10 +213,11 @@ static gint hf_drsblobs_ldapControlDirSyncBlob_u1 = -1;
 static gint hf_drsblobs_replPropertyMetaDataBlob_reserved = -1;
 static gint hf_drsblobs_schedule_dataArray = -1;
 static gint hf_drsblobs_ForestTrustInfoRecord_data = -1;
-static gint hf_drsblobs_AuthInfo_valTRUST_AUTH_TYPE_NONE_none = -1;
+static gint hf_drsblobs_ForestTrustData_name = -1;
 static gint hf_drsblobs_package_PrimaryKerberosKey4_value_ = -1;
 static gint hf_drsblobs_repsFromTo1OtherInfo___dns_name_size = -1;
 static gint hf_drsblobs_AuthInfoNone_size = -1;
+static gint hf_drsblobs_AuthInfo_clear = -1;
 static gint hf_drsblobs_replUpToDateVectorBlob_ctr = -1;
 static gint hf_drsblobs_replUpToDateVectorCtr2_count = -1;
 static gint hf_drsblobs_repsFromTo2OtherInfo_dns_name1 = -1;
@@ -231,9 +226,9 @@ static gint hf_drsblobs_package_PrimaryKerberosCtr3_num_old_keys = -1;
 static gint hf_drsblobs_repsFromTo2_replica_flags = -1;
 static gint hf_drsblobs_supplementalCredentialsBlob_sub_ = -1;
 static gint hf_drsblobs_AuthenticationInformation_LastUpdateTime = -1;
-static gint hf_drsblobs_repsFromTo_val2_ctr2 = -1;
 static gint hf_drsblobs_package_PrimaryKerberosCtr3_padding3 = -1;
 static gint hf_drsblobs_ExtendedErrorUString___size = -1;
+static gint hf_drsblobs_package_PrimaryKerberosCtr_ctr3 = -1;
 static gint hf_drsblobs_AuthInfoNT4Owf_password = -1;
 static gint hf_drsblobs_replPropertyMetaData1_originating_change_time = -1;
 static gint hf_drsblobs_ldapControlDirSyncBlob_highwatermark = -1;
@@ -245,14 +240,14 @@ static gint hf_drsblobs_decode_repsFromTo_blob = -1;
 static gint hf_drsblobs_trustDomainPasswords_outgoing = -1;
 static gint hf_drsblobs_repsFromTo1OtherInfo_dns_name = -1;
 static gint hf_drsblobs_repsFromTo2_reserved = -1;
-static gint hf_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_BLOB_blob = -1;
-static gint hf_drsblobs_replUpToDateVectorCtr_val1_ctr1 = -1;
 static gint hf_drsblobs_repsFromTo1_blobsize = -1;
+static gint hf_drsblobs_AuthInfo_nt4owf = -1;
 static gint hf_drsblobs_package_PrimaryKerberosString_string = -1;
+static gint hf_drsblobs_ExtendedErrorParamU_a_string = -1;
+static gint hf_drsblobs_ForestTrustData_data = -1;
 static gint hf_drsblobs_trustDomainPasswords_incoming_size = -1;
 static gint hf_drsblobs_repsFromTo1_transport_guid = -1;
 static gint hf_drsblobs_ForestTrustDataDomainInfo_sid_ = -1;
-static gint hf_drsblobs_package_PrimaryKerberosCtr_val4_ctr4 = -1;
 static gint hf_drsblobs_repsFromTo2_transport_guid = -1;
 static gint hf_drsblobs_drsuapi_MSPrefixMap_Entry_length = -1;
 static gint hf_drsblobs_partialAttributeSetBlob_reserved = -1;
@@ -261,9 +256,11 @@ static gint hf_drsblobs_repsFromTo1_source_dsa_obj_guid = -1;
 static gint hf_drsblobs_supplementalCredentialsSubBlob_num_packages = -1;
 static gint hf_drsblobs_package_PrimaryKerberosCtr4_num_keys = -1;
 static gint hf_drsblobs_package_PrimaryKerberosKey4_iteration_count = -1;
+static gint hf_drsblobs_repsFromTo_ctr2 = -1;
 static gint hf_drsblobs_supplementalCredentialsPackage_data_len = -1;
 static gint hf_drsblobs_repsFromToBlob_reserved = -1;
 static gint hf_drsblobs_repsFromTo2_schedule = -1;
+static gint hf_drsblobs_AuthInfo_version = -1;
 static gint hf_drsblobs_trustAuthInOutBlob_previous = -1;
 static gint hf_drsblobs_ForestTrustInfoRecord_timestamp = -1;
 static gint hf_drsblobs_decode_ldapControlDirSync_cookie = -1;
@@ -272,6 +269,7 @@ static gint hf_drsblobs_package_PrimaryKerberosKey3_keytype = -1;
 static gint hf_drsblobs_trustDomainPasswords_outgoing_ = -1;
 static gint hf_drsblobs_package_PackagesBlob_names = -1;
 static gint hf_drsblobs_ExtendedErrorInfo_generating_component = -1;
+static gint hf_drsblobs_ExtendedErrorParamU_uint64 = -1;
 static gint hf_drsblobs_drsuapi_MSPrefixMap_Ctr___ndr_size = -1;
 static gint hf_drsblobs_ForestTrustInfo_version = -1;
 static gint hf_drsblobs_package_PrimaryKerberosKey3_value_ = -1;
@@ -285,14 +283,17 @@ static gint hf_drsblobs_package_PrimaryWDigestBlob_unknown1 = -1;
 static gint hf_drsblobs_AuthInfoVersion_version = -1;
 static gint hf_drsblobs_supplementalCredentialsBlob_unknown2 = -1;
 static gint hf_drsblobs_replPropertyMetaData1_attid = -1;
+static gint hf_drsblobs_ExtendedErrorParamU_uint16 = -1;
 static gint hf_drsblobs_ForestTrustString_size = -1;
 static gint hf_drsblobs_repsFromTo1_last_success = -1;
 static gint hf_drsblobs_drsuapi_MSPrefixMap_Ctr_entries = -1;
 static gint hf_drsblobs_ExtendedErrorInfo_flags = -1;
 static gint hf_drsblobs_package_PrimaryKerberosCtr3_padding2 = -1;
+static gint hf_drsblobs_repsFromTo_ctr1 = -1;
 static gint hf_drsblobs_trustDomainPasswords_confounder = -1;
 static gint hf_drsblobs_package_PrimaryWDigestBlob_uuknown4 = -1;
 static gint hf_drsblobs_repsFromTo1_consecutive_sync_failures = -1;
+static gint hf_drsblobs_ExtendedErrorComputerNameU_name = -1;
 static gint hf_drsblobs_prefixMapBlob_reserved = -1;
 static gint hf_drsblobs_ExtendedErrorInfo_pid = -1;
 static gint hf_drsblobs_scheduleSlots_slots = -1;
@@ -303,7 +304,6 @@ static gint hf_drsblobs_schedule_bandwidth = -1;
 static gint hf_drsblobs_ExtendedErrorInfo_computer_name = -1;
 static gint hf_drsblobs_repsFromTo1_schedule = -1;
 static gint hf_drsblobs_scheduleHeader_type = -1;
-static gint hf_drsblobs_prefixMapCtr_valPREFIX_MAP_VERSION_DSDB_dsdb = -1;
 static gint hf_drsblobs_package_PrimaryCLEARTEXTBlob_cleartext = -1;
 static gint hf_drsblobs_schemaInfoBlob_marker = -1;
 static gint hf_drsblobs_repsFromTo1_other_info = -1;
@@ -314,13 +314,13 @@ static gint hf_drsblobs_schemaInfoBlob_revision = -1;
 static gint hf_drsblobs_repsFromTo2_last_attempt = -1;
 static gint hf_drsblobs_replPropertyMetaData1_originating_usn = -1;
 static gint hf_drsblobs_package_PrimaryKerberosKey3_reserved1 = -1;
+static gint hf_drsblobs_package_PrimaryKerberosCtr_ctr4 = -1;
 static gint hf_drsblobs_ExtendedErrorUString_string = -1;
 static gint hf_drsblobs_repsFromTo1_source_dsa_invocation_id = -1;
 static gint hf_drsblobs_opnum = -1;
 static gint hf_drsblobs_replUpToDateVectorCtr1_cursors = -1;
 static gint hf_drsblobs_replPropertyMetaDataCtr1_array = -1;
 static gint hf_drsblobs_package_PrimaryKerberosString_string_ = -1;
-static gint hf_drsblobs_AuthInfo_valTRUST_AUTH_TYPE_NT4OWF_nt4owf = -1;
 static gint hf_drsblobs_package_PrimaryKerberosKey4_value_len = -1;
 static gint hf_drsblobs_package_PrimaryKerberosCtr4_older_keys = -1;
 static gint hf_drsblobs_ExtendedErrorBlob_length = -1;
@@ -333,13 +333,14 @@ static gint hf_drsblobs_ForestTrustString_string = -1;
 static gint hf_drsblobs_ldapControlDirSyncBlob_time = -1;
 static gint hf_drsblobs_decode_PrimaryWDigest_blob = -1;
 static gint hf_drsblobs_partialAttributeSetCtr1_count = -1;
-static gint hf_drsblobs_AuthInfo_valTRUST_AUTH_TYPE_CLEAR_clear = -1;
 static gint hf_drsblobs_replPropertyMetaDataCtr1_count = -1;
 static gint hf_drsblobs_package_PrimaryWDigestHash_hash = -1;
 static gint hf_drsblobs_ldapControlDirSyncBlob_guid1 = -1;
+static gint hf_drsblobs_replUpToDateVectorCtr_ctr1 = -1;
 static gint hf_drsblobs_trustDomainPasswords_outgoing_size = -1;
-static gint hf_drsblobs_decode_replPropertyMetaData_blob = -1;
 static gint hf_drsblobs_package_PrimaryKerberosKey4_reserved2 = -1;
+static gint hf_drsblobs_ExtendedErrorParamU_blob = -1;
+static gint hf_drsblobs_decode_replPropertyMetaData_blob = -1;
 static gint hf_drsblobs_supplementalCredentialsBlob_unknown3 = -1;
 static gint hf_drsblobs_ldapControlDirSyncBlob_extra_length = -1;
 static gint hf_drsblobs_supplementalCredentialsSubBlob_signature = -1;
@@ -349,27 +350,25 @@ static gint hf_drsblobs_repsFromToBlob_ctr = -1;
 static gint hf_drsblobs_schedule_headerArray = -1;
 static gint hf_drsblobs_replPropertyMetaDataBlob_ctr = -1;
 static gint hf_drsblobs_drsuapi_MSPrefixMap_Entry_binary_oid = -1;
-static gint hf_drsblobs_partialAttributeSetCtr_val1_ctr1 = -1;
 static gint hf_drsblobs_ExtendedErrorInfo_detection_location = -1;
 static gint hf_drsblobs_ExtendedErrorInfoPtr_info = -1;
 static gint hf_drsblobs_package_PrimaryKerberosKey3_reserved2 = -1;
+static gint hf_drsblobs_ldapControlDirSyncExtra_uptodateness_vector = -1;
 static gint hf_drsblobs_ExtendedErrorInfo_next = -1;
 static gint hf_drsblobs_ForestTrustDataDomainInfo_dns_name = -1;
 static gint hf_drsblobs_ExtendedErrorComputerName_present = -1;
 static gint hf_drsblobs_package_PrimaryKerberosCtr3_keys = -1;
 static gint hf_drsblobs_package_PrimaryKerberosCtr4_num_older_keys = -1;
 static gint hf_drsblobs_trustDomainPasswords_incoming_ = -1;
+static gint hf_drsblobs_ExtendedErrorParamU_uint32 = -1;
 static gint hf_drsblobs_replUpToDateVectorCtr1_count = -1;
-static gint hf_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT16_uint16 = -1;
-static gint hf_drsblobs_ExtendedErrorComputerNameU_valEXTENDED_ERROR_COMPUTER_NAME_PRESENT_name = -1;
 static gint hf_drsblobs_drsuapi_MSPrefixMap_Ctr_num_entries = -1;
 static gint hf_drsblobs_package_PrimaryKerberosCtr3_padding5 = -1;
-static gint hf_drsblobs_replPropertyMetaDataCtr_val1_ctr1 = -1;
 static gint hf_drsblobs_decode_ExtendedErrorInfo_ptr = -1;
 static gint hf_drsblobs_package_PrimaryKerberosCtr3_old_keys = -1;
+static gint hf_drsblobs_ForestTrustData_info = -1;
 static gint hf_drsblobs_ldapControlDirSyncBlob_u2 = -1;
 static gint hf_drsblobs_decode_ExtendedErrorInfo_ptr_ = -1;
-static gint hf_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT64_uint64 = -1;
 static gint hf_drsblobs_repsFromTo1_result_last_attempt = -1;
 static gint hf_drsblobs_package_PrimaryKerberosCtr4_num_service_keys = -1;
 static gint hf_drsblobs_decode_ForestTrustInfo_blob = -1;
@@ -401,7 +400,7 @@ static int drsblobs_dissect_element_replPropertyMetaDataCtr1_count(tvbuff_t *tvb
 static int drsblobs_dissect_element_replPropertyMetaDataCtr1_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_replPropertyMetaDataCtr1_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_replPropertyMetaDataCtr1_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_replPropertyMetaDataCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_replPropertyMetaDataCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_replPropertyMetaDataBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
 static int drsblobs_dissect_element_replPropertyMetaDataBlob_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_replPropertyMetaDataBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
@@ -413,8 +412,8 @@ static int drsblobs_dissect_element_replUpToDateVectorCtr2_count(tvbuff_t *tvb _
 static int drsblobs_dissect_element_replUpToDateVectorCtr2_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_replUpToDateVectorCtr2_cursors(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_replUpToDateVectorCtr2_cursors_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_replUpToDateVectorCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_replUpToDateVectorCtr_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_replUpToDateVectorCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_replUpToDateVectorCtr_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_replUpToDateVectorBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
 static int drsblobs_dissect_element_replUpToDateVectorBlob_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_replUpToDateVectorBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
@@ -461,8 +460,8 @@ static int drsblobs_dissect_element_repsFromTo2_source_dsa_obj_guid(tvbuff_t *tv
 static int drsblobs_dissect_element_repsFromTo2_source_dsa_invocation_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_repsFromTo2_transport_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_repsFromTo2_unknown1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_repsFromTo_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_repsFromTo_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_repsFromTo_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_repsFromTo_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_repsFromToBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
 static int drsblobs_dissect_element_repsFromToBlob_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_repsFromToBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
@@ -480,7 +479,7 @@ static int drsblobs_dissect_element_schedule_dataArray_(tvbuff_t *tvb _U_, int o
 static int drsblobs_dissect_element_partialAttributeSetCtr1_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_partialAttributeSetCtr1_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_partialAttributeSetCtr1_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_partialAttributeSetCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_partialAttributeSetCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_partialAttributeSetBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
 static int drsblobs_dissect_element_partialAttributeSetBlob_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_partialAttributeSetBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
@@ -499,11 +498,11 @@ const value_string drsblobs_prefixMapVersion_vals[] = {
        { PREFIX_MAP_VERSION_DSDB, "PREFIX_MAP_VERSION_DSDB" },
 { 0, NULL }
 };
-static int drsblobs_dissect_element_prefixMapCtr_valPREFIX_MAP_VERSION_DSDB_dsdb(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_prefixMapCtr_dsdb(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_prefixMapBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
 static int drsblobs_dissect_element_prefixMapBlob_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_prefixMapBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
-static int drsblobs_dissect_element_ldapControlDirSyncExtra_valdefault_uptodateness_vector(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_ldapControlDirSyncExtra_uptodateness_vector(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_ldapControlDirSyncBlob_u1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_ldapControlDirSyncBlob_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_ldapControlDirSyncBlob_u2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -588,8 +587,8 @@ static int drsblobs_dissect_element_package_PrimaryKerberosCtr4_old_keys(tvbuff_
 static int drsblobs_dissect_element_package_PrimaryKerberosCtr4_old_keys_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_package_PrimaryKerberosCtr4_older_keys(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_package_PrimaryKerberosCtr4_older_keys_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_package_PrimaryKerberosCtr_val3_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_package_PrimaryKerberosCtr_val4_ctr4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_package_PrimaryKerberosCtr_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_package_PrimaryKerberosCtr_ctr4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_package_PrimaryKerberosBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
 static int drsblobs_dissect_element_package_PrimaryKerberosBlob_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_package_PrimaryKerberosBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
@@ -611,10 +610,10 @@ static int drsblobs_dissect_element_AuthInfoClear_password(tvbuff_t *tvb _U_, in
 static int drsblobs_dissect_element_AuthInfoClear_password_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_AuthInfoVersion_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_AuthInfoVersion_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_AuthInfo_valTRUST_AUTH_TYPE_NONE_none(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_AuthInfo_valTRUST_AUTH_TYPE_NT4OWF_nt4owf(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_AuthInfo_valTRUST_AUTH_TYPE_CLEAR_clear(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_AuthInfo_valTRUST_AUTH_TYPE_VERSION_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_AuthInfo_none(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_AuthInfo_nt4owf(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_AuthInfo_clear(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_AuthInfo_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_AuthenticationInformation_LastUpdateTime(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_AuthenticationInformation_AuthType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *AuthType);
 static int drsblobs_dissect_element_AuthenticationInformation_AuthInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *AuthType);
@@ -656,7 +655,7 @@ const value_string drsblobs_ExtendedErrorComputerNamePresent_vals[] = {
        { EXTENDED_ERROR_COMPUTER_NAME_NOT_PRESENT, "EXTENDED_ERROR_COMPUTER_NAME_NOT_PRESENT" },
 { 0, NULL }
 };
-static int drsblobs_dissect_element_ExtendedErrorComputerNameU_valEXTENDED_ERROR_COMPUTER_NAME_PRESENT_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_ExtendedErrorComputerNameU_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_ExtendedErrorComputerName_present(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *present);
 static int drsblobs_dissect_element_ExtendedErrorComputerName_n(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *present);
 const value_string drsblobs_ExtendedErrorParamType_vals[] = {
@@ -669,12 +668,12 @@ const value_string drsblobs_ExtendedErrorParamType_vals[] = {
        { EXTENDED_ERROR_PARAM_TYPE_BLOB, "EXTENDED_ERROR_PARAM_TYPE_BLOB" },
 { 0, NULL }
 };
-static int drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_ASCII_STRING_a_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UNICODE_STRING_u_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT32_uint32(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT16_uint16(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT64_uint64(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_BLOB_blob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_ExtendedErrorParamU_a_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_ExtendedErrorParamU_u_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_ExtendedErrorParamU_uint32(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_ExtendedErrorParamU_uint16(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_ExtendedErrorParamU_uint64(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_ExtendedErrorParamU_blob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_ExtendedErrorParam_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *type);
 static int drsblobs_dissect_element_ExtendedErrorParam_p(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *type);
 static int drsblobs_dissect_element_ExtendedErrorInfo_next(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -702,10 +701,10 @@ static int drsblobs_dissect_element_ForestTrustDataDomainInfo_netbios_name(tvbuf
 static int drsblobs_dissect_element_ForestTrustDataBinaryData_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_ForestTrustDataBinaryData_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_ForestTrustDataBinaryData_data_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_ForestTrustData_valFOREST_TRUST_TOP_LEVEL_NAME_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_ForestTrustData_valFOREST_TRUST_TOP_LEVEL_NAME_EX_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_ForestTrustData_valFOREST_TRUST_DOMAIN_INFO_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_ForestTrustData_valdefault_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_ForestTrustData_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_ForestTrustData_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_ForestTrustData_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsblobs_dissect_element_ForestTrustData_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 const value_string drsblobs_ForestTrustInfoRecordType_vals[] = {
        { FOREST_TRUST_TOP_LEVEL_NAME, "FOREST_TRUST_TOP_LEVEL_NAME" },
        { FOREST_TRUST_TOP_LEVEL_NAME_EX, "FOREST_TRUST_TOP_LEVEL_NAME_EX" },
@@ -982,9 +981,9 @@ drsblobs_dissect_struct_replPropertyMetaDataCtr1(tvbuff_t *tvb _U_, int offset _
 /* IDL: } */
 
 static int
-drsblobs_dissect_element_replPropertyMetaDataCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_replPropertyMetaDataCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_replPropertyMetaDataCtr1(tvb,offset,pinfo,tree,drep,hf_drsblobs_replPropertyMetaDataCtr_val1_ctr1,0);
+       offset = drsblobs_dissect_struct_replPropertyMetaDataCtr1(tvb,offset,pinfo,tree,drep,hf_drsblobs_replPropertyMetaDataCtr_ctr1,0);
 
        return offset;
 }
@@ -1005,7 +1004,7 @@ drsblobs_dissect_replPropertyMetaDataCtr(tvbuff_t *tvb _U_, int offset _U_, pack
 
        switch(level) {
                case 1:
-                       offset = drsblobs_dissect_element_replPropertyMetaDataCtr_val1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_replPropertyMetaDataCtr_ctr1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -1230,17 +1229,17 @@ drsblobs_dissect_struct_replUpToDateVectorCtr2(tvbuff_t *tvb _U_, int offset _U_
 /* IDL: } */
 
 static int
-drsblobs_dissect_element_replUpToDateVectorCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_replUpToDateVectorCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_replUpToDateVectorCtr1(tvb,offset,pinfo,tree,drep,hf_drsblobs_replUpToDateVectorCtr_val1_ctr1,0);
+       offset = drsblobs_dissect_struct_replUpToDateVectorCtr1(tvb,offset,pinfo,tree,drep,hf_drsblobs_replUpToDateVectorCtr_ctr1,0);
 
        return offset;
 }
 
 static int
-drsblobs_dissect_element_replUpToDateVectorCtr_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_replUpToDateVectorCtr_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_replUpToDateVectorCtr2(tvb,offset,pinfo,tree,drep,hf_drsblobs_replUpToDateVectorCtr_val2_ctr2,0);
+       offset = drsblobs_dissect_struct_replUpToDateVectorCtr2(tvb,offset,pinfo,tree,drep,hf_drsblobs_replUpToDateVectorCtr_ctr2,0);
 
        return offset;
 }
@@ -1261,11 +1260,11 @@ drsblobs_dissect_replUpToDateVectorCtr(tvbuff_t *tvb _U_, int offset _U_, packet
 
        switch(level) {
                case 1:
-                       offset = drsblobs_dissect_element_replUpToDateVectorCtr_val1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_replUpToDateVectorCtr_ctr1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = drsblobs_dissect_element_replUpToDateVectorCtr_val2_ctr2(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_replUpToDateVectorCtr_ctr2(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -1933,17 +1932,17 @@ drsblobs_dissect_struct_repsFromTo2(tvbuff_t *tvb _U_, int offset _U_, packet_in
 /* IDL: } */
 
 static int
-drsblobs_dissect_element_repsFromTo_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_repsFromTo_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_repsFromTo1(tvb,offset,pinfo,tree,drep,hf_drsblobs_repsFromTo_val1_ctr1,0);
+       offset = drsblobs_dissect_struct_repsFromTo1(tvb,offset,pinfo,tree,drep,hf_drsblobs_repsFromTo_ctr1,0);
 
        return offset;
 }
 
 static int
-drsblobs_dissect_element_repsFromTo_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_repsFromTo_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_repsFromTo2(tvb,offset,pinfo,tree,drep,hf_drsblobs_repsFromTo_val2_ctr2,0);
+       offset = drsblobs_dissect_struct_repsFromTo2(tvb,offset,pinfo,tree,drep,hf_drsblobs_repsFromTo_ctr2,0);
 
        return offset;
 }
@@ -1964,11 +1963,11 @@ drsblobs_dissect_repsFromTo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 
        switch(level) {
                case 1:
-                       offset = drsblobs_dissect_element_repsFromTo_val1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_repsFromTo_ctr1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = drsblobs_dissect_element_repsFromTo_val2_ctr2(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_repsFromTo_ctr2(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -2313,9 +2312,9 @@ drsblobs_dissect_struct_partialAttributeSetCtr1(tvbuff_t *tvb _U_, int offset _U
 /* IDL: } */
 
 static int
-drsblobs_dissect_element_partialAttributeSetCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_partialAttributeSetCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_partialAttributeSetCtr1(tvb,offset,pinfo,tree,drep,hf_drsblobs_partialAttributeSetCtr_val1_ctr1,0);
+       offset = drsblobs_dissect_struct_partialAttributeSetCtr1(tvb,offset,pinfo,tree,drep,hf_drsblobs_partialAttributeSetCtr_ctr1,0);
 
        return offset;
 }
@@ -2336,7 +2335,7 @@ drsblobs_dissect_partialAttributeSetCtr(tvbuff_t *tvb _U_, int offset _U_, packe
 
        switch(level) {
                case 1:
-                       offset = drsblobs_dissect_element_partialAttributeSetCtr_val1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_partialAttributeSetCtr_ctr1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -2642,9 +2641,9 @@ drsblobs_dissect_enum_prefixMapVersion(tvbuff_t *tvb _U_, int offset _U_, packet
 /* IDL: } */
 
 static int
-drsblobs_dissect_element_prefixMapCtr_valPREFIX_MAP_VERSION_DSDB_dsdb(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_prefixMapCtr_dsdb(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_drsuapi_DsReplicaOIDMapping_Ctr(tvb,offset,pinfo,tree,drep,hf_drsblobs_prefixMapCtr_valPREFIX_MAP_VERSION_DSDB_dsdb,0);
+       offset = drsblobs_dissect_struct_drsuapi_DsReplicaOIDMapping_Ctr(tvb,offset,pinfo,tree,drep,hf_drsblobs_prefixMapCtr_dsdb,0);
 
        return offset;
 }
@@ -2665,7 +2664,7 @@ drsblobs_dissect_prefixMapCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 
        switch(level) {
                case PREFIX_MAP_VERSION_DSDB:
-                       offset = drsblobs_dissect_element_prefixMapCtr_valPREFIX_MAP_VERSION_DSDB_dsdb(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_prefixMapCtr_dsdb(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -2746,9 +2745,9 @@ drsblobs_dissect_struct_prefixMapBlob(tvbuff_t *tvb _U_, int offset _U_, packet_
 /* IDL: } */
 
 static int
-drsblobs_dissect_element_ldapControlDirSyncExtra_valdefault_uptodateness_vector(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_ldapControlDirSyncExtra_uptodateness_vector(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_replUpToDateVectorBlob(tvb,offset,pinfo,tree,drep,hf_drsblobs_ldapControlDirSyncExtra_valdefault_uptodateness_vector,0);
+       offset = drsblobs_dissect_struct_replUpToDateVectorBlob(tvb,offset,pinfo,tree,drep,hf_drsblobs_ldapControlDirSyncExtra_uptodateness_vector,0);
 
        return offset;
 }
@@ -2772,7 +2771,7 @@ drsblobs_dissect_ldapControlDirSyncExtra(tvbuff_t *tvb _U_, int offset _U_, pack
                break;
 
                default:
-                       offset = drsblobs_dissect_element_ldapControlDirSyncExtra_valdefault_uptodateness_vector(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_ldapControlDirSyncExtra_uptodateness_vector(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -4046,17 +4045,17 @@ drsblobs_dissect_struct_package_PrimaryKerberosCtr4(tvbuff_t *tvb _U_, int offse
 /* IDL: } */
 
 static int
-drsblobs_dissect_element_package_PrimaryKerberosCtr_val3_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_package_PrimaryKerberosCtr_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_package_PrimaryKerberosCtr3(tvb,offset,pinfo,tree,drep,hf_drsblobs_package_PrimaryKerberosCtr_val3_ctr3,0);
+       offset = drsblobs_dissect_struct_package_PrimaryKerberosCtr3(tvb,offset,pinfo,tree,drep,hf_drsblobs_package_PrimaryKerberosCtr_ctr3,0);
 
        return offset;
 }
 
 static int
-drsblobs_dissect_element_package_PrimaryKerberosCtr_val4_ctr4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_package_PrimaryKerberosCtr_ctr4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_package_PrimaryKerberosCtr4(tvb,offset,pinfo,tree,drep,hf_drsblobs_package_PrimaryKerberosCtr_val4_ctr4,0);
+       offset = drsblobs_dissect_struct_package_PrimaryKerberosCtr4(tvb,offset,pinfo,tree,drep,hf_drsblobs_package_PrimaryKerberosCtr_ctr4,0);
 
        return offset;
 }
@@ -4077,11 +4076,11 @@ drsblobs_dissect_package_PrimaryKerberosCtr(tvbuff_t *tvb _U_, int offset _U_, p
 
        switch(level) {
                case 3:
-                       offset = drsblobs_dissect_element_package_PrimaryKerberosCtr_val3_ctr3(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_package_PrimaryKerberosCtr_ctr3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = drsblobs_dissect_element_package_PrimaryKerberosCtr_val4_ctr4(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_package_PrimaryKerberosCtr_ctr4(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -4573,33 +4572,33 @@ drsblobs_dissect_struct_AuthInfoVersion(tvbuff_t *tvb _U_, int offset _U_, packe
 /* IDL: } */
 
 static int
-drsblobs_dissect_element_AuthInfo_valTRUST_AUTH_TYPE_NONE_none(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_AuthInfo_none(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_AuthInfoNone(tvb,offset,pinfo,tree,drep,hf_drsblobs_AuthInfo_valTRUST_AUTH_TYPE_NONE_none,0);
+       offset = drsblobs_dissect_struct_AuthInfoNone(tvb,offset,pinfo,tree,drep,hf_drsblobs_AuthInfo_none,0);
 
        return offset;
 }
 
 static int
-drsblobs_dissect_element_AuthInfo_valTRUST_AUTH_TYPE_NT4OWF_nt4owf(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_AuthInfo_nt4owf(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_AuthInfoNT4Owf(tvb,offset,pinfo,tree,drep,hf_drsblobs_AuthInfo_valTRUST_AUTH_TYPE_NT4OWF_nt4owf,0);
+       offset = drsblobs_dissect_struct_AuthInfoNT4Owf(tvb,offset,pinfo,tree,drep,hf_drsblobs_AuthInfo_nt4owf,0);
 
        return offset;
 }
 
 static int
-drsblobs_dissect_element_AuthInfo_valTRUST_AUTH_TYPE_CLEAR_clear(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_AuthInfo_clear(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_AuthInfoClear(tvb,offset,pinfo,tree,drep,hf_drsblobs_AuthInfo_valTRUST_AUTH_TYPE_CLEAR_clear,0);
+       offset = drsblobs_dissect_struct_AuthInfoClear(tvb,offset,pinfo,tree,drep,hf_drsblobs_AuthInfo_clear,0);
 
        return offset;
 }
 
 static int
-drsblobs_dissect_element_AuthInfo_valTRUST_AUTH_TYPE_VERSION_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_AuthInfo_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_AuthInfoVersion(tvb,offset,pinfo,tree,drep,hf_drsblobs_AuthInfo_valTRUST_AUTH_TYPE_VERSION_version,0);
+       offset = drsblobs_dissect_struct_AuthInfoVersion(tvb,offset,pinfo,tree,drep,hf_drsblobs_AuthInfo_version,0);
 
        return offset;
 }
@@ -4620,19 +4619,19 @@ drsblobs_dissect_AuthInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case TRUST_AUTH_TYPE_NONE:
-                       offset = drsblobs_dissect_element_AuthInfo_valTRUST_AUTH_TYPE_NONE_none(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_AuthInfo_none(tvb, offset, pinfo, tree, drep);
                break;
 
                case TRUST_AUTH_TYPE_NT4OWF:
-                       offset = drsblobs_dissect_element_AuthInfo_valTRUST_AUTH_TYPE_NT4OWF_nt4owf(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_AuthInfo_nt4owf(tvb, offset, pinfo, tree, drep);
                break;
 
                case TRUST_AUTH_TYPE_CLEAR:
-                       offset = drsblobs_dissect_element_AuthInfo_valTRUST_AUTH_TYPE_CLEAR_clear(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_AuthInfo_clear(tvb, offset, pinfo, tree, drep);
                break;
 
                case TRUST_AUTH_TYPE_VERSION:
-                       offset = drsblobs_dissect_element_AuthInfo_valTRUST_AUTH_TYPE_VERSION_version(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_AuthInfo_version(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -5339,9 +5338,9 @@ drsblobs_dissect_enum_ExtendedErrorComputerNamePresent(tvbuff_t *tvb _U_, int of
 /* IDL: } */
 
 static int
-drsblobs_dissect_element_ExtendedErrorComputerNameU_valEXTENDED_ERROR_COMPUTER_NAME_PRESENT_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_ExtendedErrorComputerNameU_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_ExtendedErrorUString(tvb,offset,pinfo,tree,drep,hf_drsblobs_ExtendedErrorComputerNameU_valEXTENDED_ERROR_COMPUTER_NAME_PRESENT_name,0);
+       offset = drsblobs_dissect_struct_ExtendedErrorUString(tvb,offset,pinfo,tree,drep,hf_drsblobs_ExtendedErrorComputerNameU_name,0);
 
        return offset;
 }
@@ -5365,7 +5364,7 @@ drsblobs_dissect_ExtendedErrorComputerNameU(tvbuff_t *tvb _U_, int offset _U_, p
 
        switch(level) {
                case EXTENDED_ERROR_COMPUTER_NAME_PRESENT:
-                       offset = drsblobs_dissect_element_ExtendedErrorComputerNameU_valEXTENDED_ERROR_COMPUTER_NAME_PRESENT_name(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_ExtendedErrorComputerNameU_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case EXTENDED_ERROR_COMPUTER_NAME_NOT_PRESENT:
@@ -5469,49 +5468,49 @@ drsblobs_dissect_enum_ExtendedErrorParamType(tvbuff_t *tvb _U_, int offset _U_,
 /* IDL: } */
 
 static int
-drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_ASCII_STRING_a_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_ExtendedErrorParamU_a_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_ExtendedErrorAString(tvb,offset,pinfo,tree,drep,hf_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_ASCII_STRING_a_string,0);
+       offset = drsblobs_dissect_struct_ExtendedErrorAString(tvb,offset,pinfo,tree,drep,hf_drsblobs_ExtendedErrorParamU_a_string,0);
 
        return offset;
 }
 
 static int
-drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UNICODE_STRING_u_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_ExtendedErrorParamU_u_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_ExtendedErrorUString(tvb,offset,pinfo,tree,drep,hf_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UNICODE_STRING_u_string,0);
+       offset = drsblobs_dissect_struct_ExtendedErrorUString(tvb,offset,pinfo,tree,drep,hf_drsblobs_ExtendedErrorParamU_u_string,0);
 
        return offset;
 }
 
 static int
-drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT32_uint32(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_ExtendedErrorParamU_uint32(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_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT32_uint32, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_drsblobs_ExtendedErrorParamU_uint32, 0);
 
        return offset;
 }
 
 static int
-drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT16_uint16(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_ExtendedErrorParamU_uint16(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, drep, hf_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT16_uint16, 0);
+       offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, drep, hf_drsblobs_ExtendedErrorParamU_uint16, 0);
 
        return offset;
 }
 
 static int
-drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT64_uint64(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_ExtendedErrorParamU_uint64(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT64_uint64, NULL);
+       offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_drsblobs_ExtendedErrorParamU_uint64, NULL);
 
        return offset;
 }
 
 static int
-drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_BLOB_blob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_ExtendedErrorParamU_blob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_ExtendedErrorBlob(tvb,offset,pinfo,tree,drep,hf_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_BLOB_blob,0);
+       offset = drsblobs_dissect_struct_ExtendedErrorBlob(tvb,offset,pinfo,tree,drep,hf_drsblobs_ExtendedErrorParamU_blob,0);
 
        return offset;
 }
@@ -5535,30 +5534,30 @@ drsblobs_dissect_ExtendedErrorParamU(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
        switch(level) {
                case EXTENDED_ERROR_PARAM_TYPE_ASCII_STRING:
-                       offset = drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_ASCII_STRING_a_string(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_ExtendedErrorParamU_a_string(tvb, offset, pinfo, tree, drep);
                break;
 
                case EXTENDED_ERROR_PARAM_TYPE_UNICODE_STRING:
-                       offset = drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UNICODE_STRING_u_string(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_ExtendedErrorParamU_u_string(tvb, offset, pinfo, tree, drep);
                break;
 
                case EXTENDED_ERROR_PARAM_TYPE_UINT32:
-                       offset = drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT32_uint32(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_ExtendedErrorParamU_uint32(tvb, offset, pinfo, tree, drep);
                break;
 
                case EXTENDED_ERROR_PARAM_TYPE_UINT16:
-                       offset = drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT16_uint16(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_ExtendedErrorParamU_uint16(tvb, offset, pinfo, tree, drep);
                break;
 
                case EXTENDED_ERROR_PARAM_TYPE_UINT64:
-                       offset = drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT64_uint64(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_ExtendedErrorParamU_uint64(tvb, offset, pinfo, tree, drep);
                break;
 
                case EXTENDED_ERROR_PARAM_TYPE_NONE:
                break;
 
                case EXTENDED_ERROR_PARAM_TYPE_BLOB:
-                       offset = drsblobs_dissect_element_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_BLOB_blob(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_ExtendedErrorParamU_blob(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -6057,33 +6056,33 @@ drsblobs_dissect_struct_ForestTrustDataBinaryData(tvbuff_t *tvb _U_, int offset
 /* IDL: } */
 
 static int
-drsblobs_dissect_element_ForestTrustData_valFOREST_TRUST_TOP_LEVEL_NAME_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_ForestTrustData_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_ForestTrustString(tvb,offset,pinfo,tree,drep,hf_drsblobs_ForestTrustData_valFOREST_TRUST_TOP_LEVEL_NAME_name,0);
+       offset = drsblobs_dissect_struct_ForestTrustString(tvb,offset,pinfo,tree,drep,hf_drsblobs_ForestTrustData_name,0);
 
        return offset;
 }
 
 static int
-drsblobs_dissect_element_ForestTrustData_valFOREST_TRUST_TOP_LEVEL_NAME_EX_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_ForestTrustData_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_ForestTrustString(tvb,offset,pinfo,tree,drep,hf_drsblobs_ForestTrustData_valFOREST_TRUST_TOP_LEVEL_NAME_EX_name,0);
+       offset = drsblobs_dissect_struct_ForestTrustString(tvb,offset,pinfo,tree,drep,hf_drsblobs_ForestTrustData_name,0);
 
        return offset;
 }
 
 static int
-drsblobs_dissect_element_ForestTrustData_valFOREST_TRUST_DOMAIN_INFO_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_ForestTrustData_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_ForestTrustDataDomainInfo(tvb,offset,pinfo,tree,drep,hf_drsblobs_ForestTrustData_valFOREST_TRUST_DOMAIN_INFO_info,0);
+       offset = drsblobs_dissect_struct_ForestTrustDataDomainInfo(tvb,offset,pinfo,tree,drep,hf_drsblobs_ForestTrustData_info,0);
 
        return offset;
 }
 
 static int
-drsblobs_dissect_element_ForestTrustData_valdefault_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsblobs_dissect_element_ForestTrustData_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsblobs_dissect_struct_ForestTrustDataBinaryData(tvb,offset,pinfo,tree,drep,hf_drsblobs_ForestTrustData_valdefault_data,0);
+       offset = drsblobs_dissect_struct_ForestTrustDataBinaryData(tvb,offset,pinfo,tree,drep,hf_drsblobs_ForestTrustData_data,0);
 
        return offset;
 }
@@ -6104,19 +6103,19 @@ drsblobs_dissect_ForestTrustData(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
        switch(level) {
                case FOREST_TRUST_TOP_LEVEL_NAME:
-                       offset = drsblobs_dissect_element_ForestTrustData_valFOREST_TRUST_TOP_LEVEL_NAME_name(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_ForestTrustData_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case FOREST_TRUST_TOP_LEVEL_NAME_EX:
-                       offset = drsblobs_dissect_element_ForestTrustData_valFOREST_TRUST_TOP_LEVEL_NAME_EX_name(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_ForestTrustData_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case FOREST_TRUST_DOMAIN_INFO:
-                       offset = drsblobs_dissect_element_ForestTrustData_valFOREST_TRUST_DOMAIN_INFO_info(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_ForestTrustData_info(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = drsblobs_dissect_element_ForestTrustData_valdefault_data(tvb, offset, pinfo, tree, drep);
+                       offset = drsblobs_dissect_element_ForestTrustData_data(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -6828,8 +6827,6 @@ void proto_register_dcerpc_drsblobs(void)
          { "Num Params", "drsblobs.ExtendedErrorInfo.num_params", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ForestTrustDataDomainInfo_netbios_name,
          { "Netbios Name", "drsblobs.ForestTrustDataDomainInfo.netbios_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_replUpToDateVectorCtr_val2_ctr2,
-         { "Ctr2", "drsblobs.replUpToDateVectorCtr_val2.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosString_length,
          { "Length", "drsblobs.package_PrimaryKerberosString.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ForestTrustInfoRecordArmor_record_size,
@@ -6838,8 +6835,6 @@ void proto_register_dcerpc_drsblobs(void)
          { "Num Old Keys", "drsblobs.package_PrimaryKerberosCtr4.num_old_keys", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ForestTrustInfoRecord_flags,
          { "Flags", "drsblobs.ForestTrustInfoRecord.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_ForestTrustData_valFOREST_TRUST_DOMAIN_INFO_info,
-         { "Info", "drsblobs.ForestTrustData_valFOREST_TRUST_DOMAIN_INFO.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromTo2_consecutive_sync_failures,
          { "Consecutive Sync Failures", "drsblobs.repsFromTo2.consecutive_sync_failures", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_decode_trustDomainPasswords_blob,
@@ -6892,8 +6887,6 @@ void proto_register_dcerpc_drsblobs(void)
          { "Name Len", "drsblobs.supplementalCredentialsPackage.name_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosCtr4_default_iteration_count,
          { "Default Iteration Count", "drsblobs.package_PrimaryKerberosCtr4.default_iteration_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_ldapControlDirSyncExtra_valdefault_uptodateness_vector,
-         { "Uptodateness Vector", "drsblobs.ldapControlDirSyncExtra_valdefault.uptodateness_vector", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ForestTrustDataBinaryData_data,
          { "Data", "drsblobs.ForestTrustDataBinaryData.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromTo2OtherInfo___ndr_size,
@@ -6906,8 +6899,6 @@ void proto_register_dcerpc_drsblobs(void)
          { "N", "drsblobs.ExtendedErrorComputerName.n", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_trustAuthInOutBlob_current,
          { "Current", "drsblobs.trustAuthInOutBlob.current", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT32_uint32,
-         { "Uint32", "drsblobs.ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT32.uint32", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromTo1_replica_flags,
          { "Replica Flags", "drsblobs.repsFromTo1.replica_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromTo2_source_dsa_obj_guid,
@@ -6928,10 +6919,14 @@ void proto_register_dcerpc_drsblobs(void)
          { "Reserved", "drsblobs.replUpToDateVectorCtr2.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_decode_partialAttributeSet_blob,
          { "Blob", "drsblobs.decode_partialAttributeSet.blob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_partialAttributeSetCtr_ctr1,
+         { "Ctr1", "drsblobs.partialAttributeSetCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_scheduleHeader_offset,
          { "Offset", "drsblobs.scheduleHeader.offset", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ExtendedErrorInfo_status,
          { "Status", "drsblobs.ExtendedErrorInfo.status", FT_UINT32, BASE_DEC, VALS(WERR_errors), 0, NULL, HFILL }},
+       { &hf_drsblobs_AuthInfo_none,
+         { "None", "drsblobs.AuthInfo.none", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosCtr3_num_keys,
          { "Num Keys", "drsblobs.package_PrimaryKerberosCtr3.num_keys", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ldapControlDirSyncBlob_extra,
@@ -6950,20 +6945,16 @@ void proto_register_dcerpc_drsblobs(void)
          { "Keys", "drsblobs.package_PrimaryKerberosCtr4.keys", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosKey3_reserved3,
          { "Reserved3", "drsblobs.package_PrimaryKerberosKey3.reserved3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_ForestTrustData_valFOREST_TRUST_TOP_LEVEL_NAME_name,
-         { "Name", "drsblobs.ForestTrustData_valFOREST_TRUST_TOP_LEVEL_NAME.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_schemaInfoBlob_invocation_id,
          { "Invocation Id", "drsblobs.schemaInfoBlob.invocation_id", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_AuthInfoNT4Owf_size,
          { "Size", "drsblobs.AuthInfoNT4Owf.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosBlob_ctr,
          { "Ctr", "drsblobs.package_PrimaryKerberosBlob.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_ExtendedErrorParamU_u_string,
+         { "U String", "drsblobs.ExtendedErrorParamU.u_string", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_replPropertyMetaData1_originating_invocation_id,
          { "Originating Invocation Id", "drsblobs.replPropertyMetaData1.originating_invocation_id", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_repsFromTo_val1_ctr1,
-         { "Ctr1", "drsblobs.repsFromTo_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_ForestTrustData_valFOREST_TRUST_TOP_LEVEL_NAME_EX_name,
-         { "Name", "drsblobs.ForestTrustData_valFOREST_TRUST_TOP_LEVEL_NAME_EX.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosString_size,
          { "Size", "drsblobs.package_PrimaryKerberosString.size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_replUpToDateVectorCtr1_reserved,
@@ -6978,6 +6969,8 @@ void proto_register_dcerpc_drsblobs(void)
          { "Count", "drsblobs.trustAuthInOutBlob.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_supplementalCredentialsBlob_unknown1,
          { "Unknown1", "drsblobs.supplementalCredentialsBlob.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_replUpToDateVectorCtr_ctr2,
+         { "Ctr2", "drsblobs.replUpToDateVectorCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_supplementalCredentialsPackage_reserved,
          { "Reserved", "drsblobs.supplementalCredentialsPackage.reserved", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ForestTrustDataDomainInfo_sid_size,
@@ -6992,10 +6985,6 @@ void proto_register_dcerpc_drsblobs(void)
          { "Array", "drsblobs.partialAttributeSetCtr1.array", FT_UINT32, BASE_DEC, VALS(drsblobs_drsuapi_DsAttributeId_vals), 0, NULL, HFILL }},
        { &hf_drsblobs_ForestTrustInfoRecord_type,
          { "Type", "drsblobs.ForestTrustInfoRecord.type", FT_UINT8, BASE_DEC, VALS(drsblobs_ForestTrustInfoRecordType_vals), 0, NULL, HFILL }},
-       { &hf_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UNICODE_STRING_u_string,
-         { "U String", "drsblobs.ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UNICODE_STRING.u_string", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_ForestTrustData_valdefault_data,
-         { "Data", "drsblobs.ForestTrustData_valdefault.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromTo2_last_success,
          { "Last Success", "drsblobs.repsFromTo2.last_success", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_DsCompressedChunk_data,
@@ -7008,14 +6997,14 @@ void proto_register_dcerpc_drsblobs(void)
          { "Unknown1", "drsblobs.repsFromTo2.unknown1", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_replPropertyMetaDataBlob_version,
          { "Version", "drsblobs.replPropertyMetaDataBlob.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_replPropertyMetaDataCtr_ctr1,
+         { "Ctr1", "drsblobs.replPropertyMetaDataCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromTo2_other_info_length,
          { "Other Info Length", "drsblobs.repsFromTo2.other_info_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryWDigestBlob_hashes,
          { "Hashes", "drsblobs.package_PrimaryWDigestBlob.hashes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosKey4_reserved1,
          { "Reserved1", "drsblobs.package_PrimaryKerberosKey4.reserved1", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_ASCII_STRING_a_string,
-         { "A String", "drsblobs.ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_ASCII_STRING.a_string", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_DsCompressedChunk_marker,
          { "Marker", "drsblobs.DsCompressedChunk.marker", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_schedule_numberOfSchedules,
@@ -7026,18 +7015,16 @@ void proto_register_dcerpc_drsblobs(void)
          { "Version", "drsblobs.partialAttributeSetBlob.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ExtendedErrorAString_string,
          { "String", "drsblobs.ExtendedErrorAString.string", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_prefixMapCtr_dsdb,
+         { "Dsdb", "drsblobs.prefixMapCtr.dsdb", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromTo2_source_dsa_invocation_id,
          { "Source Dsa Invocation Id", "drsblobs.repsFromTo2.source_dsa_invocation_id", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_replPropertyMetaDataCtr1_reserved,
          { "Reserved", "drsblobs.replPropertyMetaDataCtr1.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_supplementalCredentialsSubBlob_prefix,
          { "Prefix", "drsblobs.supplementalCredentialsSubBlob.prefix", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_AuthInfo_valTRUST_AUTH_TYPE_VERSION_version,
-         { "Version", "drsblobs.AuthInfo_valTRUST_AUTH_TYPE_VERSION.version", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_trustAuthInOutBlob_current_offset,
          { "Current Offset", "drsblobs.trustAuthInOutBlob.current_offset", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_package_PrimaryKerberosCtr_val3_ctr3,
-         { "Ctr3", "drsblobs.package_PrimaryKerberosCtr_val3.ctr3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosCtr4_salt,
          { "Salt", "drsblobs.package_PrimaryKerberosCtr4.salt", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_supplementalCredentialsBlob_sub,
@@ -7058,14 +7045,16 @@ void proto_register_dcerpc_drsblobs(void)
          { "Dataarray", "drsblobs.schedule.dataArray", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ForestTrustInfoRecord_data,
          { "Data", "drsblobs.ForestTrustInfoRecord.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_AuthInfo_valTRUST_AUTH_TYPE_NONE_none,
-         { "None", "drsblobs.AuthInfo_valTRUST_AUTH_TYPE_NONE.none", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_ForestTrustData_name,
+         { "Name", "drsblobs.ForestTrustData.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosKey4_value_,
          { "Subcontext length", "drsblobs.package_PrimaryKerberosKey4.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromTo1OtherInfo___dns_name_size,
          { "  Dns Name Size", "drsblobs.repsFromTo1OtherInfo.__dns_name_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_AuthInfoNone_size,
          { "Size", "drsblobs.AuthInfoNone.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_AuthInfo_clear,
+         { "Clear", "drsblobs.AuthInfo.clear", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_replUpToDateVectorBlob_ctr,
          { "Ctr", "drsblobs.replUpToDateVectorBlob.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_replUpToDateVectorCtr2_count,
@@ -7082,12 +7071,12 @@ void proto_register_dcerpc_drsblobs(void)
          { "Subcontext length", "drsblobs.supplementalCredentialsBlob.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_AuthenticationInformation_LastUpdateTime,
          { "Lastupdatetime", "drsblobs.AuthenticationInformation.LastUpdateTime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_repsFromTo_val2_ctr2,
-         { "Ctr2", "drsblobs.repsFromTo_val2.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosCtr3_padding3,
          { "Padding3", "drsblobs.package_PrimaryKerberosCtr3.padding3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ExtendedErrorUString___size,
          { "  Size", "drsblobs.ExtendedErrorUString.__size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_package_PrimaryKerberosCtr_ctr3,
+         { "Ctr3", "drsblobs.package_PrimaryKerberosCtr.ctr3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_AuthInfoNT4Owf_password,
          { "Password", "drsblobs.AuthInfoNT4Owf.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_replPropertyMetaData1_originating_change_time,
@@ -7110,22 +7099,22 @@ void proto_register_dcerpc_drsblobs(void)
          { "Dns Name", "drsblobs.repsFromTo1OtherInfo.dns_name", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromTo2_reserved,
          { "Reserved", "drsblobs.repsFromTo2.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_BLOB_blob,
-         { "Blob", "drsblobs.ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_BLOB.blob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_replUpToDateVectorCtr_val1_ctr1,
-         { "Ctr1", "drsblobs.replUpToDateVectorCtr_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromTo1_blobsize,
          { "Blobsize", "drsblobs.repsFromTo1.blobsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_AuthInfo_nt4owf,
+         { "Nt4owf", "drsblobs.AuthInfo.nt4owf", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosString_string,
          { "String", "drsblobs.package_PrimaryKerberosString.string", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_ExtendedErrorParamU_a_string,
+         { "A String", "drsblobs.ExtendedErrorParamU.a_string", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_ForestTrustData_data,
+         { "Data", "drsblobs.ForestTrustData.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_trustDomainPasswords_incoming_size,
          { "Incoming Size", "drsblobs.trustDomainPasswords.incoming_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromTo1_transport_guid,
          { "Transport Guid", "drsblobs.repsFromTo1.transport_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ForestTrustDataDomainInfo_sid_,
          { "Subcontext length", "drsblobs.ForestTrustDataDomainInfo.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_package_PrimaryKerberosCtr_val4_ctr4,
-         { "Ctr4", "drsblobs.package_PrimaryKerberosCtr_val4.ctr4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromTo2_transport_guid,
          { "Transport Guid", "drsblobs.repsFromTo2.transport_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_drsuapi_MSPrefixMap_Entry_length,
@@ -7142,12 +7131,16 @@ void proto_register_dcerpc_drsblobs(void)
          { "Num Keys", "drsblobs.package_PrimaryKerberosCtr4.num_keys", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosKey4_iteration_count,
          { "Iteration Count", "drsblobs.package_PrimaryKerberosKey4.iteration_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_repsFromTo_ctr2,
+         { "Ctr2", "drsblobs.repsFromTo.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_supplementalCredentialsPackage_data_len,
          { "Data Len", "drsblobs.supplementalCredentialsPackage.data_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromToBlob_reserved,
          { "Reserved", "drsblobs.repsFromToBlob.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromTo2_schedule,
          { "Schedule", "drsblobs.repsFromTo2.schedule", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_AuthInfo_version,
+         { "Version", "drsblobs.AuthInfo.version", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_trustAuthInOutBlob_previous,
          { "Previous", "drsblobs.trustAuthInOutBlob.previous", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ForestTrustInfoRecord_timestamp,
@@ -7164,6 +7157,8 @@ void proto_register_dcerpc_drsblobs(void)
          { "Names", "drsblobs.package_PackagesBlob.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ExtendedErrorInfo_generating_component,
          { "Generating Component", "drsblobs.ExtendedErrorInfo.generating_component", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_ExtendedErrorParamU_uint64,
+         { "Uint64", "drsblobs.ExtendedErrorParamU.uint64", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_drsuapi_MSPrefixMap_Ctr___ndr_size,
          { "  Ndr Size", "drsblobs.drsuapi_MSPrefixMap_Ctr.__ndr_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ForestTrustInfo_version,
@@ -7190,6 +7185,8 @@ void proto_register_dcerpc_drsblobs(void)
          { "Unknown2", "drsblobs.supplementalCredentialsBlob.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_replPropertyMetaData1_attid,
          { "Attid", "drsblobs.replPropertyMetaData1.attid", FT_UINT32, BASE_DEC, VALS(drsblobs_drsuapi_DsAttributeId_vals), 0, NULL, HFILL }},
+       { &hf_drsblobs_ExtendedErrorParamU_uint16,
+         { "Uint16", "drsblobs.ExtendedErrorParamU.uint16", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ForestTrustString_size,
          { "Size", "drsblobs.ForestTrustString.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromTo1_last_success,
@@ -7200,12 +7197,16 @@ void proto_register_dcerpc_drsblobs(void)
          { "Flags", "drsblobs.ExtendedErrorInfo.flags", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosCtr3_padding2,
          { "Padding2", "drsblobs.package_PrimaryKerberosCtr3.padding2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_repsFromTo_ctr1,
+         { "Ctr1", "drsblobs.repsFromTo.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_trustDomainPasswords_confounder,
          { "Confounder", "drsblobs.trustDomainPasswords.confounder", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryWDigestBlob_uuknown4,
          { "Uuknown4", "drsblobs.package_PrimaryWDigestBlob.uuknown4", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromTo1_consecutive_sync_failures,
          { "Consecutive Sync Failures", "drsblobs.repsFromTo1.consecutive_sync_failures", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_ExtendedErrorComputerNameU_name,
+         { "Name", "drsblobs.ExtendedErrorComputerNameU.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_prefixMapBlob_reserved,
          { "Reserved", "drsblobs.prefixMapBlob.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ExtendedErrorInfo_pid,
@@ -7226,8 +7227,6 @@ void proto_register_dcerpc_drsblobs(void)
          { "Schedule", "drsblobs.repsFromTo1.schedule", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_scheduleHeader_type,
          { "Type", "drsblobs.scheduleHeader.type", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_prefixMapCtr_valPREFIX_MAP_VERSION_DSDB_dsdb,
-         { "Dsdb", "drsblobs.prefixMapCtr_valPREFIX_MAP_VERSION_DSDB.dsdb", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryCLEARTEXTBlob_cleartext,
          { "Cleartext", "drsblobs.package_PrimaryCLEARTEXTBlob.cleartext", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_schemaInfoBlob_marker,
@@ -7248,6 +7247,8 @@ void proto_register_dcerpc_drsblobs(void)
          { "Originating Usn", "drsblobs.replPropertyMetaData1.originating_usn", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosKey3_reserved1,
          { "Reserved1", "drsblobs.package_PrimaryKerberosKey3.reserved1", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_package_PrimaryKerberosCtr_ctr4,
+         { "Ctr4", "drsblobs.package_PrimaryKerberosCtr.ctr4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ExtendedErrorUString_string,
          { "String", "drsblobs.ExtendedErrorUString.string", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromTo1_source_dsa_invocation_id,
@@ -7260,8 +7261,6 @@ void proto_register_dcerpc_drsblobs(void)
          { "Array", "drsblobs.replPropertyMetaDataCtr1.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosString_string_,
          { "Subcontext length", "drsblobs.package_PrimaryKerberosString.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_AuthInfo_valTRUST_AUTH_TYPE_NT4OWF_nt4owf,
-         { "Nt4owf", "drsblobs.AuthInfo_valTRUST_AUTH_TYPE_NT4OWF.nt4owf", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosKey4_value_len,
          { "Value Len", "drsblobs.package_PrimaryKerberosKey4.value_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosCtr4_older_keys,
@@ -7286,20 +7285,22 @@ void proto_register_dcerpc_drsblobs(void)
          { "Blob", "drsblobs.decode_PrimaryWDigest.blob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_partialAttributeSetCtr1_count,
          { "Count", "drsblobs.partialAttributeSetCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_AuthInfo_valTRUST_AUTH_TYPE_CLEAR_clear,
-         { "Clear", "drsblobs.AuthInfo_valTRUST_AUTH_TYPE_CLEAR.clear", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_replPropertyMetaDataCtr1_count,
          { "Count", "drsblobs.replPropertyMetaDataCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryWDigestHash_hash,
          { "Hash", "drsblobs.package_PrimaryWDigestHash.hash", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ldapControlDirSyncBlob_guid1,
          { "Guid1", "drsblobs.ldapControlDirSyncBlob.guid1", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_replUpToDateVectorCtr_ctr1,
+         { "Ctr1", "drsblobs.replUpToDateVectorCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_trustDomainPasswords_outgoing_size,
          { "Outgoing Size", "drsblobs.trustDomainPasswords.outgoing_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_decode_replPropertyMetaData_blob,
-         { "Blob", "drsblobs.decode_replPropertyMetaData.blob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosKey4_reserved2,
          { "Reserved2", "drsblobs.package_PrimaryKerberosKey4.reserved2", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_ExtendedErrorParamU_blob,
+         { "Blob", "drsblobs.ExtendedErrorParamU.blob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_decode_replPropertyMetaData_blob,
+         { "Blob", "drsblobs.decode_replPropertyMetaData.blob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_supplementalCredentialsBlob_unknown3,
          { "Unknown3", "drsblobs.supplementalCredentialsBlob.unknown3", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ldapControlDirSyncBlob_extra_length,
@@ -7318,14 +7319,14 @@ void proto_register_dcerpc_drsblobs(void)
          { "Ctr", "drsblobs.replPropertyMetaDataBlob.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_drsuapi_MSPrefixMap_Entry_binary_oid,
          { "Binary Oid", "drsblobs.drsuapi_MSPrefixMap_Entry.binary_oid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_partialAttributeSetCtr_val1_ctr1,
-         { "Ctr1", "drsblobs.partialAttributeSetCtr_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ExtendedErrorInfo_detection_location,
          { "Detection Location", "drsblobs.ExtendedErrorInfo.detection_location", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ExtendedErrorInfoPtr_info,
          { "Info", "drsblobs.ExtendedErrorInfoPtr.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosKey3_reserved2,
          { "Reserved2", "drsblobs.package_PrimaryKerberosKey3.reserved2", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_ldapControlDirSyncExtra_uptodateness_vector,
+         { "Uptodateness Vector", "drsblobs.ldapControlDirSyncExtra.uptodateness_vector", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ExtendedErrorInfo_next,
          { "Next", "drsblobs.ExtendedErrorInfo.next", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ForestTrustDataDomainInfo_dns_name,
@@ -7338,28 +7339,24 @@ void proto_register_dcerpc_drsblobs(void)
          { "Num Older Keys", "drsblobs.package_PrimaryKerberosCtr4.num_older_keys", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_trustDomainPasswords_incoming_,
          { "Subcontext length", "drsblobs.trustDomainPasswords.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_ExtendedErrorParamU_uint32,
+         { "Uint32", "drsblobs.ExtendedErrorParamU.uint32", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_replUpToDateVectorCtr1_count,
          { "Count", "drsblobs.replUpToDateVectorCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT16_uint16,
-         { "Uint16", "drsblobs.ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT16.uint16", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_ExtendedErrorComputerNameU_valEXTENDED_ERROR_COMPUTER_NAME_PRESENT_name,
-         { "Name", "drsblobs.ExtendedErrorComputerNameU_valEXTENDED_ERROR_COMPUTER_NAME_PRESENT.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_drsuapi_MSPrefixMap_Ctr_num_entries,
          { "Num Entries", "drsblobs.drsuapi_MSPrefixMap_Ctr.num_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosCtr3_padding5,
          { "Padding5", "drsblobs.package_PrimaryKerberosCtr3.padding5", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_replPropertyMetaDataCtr_val1_ctr1,
-         { "Ctr1", "drsblobs.replPropertyMetaDataCtr_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_decode_ExtendedErrorInfo_ptr,
          { "Ptr", "drsblobs.decode_ExtendedErrorInfo.ptr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosCtr3_old_keys,
          { "Old Keys", "drsblobs.package_PrimaryKerberosCtr3.old_keys", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsblobs_ForestTrustData_info,
+         { "Info", "drsblobs.ForestTrustData.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_ldapControlDirSyncBlob_u2,
          { "U2", "drsblobs.ldapControlDirSyncBlob.u2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_decode_ExtendedErrorInfo_ptr_,
          { "Subcontext length", "drsblobs.decode_ExtendedErrorInfo.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_drsblobs_ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT64_uint64,
-         { "Uint64", "drsblobs.ExtendedErrorParamU_valEXTENDED_ERROR_PARAM_TYPE_UINT64.uint64", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsblobs_repsFromTo1_result_last_attempt,
          { "Result Last Attempt", "drsblobs.repsFromTo1.result_last_attempt", FT_UINT32, BASE_DEC, VALS(WERR_errors), 0, NULL, HFILL }},
        { &hf_drsblobs_package_PrimaryKerberosCtr4_num_service_keys,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-drsuapi.c b/bin/default/librpc/gen_ndr/packet-dcerpc-drsuapi.c
index 7ac6958104eeb0a425a6dd4387dae1238e0da443..23c0308c8a503b7cb56a9f9b083bc0bb0be36bd2 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-drsuapi.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-drsuapi.c
@@ -190,17 +190,15 @@ static gint ett_drsuapi_drsuapi_QuerySitesByCostRequest = -1;
 /* Header field declarations */
 static gint hf_drsuapi_drsuapi_DsReplica06_u7 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaUpdateRefsRequest1_dest_dsa_guid = -1;
-static gint hf_drsuapi_drsuapi_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_3_ctr3 = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfoCtr3_count = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GET_REPL_INFO = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaAddRequest_val1_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaOp_serial_num = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaGetInfoRequest1_object_dn = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaInfo_neighbours = -1;
 static gint hf_drsuapi_drsuapi_DsBindInfoCtr___ndr_length = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjMetaData2Ctr_enumeration_context = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_SYNC_URGENT = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_DISABLE_AUTO_SYNC = -1;
-static gint hf_drsuapi_drsuapi_DsAddEntry_ErrData_val1_v1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaGetInfo_info_type = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaNeighbour_transport_obj_guid = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryCtr2_problem = -1;
@@ -216,7 +214,6 @@ static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest10_extended_op = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAddRequest1_naming_context = -1;
 static gint hf_drsuapi_drsuapi_DsReplica06_u4 = -1;
 static gint hf_drsuapi_drsuapi_DsGetMembershipsRequest1_flags = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaUpdateRefsRequest_val1_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaOIDMapping_oid = -1;
 static gint hf_drsuapi_werror = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr1_naming_context = -1;
@@ -235,51 +232,45 @@ static gint hf_drsuapi_drsuapi_DsReplicaOpCtr_array = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaSyncRequest1_source_dsa_dns = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursorCtrEx_reserved2 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursor2CtrEx_reserved1 = -1;
-static gint hf_drsuapi_drsuapi_DsGetDCInfoRequest_val1_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest5_max_object_count = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaUpdateRefs_level = -1;
 static gint hf_drsuapi_drsuapi_DsUnbind_bind_handle = -1;
 static gint hf_drsuapi_drsuapi_DsBindInfo48_repl_epoch = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaDelRequest1_source_dsa_address = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6 = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaGetInfoRequest_valDRSUAPI_DS_REPLICA_GET_INFO_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursor3_highest_usn = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaDataCtr_array = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo2_server_dn = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaNeighbour_naming_context_obj_guid = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursor3Ctr_enumeration_context = -1;
-static gint hf_drsuapi_drsuapi_DsGetMemberships2Ctr_val1_ctr1 = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_Referr_V1_refer = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_req = -1;
 static gint hf_drsuapi_drsuapi_DsBindInfoCtr_length = -1;
+static gint hf_drsuapi_drsuapi_DsBindInfo_info24 = -1;
 static gint hf_drsuapi_drsuapi_DsExecuteKCC1_taskID = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_level = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_Attr_V1_first = -1;
 static gint hf_drsuapi_drsuapi_DsWriteAccountSpn_level = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_RESERVED_PART2 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest8_mapping_ctr = -1;
-static gint hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_val6DRSUAPI_COMPRESSION_TYPE_MSZIP16_mszip6 = -1;
 static gint hf_drsuapi_drsuapi_DsGetMemberships_ctr = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V5 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaOpCtr_time = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaHighWaterMark_reserved_usn = -1;
 static gint hf_drsuapi_drsuapi_DsGetMemberships2Request1_num_req = -1;
-static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val6_update_err = -1;
 static gint hf_drsuapi_drsuapi_DsGetMembershipsRequest1_domain = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjMetaDataCtr_count = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesMSZIPCtr1_ts_ = -1;
-static gint hf_drsuapi_drsuapi_DsGetDCInfoCtr_valDRSUAPI_DC_CONNECTION_CTR_01_ctr01 = -1;
 static gint hf_drsuapi_drsuapi_DsGetMemberships2_req = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfoCtr2_count = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaModRequest_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3Binary_dn = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaGetInfoRequest_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsBindInfo28_site_guid = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectFlags_DRSUAPI_DS_REPLICA_OBJECT_REMOTE_MODIFY = -1;
 static gint hf_drsuapi_drsuapi_DsGetMembershipsCtr1_sids = -1;
 static gint hf_drsuapi_drsuapi_DsGetMembershipsCtr1_group_attrs = -1;
-static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr_val7_ctr7 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest8_partial_attribute_set_ex = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA_attrvalmetadata = -1;
-static gint hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_val1DRSUAPI_COMPRESSION_TYPE_XPRESS16_xpress1 = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_CRITICAL_ONLY = -1;
 static gint hf_drsuapi_drsuapi_SecBufferDesc_buffers = -1;
 static gint hf_drsuapi_drsuapi_DsCrackNames_ctr = -1;
@@ -290,27 +281,26 @@ static gint hf_drsuapi_drsuapi_DsReplicaObjectFlags_DRSUAPI_DS_REPLICA_OBJECT_FR
 static gint hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3_guid = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo2_server_guid = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfoX_dsid = -1;
+static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo_info1 = -1;
 static gint hf_drsuapi_drsuapi_DsWriteAccountSpnResult1_status = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursor3Ctr_array = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChanges_ctr = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaConnection04_u1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplica06Ctr_array = -1;
-static gint hf_drsuapi_drsuapi_DsGetMembershipsRequest_val1_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectIdentifier2_sid = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_BASE = -1;
 static gint hf_drsuapi_drsuapi_DsNameRequest1_format_flags = -1;
 static gint hf_drsuapi_drsuapi_DsBindInfo28_supported_extensions = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest5_destination_dsa_guid = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_LOCAL_ONLY = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaAddRequest_val2_req2 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursor3_source_dsa_obj_dn = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAddRequest1_source_dsa_address = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3_sid = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA_objmetadata = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursor_source_dsa_invocation_id = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaModRequest1_modify_fields = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest8_max_ndr_size = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest8_partial_attribute_set = -1;
+static gint hf_drsuapi_drsuapi_DsGetMemberships2Request_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo3_site_name = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjMetaData2_local_usn = -1;
 static gint hf_drsuapi_drsuapi_DsReplica06_u6 = -1;
@@ -320,21 +310,19 @@ static gint hf_drsuapi_drsuapi_DsLinkedAttributeFlags_DRSUAPI_DS_LINKED_ATTRIBUT
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest5_uptodateness_vector = -1;
 static gint hf_drsuapi_drsuapi_QuerySitesByCostCtr1_flags_reserved = -1;
 static gint hf_drsuapi_drsuapi_SecBuffer_buf_type = -1;
-static gint hf_drsuapi_drsuapi_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_1_ctr1 = -1;
 static gint hf_drsuapi_drsuapi_DrsUpdate_DRSUAPI_DRS_UPDATE_ADDRESS = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaConnection04Ctr_count = -1;
 static gint hf_drsuapi_drsuapi_DsGetDomainControllerInfo_level_out = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr1_uptodateness_vector = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursor2_last_sync_success = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaInfo_cursors2 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaNeighbour_tmp_highest_usn = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaMod_req = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaSync_level = -1;
-static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val5_service_err = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAdd_req = -1;
 static gint hf_drsuapi_drsuapi_DsCrackNames_bind_handle = -1;
 static gint hf_drsuapi_drsuapi_DsRemoveDSServer_level = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjMetaData_local_usn = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaDelRequest_val1_req1 = -1;
 static gint hf_drsuapi_drsuapi_QuerySitesByCost_req = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaOp_remote_dsa_address = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_REF_GCSPN = -1;
@@ -345,30 +333,26 @@ static gint hf_drsuapi_drsuapi_DsAddEntryCtr3_id = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesMSZIPCtr6_compressed_length = -1;
 static gint hf_drsuapi_drsuapi_DsRemoveDSServer_req = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjMetaData2_attribute_name = -1;
-static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val4_security_err = -1;
-static gint hf_drsuapi_drsuapi_DsRemoveDSServerRequest_val1_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3Binary_binary = -1;
+static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest_req10 = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo2_is_enabled = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr6_source_dsa_guid = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaOID_length = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectIdentifier___ndr_size_dn = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_NEIGHBORS_neighbours = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_AttrErrListItem_V1_err_data = -1;
 static gint hf_drsuapi_drsuapi_DsSiteCostInfo_error_code = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaGetInfoRequest_valDRSUAPI_DS_REPLICA_GET_INFO2_req2 = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_AttrErr_V1_extended_err = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2_attrvalmetadata2 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaNeighbourCtr_array = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryCtr3_objects = -1;
 static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo1_builtin_serial_number = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo1_is_enabled = -1;
+static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_referral_err = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest10_highwatermark = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_SYNC_ALL = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaModRequest1_replica_flags = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest5_highwatermark = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2Ctr_array = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaKccDsaFailure_last_result = -1;
-static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr_val1_ctr1 = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_RefErrListItem_V1_id_target = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesMSZIPCtr6_ts_ = -1;
 static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo1_builtin_creation_time = -1;
@@ -376,7 +360,6 @@ static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo1_sam_creation_time = -1;
 static gint hf_drsuapi_drsuapi_DsNameRequest1_format_offered = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaModRequest1_schedule = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest8_source_dsa_invocation_id = -1;
-static gint hf_drsuapi_drsuapi_DsGetMembershipsCtr_val1_ctr1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaLinkedAttribute_value = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_level_out = -1;
 static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLog_level_out = -1;
@@ -384,6 +367,7 @@ static gint hf_drsuapi_opnum = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData_deleted = -1;
 static gint hf_drsuapi_drsuapi_DsGetMemberships2_level = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttributeCtr_attributes = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaInfo_repsto = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfoX_extended_err = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData_object_dn = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo3_computer_guid = -1;
@@ -392,7 +376,6 @@ static gint hf_drsuapi_drsuapi_DsGetDCConnection01_unknown5 = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_PER_SYNC = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaHighWaterMark_highest_usn = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaKccDsaFailure_num_failures = -1;
-static gint hf_drsuapi_drsuapi_DsBindInfo_val48_info48_ = -1;
 static gint hf_drsuapi_drsuapi_DsCrackNames_level = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjMetaData2_originating_usn = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_ADDENTRYREPLY_V3 = -1;
@@ -400,23 +383,23 @@ static gint hf_drsuapi_drsuapi_DsGetDCInfo3_server_dn = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaNeighbourCtr_count = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_NONGC_RO_REP = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfoRequest1_level = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaInfo_connectfailures = -1;
+static gint hf_drsuapi_drsuapi_DsBindInfo_info24_ = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_WRIT_REP = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaDelRequest1_options = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAdd_level = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_CRYPTO_BIND = -1;
-static gint hf_drsuapi_drsuapi_DsGetMemberships2Request_val1_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo2_computer_guid = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES_connectfailures = -1;
+static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr_ctr6 = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo1_server_dn = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaModRequest1_source_dra = -1;
+static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_service_err = -1;
 static gint hf_drsuapi_drsuapi_QuerySitesByCostCtr1_num_info = -1;
-static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest_val10_req10 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3Binary_sid = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaOp_remote_dsa_obj_dn = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_RefErrListItem_V1_addr_list = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaNeighbour_transport_obj_dn = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo2_ntds_guid = -1;
-static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val7_system_err = -1;
 static gint hf_drsuapi_drsuapi_DsNameRequest1_names = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaDel_level = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursor2CtrEx_count = -1;
@@ -429,21 +412,19 @@ static gint hf_drsuapi_drsuapi_DrsUpdate_DRSUAPI_DRS_UPDATE_FLAGS = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaLinkedAttribute_originating_add_time = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_AttrErr_V1_dsid = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr6_old_highwatermark = -1;
+static gint hf_drsuapi_drsuapi_DsGetDCInfoCtr_ctr2 = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_SYNC_PAS = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr6_extended_ret = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaInfo_pendingops = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursor2CtrEx_version = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY_V2 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesXPRESSCtr1_compressed_length = -1;
 static gint hf_drsuapi_drsuapi_DsBind_bind_guid = -1;
-static gint hf_drsuapi_drsuapi_QuerySitesByCostRequest_val1_req1 = -1;
-static gint hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_val1DRSUAPI_COMPRESSION_TYPE_MSZIP16_mszip1 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr6_source_dsa_invocation_id = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfoCtr3_array = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr2_mszip1 = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_REF_OK = -1;
-static gint hf_drsuapi_drsuapi_DsAddEntryRequest_val3_req3 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest10_max_ndr_size = -1;
-static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo_val1_info1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaGetInfo_req = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2Ctr_count = -1;
 static gint hf_drsuapi_drsuapi_DsGetMembershipsCtr1_num_memberships = -1;
@@ -452,21 +433,21 @@ static gint hf_drsuapi_drsuapi_DsReplicaLinkedAttribute_meta_data = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjMetaDataCtr_array = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursorCtrEx_count = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryCtr2_dir_err = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_UPTODATE_VECTOR_V1_udv1 = -1;
+static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr_ctr1 = -1;
+static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_security_err = -1;
 static gint hf_drsuapi_drsuapi_QuerySitesByCost_level_out = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_DEL_REF = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo3_is_pdc = -1;
 static gint hf_drsuapi_drsuapi_DsRemoveDSServer_res = -1;
-static gint hf_drsuapi_drsuapi_DsWriteAccountSpnRequest_val1_req1 = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_PREEMPTED = -1;
 static gint hf_drsuapi_drsuapi_DsBindInfo24_pid = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfoCtr2_array = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3Binary___ndr_size_binary = -1;
+static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_update_err = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_DISABLE_PERIODIC_SYNC = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo2_ntds_dn = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjMetaData_version = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_RefErrListItem_V1_ref_type = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES_linkfailures = -1;
 static gint hf_drsuapi_drsuapi_DsReplica06_u2 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2_originating_change_time = -1;
 static gint hf_drsuapi_drsuapi_DsNameCtr1_count = -1;
@@ -474,34 +455,33 @@ static gint hf_drsuapi_drsuapi_DsSiteCostInfo_site_cost = -1;
 static gint hf_drsuapi_drsuapi_DsRemoveDSServerResult1_last_dc_in_domain = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursorCtr_reserved = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_SPECIAL_SECRET_PROCESSING = -1;
-static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest_val8_req8 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaDelRequest1_naming_context = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensionsExt_DRSUAPI_SUPPORTED_EXTENSION_ADAM = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS2_cursors2 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest8_highwatermark = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr1_first_object = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr6_uptodateness_vector = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo2_site_name = -1;
+static gint hf_drsuapi_drsuapi_DsGetDCInfoRequest_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaUpdateRefsRequest1_naming_context = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesXPRESSCtr6_decompressed_length = -1;
 static gint hf_drsuapi_drsuapi_DsReplica06_u5 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest8_fsmo_info = -1;
 static gint hf_drsuapi_drsuapi_SecBuffer_buffer = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCConnection01_unknown2 = -1;
-static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr_val2_ctr2 = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_GET_ANC = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest8_extended_op = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaSyncRequest1_source_dsa_guid = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2___ndr_size_binary = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfoX_problem = -1;
-static gint hf_drsuapi_drsuapi_DsBindInfo_val24_info24_ = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_GETCHG_CHECK = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_Attr_V1_count = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr6_first_object = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursor2CtrEx_cursors = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaAddRequest_req1 = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V01 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2_object_dn = -1;
 static gint hf_drsuapi_drsuapi_DsGetDomainControllerInfo_level = -1;
+static gint hf_drsuapi_drsuapi_DsBindInfo_info28_ = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2_originating_usn = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryCtr2_extended_err = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3___ndr_size_sid = -1;
@@ -515,21 +495,24 @@ static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_R
 static gint hf_drsuapi_drsuapi_DsBind_bind_handle = -1;
 static gint hf_drsuapi_drsuapi_DsReplica06Ctr_count = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2_deleted = -1;
+static gint hf_drsuapi_drsuapi_DsBindInfo_info48_ = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaDataCtr_count = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaGetInfoRequest2_value_dn_str = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObject_identifier = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr6___ndr_size = -1;
 static gint hf_drsuapi_drsuapi_DsExecuteKCCFlags_DRSUAPI_DS_EXECUTE_KCC_ASYNCHRONOUS_OPERATION = -1;
-static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val1_attr_err = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo2_computer_dn = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAddRequest2_source_dsa_address = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjMetaData_originating_usn = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesXPRESSCtr1_ts_ = -1;
+static gint hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_xpress1 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr6TS_ctr6_ = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaInfo_attrvalmetadata2 = -1;
 static gint hf_drsuapi_drsuapi_DsBindInfoCtr_info = -1;
 static gint hf_drsuapi_drsuapi_DsaAddressListItem_V1_address = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaDel_bind_handle = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo3_is_gc = -1;
+static gint hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_mszip1 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr6_linked_attributes = -1;
 static gint hf_drsuapi_drsuapi_DsReplica06_str1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaConnection04Ctr_array = -1;
@@ -543,10 +526,13 @@ static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_GET_NC_SIZE = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaConnection04_u5 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo1_restart_data = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_INIT_SYNC = -1;
+static gint hf_drsuapi_drsuapi_DsExecuteKCCRequest_ctr1 = -1;
+static gint hf_drsuapi_drsuapi_DsGetMembershipsRequest_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsWriteAccountSpn_bind_handle = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest10_partial_attribute_set = -1;
 static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogRequest1_flags = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_SYNC_REQUEUE = -1;
+static gint hf_drsuapi_drsuapi_DsGetDCInfoCtr_ctr1 = -1;
 static gint hf_drsuapi_drsuapi_DsBindInfo28_repl_epoch = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2_version = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_AttrErr_V1_problem = -1;
@@ -566,7 +552,6 @@ static gint hf_drsuapi_drsuapi_DsReplicaKccDsaFailure_dsa_obj_dn = -1;
 static gint hf_drsuapi_drsuapi_DsExecuteKCC1_flags = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_ctr = -1;
 static gint hf_drsuapi_drsuapi_DsGetMemberships_level = -1;
-static gint hf_drsuapi_drsuapi_DsBindInfo_valdefault_Fallback_ = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaNeighbour_reserved = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaOp_nc_obj_guid = -1;
 static gint hf_drsuapi_drsuapi_DsNameRequest1_language = -1;
@@ -580,6 +565,7 @@ static gint hf_drsuapi_drsuapi_DsReplicaOIDMapping_Ctr_mappings = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaModRequest1_naming_context = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_RefErrListItem_V1_next = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAdd_bind_handle = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaInfo_clientctx = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjMetaData2_version = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_XPRESS_COMPRESS = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_RESERVED_PART3 = -1;
@@ -594,19 +580,24 @@ static gint hf_drsuapi_drsuapi_DsWriteAccountSpn_level_out = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData_originating_invocation_id = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaOp_priority = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V2 = -1;
+static gint hf_drsuapi_drsuapi_DsBindInfo_Fallback = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest10_source_dsa_invocation_id = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaInfo_cursors3 = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo1_computer_dn = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest8_naming_context = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesXPRESSCtr6_ts = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursor2CtrEx_reserved2 = -1;
+static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_system_err = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObject_flags = -1;
 static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogRequest1_preferred_maximum_length = -1;
 static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogRequest1_restart_length = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo3_dns_name = -1;
+static gint hf_drsuapi_drsuapi_DsGetDCInfoCtr_ctr3 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjMetaData2Ctr_array = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V1 = -1;
 static gint hf_drsuapi_drsuapi_DsWriteAccountSpnRequest1_count = -1;
 static gint hf_drsuapi_drsuapi_DrsUpdate_DRSUAPI_DRS_UPDATE_SCHEDULE = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaInfo_udv1 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo1_sam_serial_number = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaConnection04Ctr_reserved = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaLinkedAttribute_identifier = -1;
@@ -614,24 +605,30 @@ static gint hf_drsuapi_drsuapi_DsGetMembershipsCtr1_info_array = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2_attribute_name = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursor3_last_sync_success = -1;
 static gint hf_drsuapi_drsuapi_DsRemoveDSServerRequest1_server_dn = -1;
+static gint hf_drsuapi_drsuapi_DsNameCtr_ctr1 = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCConnectionCtr01_count = -1;
-static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest_val5_req5 = -1;
+static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest_req5 = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo2_is_pdc = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaMetaData_version = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectListItemEx_is_nc_prefix = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaOIDMapping_Ctr_num_mappings = -1;
+static gint hf_drsuapi_drsuapi_DsAddEntryCtr_ctr2 = -1;
 static gint hf_drsuapi_drsuapi_DsAttributeValue___ndr_size = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaMod_level = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_UPDATE_NOTIFICATION = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaInfo_objmetadata2 = -1;
 static gint hf_drsuapi_drsuapi_DsGetMembershipsRequest1_type = -1;
 static gint hf_drsuapi_drsuapi_DsBindInfo48_supported_extensions_ext = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaInfo_srvoutgoingcalls = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaGetInfo_bind_handle = -1;
 static gint hf_drsuapi_drsuapi_DsAttributeValue_blob = -1;
+static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_name_err = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaKccDsaFailuresCtr_count = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectListItemEx_next_object = -1;
+static gint hf_drsuapi_drsuapi_DsAddEntryCtr_ctr3 = -1;
 static gint hf_drsuapi_drsuapi_DsNameInfo1_dns_domain_name = -1;
-static gint hf_drsuapi_drsuapi_DsBindInfo_val28_info28 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2_originating_invocation_id = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaAddRequest_req2 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2Ctr_enumeration_context = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_SYNC_BYNAME = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr1_object_count = -1;
@@ -648,6 +645,7 @@ static gint hf_drsuapi_drsuapi_DsRemoveDSServerRequest1_domain_dn = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo2_dns_name = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo3_ntds_dn = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_INSTANCE_TYPE_NOT_REQ_ON_MOD = -1;
+static gint hf_drsuapi_drsuapi_DsWriteAccountSpnResult_res1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursorCtrEx_cursors = -1;
 static gint hf_drsuapi_drsuapi_QuerySitesByCost_ctr = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData_originating_usn = -1;
@@ -672,19 +670,21 @@ static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLog_level = -1;
 static gint hf_drsuapi_drsuapi_DsGetMemberships2_bind_handle = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo3_is_rodc = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryRequest3_first_object = -1;
-static gint hf_drsuapi_drsuapi_DsExecuteKCCRequest_val1_ctr1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaNeighbour_source_dsa_obj_guid = -1;
+static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr_ctr7 = -1;
 static gint hf_drsuapi_drsuapi_DsaAddressListItem_V1_next = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursor2Ctr_array = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CLIENT_CONTEXTS_clientctx = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_Referr_V1_extended_err = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_MAIL_REP = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest5_source_dsa_invocation_id = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaNeighbour_highest_usn = -1;
 static gint hf_drsuapi_drsuapi_DsPartialAttributeSet_num_attids = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjMetaData_originating_change_time = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaInfo_attrvalmetadata = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3Binary___ndr_size_sid = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest10_uptodateness_vector = -1;
+static gint hf_drsuapi_drsuapi_DsWriteAccountSpnRequest_req1 = -1;
+static gint hf_drsuapi_drsuapi_DsRemoveDSServerRequest_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest10_destination_dsa_guid = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_POST_BETA3 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest5_extended_op = -1;
@@ -692,8 +692,8 @@ static gint hf_drsuapi_drsuapi_DsAddEntryCtr2_objects = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData_originating_change_time = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3___ndr_size_dn = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr6_drs_error = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaModRequest_val1_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsExecuteKCCFlags_DRSUAPI_DS_EXECUTE_KCC_DAMPED = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaGetInfoRequest_req2 = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_Name_V1_extended_err = -1;
 static gint hf_drsuapi_drsuapi_DsBindInfo48_supported_extensions = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChanges_bind_handle = -1;
@@ -701,7 +701,6 @@ static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData_attribute_name = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_Name_V1_extended_data = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursor3_source_dsa_invocation_id = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaOp_operation_type = -1;
-static gint hf_drsuapi_drsuapi_DsBindInfo_valdefault_Fallback = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfoRequest1_domain_name = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAddRequest1_schedule = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryRequest3_client_creds = -1;
@@ -711,8 +710,10 @@ static gint hf_drsuapi_drsuapi_DsGetDCInfo3_server_guid = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData_local_usn = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryCtr3_err_ver = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_IGNORE_ERROR = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaInfo_linkfailures = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaGetInfoRequest2_info_type = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaHighWaterMark_tmp_highest_usn = -1;
+static gint hf_drsuapi_drsuapi_DsBindInfo_info48 = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo1_is_pdc = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_Name_V1_dsid = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjMetaData2_originating_dsa_dn = -1;
@@ -720,6 +721,7 @@ static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData_created = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaGetInfoRequest2_flags = -1;
 static gint hf_drsuapi_drsuapi_DsWriteAccountSpnRequest1_unknown1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaKccDsaFailure_dsa_obj_guid = -1;
+static gint hf_drsuapi_drsuapi_DsBindInfo_info28 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogFlags_DRSUAPI_NT4_CHANGELOG_GET_CHANGELOG = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfoX_extended_data = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_MOVEREQ_V2 = -1;
@@ -727,16 +729,17 @@ static gint hf_drsuapi_drsuapi_DsExecuteKCC_req = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaNeighbour_naming_context_dn = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesXPRESSCtr1_decompressed_length = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaInfo_cursors = -1;
+static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogRequest_req1 = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_ASYNC_REPLICATION = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest10_mapping_ctr = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaKccDsaFailure_first_failure = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest10_fsmo_info = -1;
+static gint hf_drsuapi_drsuapi_DsBindInfo_Fallback_ = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_ErrData_V1_status = -1;
 static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLog_req = -1;
-static gint hf_drsuapi_drsuapi_DsNameCtr_val1_ctr1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaNeighbour_source_dsa_address = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2_created = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaSyncRequest_val1_req1 = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_NEVER_NOTIFY = -1;
 static gint hf_drsuapi_drsuapi_DsBindInfo24_supported_extensions = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursorCtr_count = -1;
@@ -748,18 +751,18 @@ static gint hf_drsuapi_drsuapi_DsReplicaGetInfoRequest2_object_dn = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectIdentifier_sid = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryCtr2_extended_data = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaGetInfo_level = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS_cursors = -1;
+static gint hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_xpress6 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaSyncRequest1_naming_context = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo2_netbios_name = -1;
 static gint hf_drsuapi_drsuapi_DsReplica06_u3 = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2_objmetadata2 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaLinkedAttribute_flags = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS3_cursors3 = -1;
 static gint hf_drsuapi_drsuapi_DsWriteAccountSpnRequest1_spn_names = -1;
+static gint hf_drsuapi_drsuapi_QuerySitesByCostRequest_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsAttributeValueCtr_num_values = -1;
 static gint hf_drsuapi_drsuapi_DsRemoveDSServerRequest1_commit = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_SYNC_FORCED = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectListItemEx_parent_object_guid = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaDelRequest_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsGetDomainControllerInfo_ctr = -1;
 static gint hf_drsuapi_drsuapi_DsBindInfo48_site_guid = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttribute_value_ctr = -1;
@@ -775,6 +778,7 @@ static gint hf_drsuapi_drsuapi_DsReplicaMetaDataCtr_meta_data = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAddRequest2_schedule = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaUpdateRefsRequest1_options = -1;
 static gint hf_drsuapi_drsuapi_DsExecuteKCC_level = -1;
+static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr_ctr2 = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCConnection01_client_account = -1;
 static gint hf_drsuapi_drsuapi_DsCrackNames_level_out = -1;
 static gint hf_drsuapi_drsuapi_SecBufferDesc_buff_count = -1;
@@ -792,28 +796,27 @@ static gint hf_drsuapi_drsuapi_DsPartialAttributeSet_reserved1 = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_AttrErrListItem_V1_next = -1;
 static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo1_restart_length = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_ErrData_V1_dir_err = -1;
-static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val3_referral_err = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaGetInfo_info = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryCtr3_err_data = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCConnection01_connection_time = -1;
+static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_attr_err = -1;
 static gint hf_drsuapi_drsuapi_NameResOp_V1_next_rdn = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest5_naming_context = -1;
 static gint hf_drsuapi_drsuapi_DsGetMemberships2_ctr = -1;
 static gint hf_drsuapi_drsuapi_DsGetMembershipsRequest1_count = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_NO_SOURCE = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_SERVER_OUTGOING_CALLS_srvoutgoingcalls = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo1_netbios_name = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_RefErrListItem_V1_rdn_internal = -1;
 static gint hf_drsuapi_drsuapi_DsGetMemberships2Ctr1_ctrl_array = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaSyncRequest1_options = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectIdentifier_guid = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_AttrErr_V1_attr_val = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaInfo_objmetadata = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaConnection04_bind_time = -1;
 static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogRequest1_restart_data = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo1_dns_name = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr6_new_highwatermark = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaMetaData_originating_invocation_id = -1;
-static gint hf_drsuapi_drsuapi_DsRemoveDSServerResult_val1_res1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursorCtrEx_version = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_NO_DISCARD = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2_binary = -1;
@@ -824,10 +827,12 @@ static gint hf_drsuapi_drsuapi_DsReplicaObjMetaData_originating_invocation_id =
 static gint hf_drsuapi_drsuapi_DsGetNCChanges_req = -1;
 static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo1_lsa_creation_time = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaUpdateRefs_req = -1;
-static gint hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val2_name_err = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_RefErrListItem_V1_is_choice_set = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr6_linked_attributes_count = -1;
+static gint hf_drsuapi_drsuapi_DsRemoveDSServerResult_res1 = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaSyncRequest_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsBindInfo48_config_dn_guid = -1;
+static gint hf_drsuapi_drsuapi_DsAddEntryRequest_req2 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest10_naming_context = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest5_max_ndr_size = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttributeCtr_num_attributes = -1;
@@ -836,6 +841,7 @@ static gint hf_drsuapi_drsuapi_DsWriteAccountSpnRequest1_object_dn = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_NONDOMAIN_NCS = -1;
 static gint hf_drsuapi_drsuapi_DsGetMembershipsCtr1_num_sids = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr7_type = -1;
+static gint hf_drsuapi_drsuapi_DsAddEntry_ErrData_v1 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaConnection04_client_ip_address = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_FULL_SYNC_IN_PROGRESS = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_LINKED_VALUE_REPLICATION = -1;
@@ -849,7 +855,6 @@ static gint hf_drsuapi_drsuapi_DsAddEntry_AttrErr_V1_extended_data = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_RefErrListItem_V1_choice = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest5_fsmo_info = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaMetaData_originating_usn = -1;
-static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr_val6_ctr6 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaModRequest1_source_dra_address = -1;
 static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo1_lsa_serial_number = -1;
 static gint hf_drsuapi_drsuapi_SecBufferDesc_version = -1;
@@ -866,17 +871,14 @@ static gint hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3_dn = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest8_replica_flags = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCConnection01_client_ip_address = -1;
 static gint hf_drsuapi_drsuapi_QuerySitesByCost_level = -1;
-static gint hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_val6DRSUAPI_COMPRESSION_TYPE_XPRESS16_xpress6 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjMetaData2_originating_change_time = -1;
 static gint hf_drsuapi_drsuapi_DsWriteAccountSpn_res = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAddRequest1_options = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_AttrErr_V1_is_val_returned = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObject_attribute_ctr = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr6_naming_context = -1;
-static gint hf_drsuapi_drsuapi_DsBindInfo_val28_info28_ = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaGetInfoRequest2_attribute_name = -1;
 static gint hf_drsuapi_drsuapi_QuerySitesByCostRequest1_num_req = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_PENDING_OPS_pendingops = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaNeighbour_source_dsa_invocation_id = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAddRequest2_options = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaOID_binary_oid = -1;
@@ -892,45 +894,45 @@ static gint hf_drsuapi_drsuapi_DsAddEntry_RefErrListItem_V1_op_state = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V6 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3Binary___ndr_size = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_INIT_SYNC_NOW = -1;
-static gint hf_drsuapi_drsuapi_DsAddEntryCtr_val2_ctr2 = -1;
-static gint hf_drsuapi_drsuapi_DsAddEntryRequest_val2_req2 = -1;
-static gint hf_drsuapi_drsuapi_QuerySitesByCostCtr_val1_ctr1 = -1;
-static gint hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_REPSTO_repsto = -1;
-static gint hf_drsuapi_drsuapi_DsBindInfo_val48_info48 = -1;
-static gint hf_drsuapi_drsuapi_DsAddEntryCtr_val3_ctr3 = -1;
 static gint hf_drsuapi_drsuapi_DsBindInfo28_pid = -1;
 static gint hf_drsuapi_drsuapi_SecBuffer_buf_size = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest8_destination_dsa_guid = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaOp_remote_dsa_obj_guid = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr6_nc_object_count = -1;
+static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest_req8 = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_ErrData_V1_info = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaGetInfoRequest1_source_dsa_guid = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2_originating_dsa_dn = -1;
 static gint hf_drsuapi_drsuapi_DsNameInfo1_result_name = -1;
 static gint hf_drsuapi_drsuapi_DsBindInfo48_pid = -1;
 static gint hf_drsuapi_drsuapi_DsRemoveDSServer_bind_handle = -1;
-static gint hf_drsuapi_drsuapi_DsWriteAccountSpnResult_val1_res1 = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntry_RefErrListItem_V1_rdn_alias = -1;
+static gint hf_drsuapi_drsuapi_DsGetMemberships2Ctr_ctr1 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogFlags_DRSUAPI_NT4_CHANGELOG_GET_SERIAL_NUMBERS = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaObjectIdentifier_dn = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V5 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaNeighbour_result_last_attempt = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr1_new_highwatermark = -1;
 static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo1_log_length = -1;
-static gint hf_drsuapi_drsuapi_DsNameRequest_val1_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo1_status = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_ASYNC_OP = -1;
+static gint hf_drsuapi_drsuapi_DsAddEntryRequest_req3 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest8_max_object_count = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo2_site_dn = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesRequest10_more_flags = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesMSZIPCtr1_compressed_length = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT = -1;
+static gint hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_mszip6 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaCursorCtrEx_reserved1 = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfoCtr1_array = -1;
+static gint hf_drsuapi_drsuapi_DsNameRequest_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesCtr1TS_ctr1_ = -1;
+static gint hf_drsuapi_drsuapi_DsGetDCInfoCtr_ctr01 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaMod_bind_handle = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaGetInfoRequest2_source_dsa_guid = -1;
+static gint hf_drsuapi_drsuapi_QuerySitesByCostCtr_ctr1 = -1;
 static gint hf_drsuapi_drsuapi_DsGetMemberships2Ctr1_num_entries = -1;
+static gint hf_drsuapi_drsuapi_DsReplicaUpdateRefsRequest_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsGetDCInfo3_site_dn = -1;
 static gint hf_drsuapi_drsuapi_NameResOp_V1_unused_pad = -1;
 static gint hf_drsuapi_drsuapi_DsGetMemberships_bind_handle = -1;
@@ -944,13 +946,11 @@ static gint hf_drsuapi_drsuapi_QuerySitesByCost_bind_handle = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaOp_nc_dn = -1;
 static gint hf_drsuapi_drsuapi_QuerySitesByCostRequest1_site_from = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaMetaData_originating_change_time = -1;
-static gint hf_drsuapi_drsuapi_DsBindInfo_val24_info24 = -1;
-static gint hf_drsuapi_drsuapi_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_2_ctr2 = -1;
+static gint hf_drsuapi_drsuapi_DsGetMembershipsCtr_ctr1 = -1;
 static gint hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_ADD_REF = -1;
 static gint hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V7 = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaNeighbour_last_success = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChangesMSZIPCtr1_decompressed_length = -1;
-static gint hf_drsuapi_drsuapi_DsGetNT4ChangeLogRequest_val1_req1 = -1;
 static gint hf_drsuapi_drsuapi_DsAddEntryCtr2_dsid = -1;
 static gint hf_drsuapi_drsuapi_DsGetNCChanges_level = -1;
 static gint hf_drsuapi_drsuapi_DsReplicaAttribute_attid = -1;
@@ -1298,14 +1298,14 @@ static int drsuapi_dissect_element_DsBindInfo48_repl_epoch(tvbuff_t *tvb _U_, in
 static int drsuapi_dissect_element_DsBindInfo48_supported_extensions_ext(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsBindInfo48_config_dn_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsBindInfoFallBack_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsBindInfo_val24_info24(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsBindInfo_val24_info24_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsBindInfo_val28_info28(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsBindInfo_val28_info28_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsBindInfo_val48_info48(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsBindInfo_val48_info48_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsBindInfo_valdefault_Fallback(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsBindInfo_valdefault_Fallback_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsBindInfo_info24(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsBindInfo_info24_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsBindInfo_info28(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsBindInfo_info28_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsBindInfo_info48(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsBindInfo_info48_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsBindInfo_Fallback(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsBindInfo_Fallback_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsBindInfoCtr_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint3264 *length);
 static int drsuapi_dissect_element_DsBindInfoCtr___ndr_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsBindInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint3264 *length);
@@ -1322,7 +1322,7 @@ static int drsuapi_dissect_element_DsReplicaSyncRequest1_source_dsa_guid(tvbuff_
 static int drsuapi_dissect_element_DsReplicaSyncRequest1_source_dsa_dns(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaSyncRequest1_source_dsa_dns_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaSyncRequest1_options(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaSyncRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaSyncRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaHighWaterMark_tmp_highest_usn(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaHighWaterMark_reserved_usn(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaHighWaterMark_highest_usn(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1528,9 +1528,9 @@ static int drsuapi_dissect_element_DsGetNCChangesRequest10_partial_attribute_set
 static int drsuapi_dissect_element_DsGetNCChangesRequest10_partial_attribute_set_ex_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetNCChangesRequest10_mapping_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetNCChangesRequest10_more_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetNCChangesRequest_val5_req5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetNCChangesRequest_val8_req8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetNCChangesRequest_val10_req10(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetNCChangesRequest_req5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetNCChangesRequest_req8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetNCChangesRequest_req10(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaCursor2_source_dsa_invocation_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaCursor2_highest_usn(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaCursor2_last_sync_success(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1677,25 +1677,25 @@ const value_string drsuapi_drsuapi_DsGetNCChangesCompressionType_vals[] = {
        { DRSUAPI_COMPRESSION_TYPE_XPRESS, "DRSUAPI_COMPRESSION_TYPE_XPRESS" },
 { 0, NULL }
 };
-static int drsuapi_dissect_element_DsGetNCChangesCompressedCtr_val1DRSUAPI_COMPRESSION_TYPE_MSZIP16_mszip1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetNCChangesCompressedCtr_val6DRSUAPI_COMPRESSION_TYPE_MSZIP16_mszip6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetNCChangesCompressedCtr_val1DRSUAPI_COMPRESSION_TYPE_XPRESS16_xpress1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetNCChangesCompressedCtr_val6DRSUAPI_COMPRESSION_TYPE_XPRESS16_xpress6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetNCChangesCompressedCtr_mszip1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetNCChangesCompressedCtr_mszip6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetNCChangesCompressedCtr_xpress1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetNCChangesCompressedCtr_xpress6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetNCChangesCtr2_mszip1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetNCChangesCtr7_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int drsuapi_dissect_element_DsGetNCChangesCtr7_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *type);
 static int drsuapi_dissect_element_DsGetNCChangesCtr7_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
-static int drsuapi_dissect_element_DsGetNCChangesCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetNCChangesCtr_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetNCChangesCtr_val6_ctr6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetNCChangesCtr_val7_ctr7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetNCChangesCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetNCChangesCtr_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetNCChangesCtr_ctr6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetNCChangesCtr_ctr7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaUpdateRefsRequest1_naming_context(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaUpdateRefsRequest1_naming_context_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaUpdateRefsRequest1_dest_dsa_dns_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaUpdateRefsRequest1_dest_dsa_dns_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaUpdateRefsRequest1_dest_dsa_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaUpdateRefsRequest1_options(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaUpdateRefsRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaUpdateRefsRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaAddRequest1_naming_context(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaAddRequest1_naming_context_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaAddRequest1_source_dsa_address(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1714,14 +1714,14 @@ static int drsuapi_dissect_element_DsReplicaAddRequest2_source_dsa_address_(tvbu
 static int drsuapi_dissect_element_DsReplicaAddRequest2_schedule(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaAddRequest2_schedule_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaAddRequest2_options(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaAddRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaAddRequest_val2_req2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaAddRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaAddRequest_req2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaDelRequest1_naming_context(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaDelRequest1_naming_context_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaDelRequest1_source_dsa_address(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaDelRequest1_source_dsa_address_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaDelRequest1_options(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaDelRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaDelRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaModRequest1_naming_context(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaModRequest1_naming_context_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaModRequest1_source_dra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1732,7 +1732,7 @@ static int drsuapi_dissect_element_DsReplicaModRequest1_schedule_(tvbuff_t *tvb
 static int drsuapi_dissect_element_DsReplicaModRequest1_replica_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaModRequest1_modify_fields(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaModRequest1_options(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaModRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaModRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 const value_string drsuapi_drsuapi_DsMembershipType_vals[] = {
        { DRSUAPI_DS_MEMBERSHIP_TYPE_UNIVERSAL_AND_DOMAIN_GROUPS, "DRSUAPI_DS_MEMBERSHIP_TYPE_UNIVERSAL_AND_DOMAIN_GROUPS" },
        { DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_LOCAL_GROUPS, "DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_LOCAL_GROUPS" },
@@ -1757,7 +1757,7 @@ static int drsuapi_dissect_element_DsGetMembershipsCtr1_sids(tvbuff_t *tvb _U_,
 static int drsuapi_dissect_element_DsGetMembershipsCtr1_sids_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetMembershipsCtr1_sids__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetMembershipsCtr1_sids___(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetMembershipsCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetMembershipsCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetMembershipsRequest1_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetMembershipsRequest1_info_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetMembershipsRequest1_info_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1767,7 +1767,7 @@ static int drsuapi_dissect_element_DsGetMembershipsRequest1_flags(tvbuff_t *tvb
 static int drsuapi_dissect_element_DsGetMembershipsRequest1_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetMembershipsRequest1_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetMembershipsRequest1_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetMembershipsRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetMembershipsRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static const true_false_string drsuapi_DsGetNT4ChangeLogFlags_DRSUAPI_NT4_CHANGELOG_GET_CHANGELOG_tfs = {
    "DRSUAPI_NT4_CHANGELOG_GET_CHANGELOG is SET",
    "DRSUAPI_NT4_CHANGELOG_GET_CHANGELOG is NOT SET",
@@ -1782,7 +1782,7 @@ static int drsuapi_dissect_element_DsGetNT4ChangeLogRequest1_restart_length(tvbu
 static int drsuapi_dissect_element_DsGetNT4ChangeLogRequest1_restart_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetNT4ChangeLogRequest1_restart_data_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetNT4ChangeLogRequest1_restart_data__(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetNT4ChangeLogRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetNT4ChangeLogRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetNT4ChangeLogInfo1_restart_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetNT4ChangeLogInfo1_log_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetNT4ChangeLogInfo1_sam_serial_number(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1798,7 +1798,7 @@ static int drsuapi_dissect_element_DsGetNT4ChangeLogInfo1_restart_data__(tvbuff_
 static int drsuapi_dissect_element_DsGetNT4ChangeLogInfo1_log_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetNT4ChangeLogInfo1_log_data_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetNT4ChangeLogInfo1_log_data__(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetNT4ChangeLogInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetNT4ChangeLogInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 const value_string drsuapi_drsuapi_DsNameStatus_vals[] = {
        { DRSUAPI_DS_NAME_STATUS_OK, "DRSUAPI_DS_NAME_STATUS_OK" },
        { DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR, "DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR" },
@@ -1860,7 +1860,7 @@ static int drsuapi_dissect_element_DsNameRequest1_count(tvbuff_t *tvb _U_, int o
 static int drsuapi_dissect_element_DsNameRequest1_names(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsNameRequest1_names_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsNameRequest1_names__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsNameRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsNameRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsNameInfo1_status(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsNameInfo1_dns_domain_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsNameInfo1_dns_domain_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1870,8 +1870,8 @@ static int drsuapi_dissect_element_DsNameCtr1_count(tvbuff_t *tvb _U_, int offse
 static int drsuapi_dissect_element_DsNameCtr1_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsNameCtr1_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsNameCtr1_array__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsNameCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsNameCtr_val1_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsNameCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsNameCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 const value_string drsuapi_drsuapi_DsSpnOperation_vals[] = {
        { DRSUAPI_DS_SPN_OPERATION_ADD, "DRSUAPI_DS_SPN_OPERATION_ADD" },
        { DRSUAPI_DS_SPN_OPERATION_REPLACE, "DRSUAPI_DS_SPN_OPERATION_REPLACE" },
@@ -1886,17 +1886,17 @@ static int drsuapi_dissect_element_DsWriteAccountSpnRequest1_count(tvbuff_t *tvb
 static int drsuapi_dissect_element_DsWriteAccountSpnRequest1_spn_names(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsWriteAccountSpnRequest1_spn_names_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsWriteAccountSpnRequest1_spn_names__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsWriteAccountSpnRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsWriteAccountSpnRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsWriteAccountSpnResult1_status(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsWriteAccountSpnResult_val1_res1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsWriteAccountSpnResult_res1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsRemoveDSServerRequest1_server_dn(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsRemoveDSServerRequest1_server_dn_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsRemoveDSServerRequest1_domain_dn(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsRemoveDSServerRequest1_domain_dn_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsRemoveDSServerRequest1_commit(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsRemoveDSServerRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsRemoveDSServerRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsRemoveDSServerResult1_last_dc_in_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsRemoveDSServerResult_val1_res1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsRemoveDSServerResult_res1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 const value_string drsuapi_drsuapi_DsGetDCInfoCtrLevels_vals[] = {
        { DRSUAPI_DC_INFO_CTR_1, "DRSUAPI_DC_INFO_CTR_1" },
        { DRSUAPI_DC_INFO_CTR_2, "DRSUAPI_DC_INFO_CTR_2" },
@@ -1907,7 +1907,7 @@ const value_string drsuapi_drsuapi_DsGetDCInfoCtrLevels_vals[] = {
 static int drsuapi_dissect_element_DsGetDCInfoRequest1_domain_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetDCInfoRequest1_domain_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetDCInfoRequest1_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetDCInfoRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetDCInfoRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetDCInfo1_netbios_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetDCInfo1_netbios_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetDCInfo1_dns_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1987,10 +1987,10 @@ static int drsuapi_dissect_element_DsGetDCConnectionCtr01_count(tvbuff_t *tvb _U
 static int drsuapi_dissect_element_DsGetDCConnectionCtr01_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetDCConnectionCtr01_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetDCConnectionCtr01_array__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_3_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetDCInfoCtr_valDRSUAPI_DC_CONNECTION_CTR_01_ctr01(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetDCInfoCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetDCInfoCtr_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetDCInfoCtr_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetDCInfoCtr_ctr01(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaObjectListItem_next_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaObjectListItem_next_object_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaObjectListItem_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -2031,8 +2031,8 @@ static int drsuapi_dissect_element_SecBufferDesc_buffers__(tvbuff_t *tvb _U_, in
 static int drsuapi_dissect_element_DsAddEntryRequest3_first_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsAddEntryRequest3_client_creds(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsAddEntryRequest3_client_creds_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsAddEntryRequest_val2_req2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsAddEntryRequest_val3_req3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsAddEntryRequest_req2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsAddEntryRequest_req3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsAddEntryErrorInfoX_dsid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsAddEntryErrorInfoX_extended_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsAddEntryErrorInfoX_extended_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -2094,18 +2094,18 @@ static int drsuapi_dissect_element_DsAddEntryErrorInfo_Referr_V1_dsid(tvbuff_t *
 static int drsuapi_dissect_element_DsAddEntryErrorInfo_Referr_V1_extended_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsAddEntryErrorInfo_Referr_V1_extended_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsAddEntryErrorInfo_Referr_V1_refer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsAddEntryErrorInfo_val1_attr_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsAddEntryErrorInfo_val2_name_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsAddEntryErrorInfo_val3_referral_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsAddEntryErrorInfo_val4_security_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsAddEntryErrorInfo_val5_service_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsAddEntryErrorInfo_val6_update_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsAddEntryErrorInfo_val7_system_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsAddEntryErrorInfo_attr_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsAddEntryErrorInfo_name_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsAddEntryErrorInfo_referral_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsAddEntryErrorInfo_security_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsAddEntryErrorInfo_service_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsAddEntryErrorInfo_update_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsAddEntryErrorInfo_system_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsAddEntry_ErrData_V1_status(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsAddEntry_ErrData_V1_dir_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *dir_err);
 static int drsuapi_dissect_element_DsAddEntry_ErrData_V1_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *dir_err);
 static int drsuapi_dissect_element_DsAddEntry_ErrData_V1_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *dir_err);
-static int drsuapi_dissect_element_DsAddEntry_ErrData_val1_v1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsAddEntry_ErrData_v1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaObjectIdentifier2_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaObjectIdentifier2_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsAddEntryCtr2_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -2128,8 +2128,8 @@ static int drsuapi_dissect_element_DsAddEntryCtr3_count(tvbuff_t *tvb _U_, int o
 static int drsuapi_dissect_element_DsAddEntryCtr3_objects(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsAddEntryCtr3_objects_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsAddEntryCtr3_objects__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsAddEntryCtr_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsAddEntryCtr_val3_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsAddEntryCtr_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsAddEntryCtr_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static const true_false_string drsuapi_DsExecuteKCCFlags_DRSUAPI_DS_EXECUTE_KCC_ASYNCHRONOUS_OPERATION_tfs = {
    "DRSUAPI_DS_EXECUTE_KCC_ASYNCHRONOUS_OPERATION is SET",
    "DRSUAPI_DS_EXECUTE_KCC_ASYNCHRONOUS_OPERATION is NOT SET",
@@ -2140,7 +2140,7 @@ static const true_false_string drsuapi_DsExecuteKCCFlags_DRSUAPI_DS_EXECUTE_KCC_
 };
 static int drsuapi_dissect_element_DsExecuteKCC1_taskID(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsExecuteKCC1_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsExecuteKCCRequest_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsExecuteKCCRequest_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 const value_string drsuapi_drsuapi_DsReplicaGetInfoLevel_vals[] = {
        { DRSUAPI_DS_REPLICA_GET_INFO, "DRSUAPI_DS_REPLICA_GET_INFO" },
        { DRSUAPI_DS_REPLICA_GET_INFO2, "DRSUAPI_DS_REPLICA_GET_INFO2" },
@@ -2178,8 +2178,8 @@ static int drsuapi_dissect_element_DsReplicaGetInfoRequest2_attribute_name_(tvbu
 static int drsuapi_dissect_element_DsReplicaGetInfoRequest2_value_dn_str(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaGetInfoRequest2_value_dn_str_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaGetInfoRequest2_enumeration_context(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaGetInfoRequest_valDRSUAPI_DS_REPLICA_GET_INFO_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaGetInfoRequest_valDRSUAPI_DS_REPLICA_GET_INFO2_req2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaGetInfoRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaGetInfoRequest_req2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaNeighbour_naming_context_dn(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaNeighbour_naming_context_dn_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaNeighbour_source_dsa_obj_dn(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -2342,48 +2342,48 @@ static int drsuapi_dissect_element_DsReplica06Ctr_count(tvbuff_t *tvb _U_, int o
 static int drsuapi_dissect_element_DsReplica06Ctr_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplica06Ctr_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplica06Ctr_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_NEIGHBORS_neighbours(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_NEIGHBORS_neighbours_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS_cursors(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS_cursors_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA_objmetadata(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA_objmetadata_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES_connectfailures(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES_connectfailures_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES_linkfailures(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES_linkfailures_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_PENDING_OPS_pendingops(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_PENDING_OPS_pendingops_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA_attrvalmetadata(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA_attrvalmetadata_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS2_cursors2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS2_cursors2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS3_cursors3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS3_cursors3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2_objmetadata2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2_objmetadata2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2_attrvalmetadata2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2_attrvalmetadata2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_REPSTO_repsto(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_REPSTO_repsto_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CLIENT_CONTEXTS_clientctx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CLIENT_CONTEXTS_clientctx_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_UPTODATE_VECTOR_V1_udv1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_UPTODATE_VECTOR_V1_udv1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_SERVER_OUTGOING_CALLS_srvoutgoingcalls(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_SERVER_OUTGOING_CALLS_srvoutgoingcalls_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_neighbours(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_neighbours_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_cursors(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_cursors_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_objmetadata(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_objmetadata_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_connectfailures(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_connectfailures_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_linkfailures(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_linkfailures_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_pendingops(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_pendingops_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_attrvalmetadata(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_attrvalmetadata_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_cursors2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_cursors2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_cursors3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_cursors3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_objmetadata2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_objmetadata2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_attrvalmetadata2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_attrvalmetadata2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_repsto(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_repsto_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_clientctx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_clientctx_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_udv1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_udv1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_srvoutgoingcalls(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsReplicaInfo_srvoutgoingcalls_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetMemberships2Ctr1_num_entries(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetMemberships2Ctr1_ctrl_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetMemberships2Ctr1_ctrl_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetMemberships2Ctr1_ctrl_array__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetMemberships2Ctr1_ctrl_array___(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetMemberships2Ctr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetMemberships2Ctr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetMemberships2Request1_num_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetMemberships2Request1_req_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetMemberships2Request1_req_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetMemberships2Request1_req_array__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetMemberships2Request1_req_array___(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetMemberships2Request_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_DsGetMemberships2Request_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsSiteCostInfo_error_code(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsSiteCostInfo_site_cost(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_QuerySitesByCostCtr1_num_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -2391,7 +2391,7 @@ static int drsuapi_dissect_element_QuerySitesByCostCtr1_info(tvbuff_t *tvb _U_,
 static int drsuapi_dissect_element_QuerySitesByCostCtr1_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_QuerySitesByCostCtr1_info__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_QuerySitesByCostCtr1_flags_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_QuerySitesByCostCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_QuerySitesByCostCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_QuerySitesByCostRequest1_site_from(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_QuerySitesByCostRequest1_site_from_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_QuerySitesByCostRequest1_num_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -2400,7 +2400,7 @@ static int drsuapi_dissect_element_QuerySitesByCostRequest1_site_to_(tvbuff_t *t
 static int drsuapi_dissect_element_QuerySitesByCostRequest1_site_to__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_QuerySitesByCostRequest1_site_to___(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_QuerySitesByCostRequest1_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_QuerySitesByCostRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int drsuapi_dissect_element_QuerySitesByCostRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsBind_bind_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsBind_bind_guid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsBind_bind_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3692,7 +3692,7 @@ drsuapi_dissect_struct_DsBindInfoFallBack(tvbuff_t *tvb _U_, int offset _U_, pac
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsBindInfo_val24_info24(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsBindInfo_info24(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint0 size;
@@ -3701,10 +3701,10 @@ drsuapi_dissect_element_DsBindInfo_val24_info24(tvbuff_t *tvb _U_, int offset _U
 
        if (!conformant) {
                guint32 saved_flags = di->call_data->flags;
-               offset = dissect_ndr_uint0(tvb, offset, pinfo, tree, drep, hf_drsuapi_drsuapi_DsBindInfo_val24_info24_, &size);
+               offset = dissect_ndr_uint0(tvb, offset, pinfo, tree, drep, hf_drsuapi_drsuapi_DsBindInfo_info24_, &size);
                di->call_data->flags &= ~DCERPC_IS_NDR64;
                subtvb = tvb_new_subset(tvb, offset, size, -1);
-               drsuapi_dissect_element_DsBindInfo_val24_info24_(subtvb, 0, pinfo, tree, drep);
+               drsuapi_dissect_element_DsBindInfo_info24_(subtvb, 0, pinfo, tree, drep);
                offset += size;
                di->call_data->flags = saved_flags;
        }
@@ -3713,15 +3713,15 @@ drsuapi_dissect_element_DsBindInfo_val24_info24(tvbuff_t *tvb _U_, int offset _U
 }
 
 static int
-drsuapi_dissect_element_DsBindInfo_val24_info24_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsBindInfo_info24_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsBindInfo24(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsBindInfo_val24_info24,0);
+       offset = drsuapi_dissect_struct_DsBindInfo24(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsBindInfo_info24,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsBindInfo_val28_info28(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsBindInfo_info28(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint0 size;
@@ -3730,10 +3730,10 @@ drsuapi_dissect_element_DsBindInfo_val28_info28(tvbuff_t *tvb _U_, int offset _U
 
        if (!conformant) {
                guint32 saved_flags = di->call_data->flags;
-               offset = dissect_ndr_uint0(tvb, offset, pinfo, tree, drep, hf_drsuapi_drsuapi_DsBindInfo_val28_info28_, &size);
+               offset = dissect_ndr_uint0(tvb, offset, pinfo, tree, drep, hf_drsuapi_drsuapi_DsBindInfo_info28_, &size);
                di->call_data->flags &= ~DCERPC_IS_NDR64;
                subtvb = tvb_new_subset(tvb, offset, size, -1);
-               drsuapi_dissect_element_DsBindInfo_val28_info28_(subtvb, 0, pinfo, tree, drep);
+               drsuapi_dissect_element_DsBindInfo_info28_(subtvb, 0, pinfo, tree, drep);
                offset += size;
                di->call_data->flags = saved_flags;
        }
@@ -3742,15 +3742,15 @@ drsuapi_dissect_element_DsBindInfo_val28_info28(tvbuff_t *tvb _U_, int offset _U
 }
 
 static int
-drsuapi_dissect_element_DsBindInfo_val28_info28_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsBindInfo_info28_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsBindInfo28(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsBindInfo_val28_info28,0);
+       offset = drsuapi_dissect_struct_DsBindInfo28(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsBindInfo_info28,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsBindInfo_val48_info48(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsBindInfo_info48(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint0 size;
@@ -3759,10 +3759,10 @@ drsuapi_dissect_element_DsBindInfo_val48_info48(tvbuff_t *tvb _U_, int offset _U
 
        if (!conformant) {
                guint32 saved_flags = di->call_data->flags;
-               offset = dissect_ndr_uint0(tvb, offset, pinfo, tree, drep, hf_drsuapi_drsuapi_DsBindInfo_val48_info48_, &size);
+               offset = dissect_ndr_uint0(tvb, offset, pinfo, tree, drep, hf_drsuapi_drsuapi_DsBindInfo_info48_, &size);
                di->call_data->flags &= ~DCERPC_IS_NDR64;
                subtvb = tvb_new_subset(tvb, offset, size, -1);
-               drsuapi_dissect_element_DsBindInfo_val48_info48_(subtvb, 0, pinfo, tree, drep);
+               drsuapi_dissect_element_DsBindInfo_info48_(subtvb, 0, pinfo, tree, drep);
                offset += size;
                di->call_data->flags = saved_flags;
        }
@@ -3771,15 +3771,15 @@ drsuapi_dissect_element_DsBindInfo_val48_info48(tvbuff_t *tvb _U_, int offset _U
 }
 
 static int
-drsuapi_dissect_element_DsBindInfo_val48_info48_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsBindInfo_info48_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsBindInfo48(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsBindInfo_val48_info48,0);
+       offset = drsuapi_dissect_struct_DsBindInfo48(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsBindInfo_info48,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsBindInfo_valdefault_Fallback(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsBindInfo_Fallback(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint0 size;
@@ -3788,10 +3788,10 @@ drsuapi_dissect_element_DsBindInfo_valdefault_Fallback(tvbuff_t *tvb _U_, int of
 
        if (!conformant) {
                guint32 saved_flags = di->call_data->flags;
-               offset = dissect_ndr_uint0(tvb, offset, pinfo, tree, drep, hf_drsuapi_drsuapi_DsBindInfo_valdefault_Fallback_, &size);
+               offset = dissect_ndr_uint0(tvb, offset, pinfo, tree, drep, hf_drsuapi_drsuapi_DsBindInfo_Fallback_, &size);
                di->call_data->flags &= ~DCERPC_IS_NDR64;
                subtvb = tvb_new_subset(tvb, offset, size, -1);
-               drsuapi_dissect_element_DsBindInfo_valdefault_Fallback_(subtvb, 0, pinfo, tree, drep);
+               drsuapi_dissect_element_DsBindInfo_Fallback_(subtvb, 0, pinfo, tree, drep);
                offset += size;
                di->call_data->flags = saved_flags;
        }
@@ -3800,9 +3800,9 @@ drsuapi_dissect_element_DsBindInfo_valdefault_Fallback(tvbuff_t *tvb _U_, int of
 }
 
 static int
-drsuapi_dissect_element_DsBindInfo_valdefault_Fallback_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsBindInfo_Fallback_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsBindInfoFallBack(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsBindInfo_valdefault_Fallback,0);
+       offset = drsuapi_dissect_struct_DsBindInfoFallBack(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsBindInfo_Fallback,0);
 
        return offset;
 }
@@ -3823,19 +3823,19 @@ drsuapi_dissect_DsBindInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case 24:
-                       offset = drsuapi_dissect_element_DsBindInfo_val24_info24(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsBindInfo_info24(tvb, offset, pinfo, tree, drep);
                break;
 
                case 28:
-                       offset = drsuapi_dissect_element_DsBindInfo_val28_info28(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsBindInfo_info28(tvb, offset, pinfo, tree, drep);
                break;
 
                case 48:
-                       offset = drsuapi_dissect_element_DsBindInfo_val48_info48(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsBindInfo_info48(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = drsuapi_dissect_element_DsBindInfo_valdefault_Fallback(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsBindInfo_Fallback(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -4120,9 +4120,9 @@ drsuapi_dissect_struct_DsReplicaSyncRequest1(tvbuff_t *tvb _U_, int offset _U_,
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsReplicaSyncRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaSyncRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaSyncRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaSyncRequest_val1_req1,0);
+       offset = drsuapi_dissect_struct_DsReplicaSyncRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaSyncRequest_req1,0);
 
        return offset;
 }
@@ -4146,7 +4146,7 @@ drsuapi_dissect_DsReplicaSyncRequest(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsReplicaSyncRequest_val1_req1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaSyncRequest_req1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -5429,25 +5429,25 @@ drsuapi_dissect_struct_DsGetNCChangesRequest10(tvbuff_t *tvb _U_, int offset _U_
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsGetNCChangesRequest_val5_req5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetNCChangesRequest_req5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetNCChangesRequest5(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesRequest_val5_req5,0);
+       offset = drsuapi_dissect_struct_DsGetNCChangesRequest5(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesRequest_req5,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsGetNCChangesRequest_val8_req8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetNCChangesRequest_req8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetNCChangesRequest8(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesRequest_val8_req8,0);
+       offset = drsuapi_dissect_struct_DsGetNCChangesRequest8(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesRequest_req8,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsGetNCChangesRequest_val10_req10(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetNCChangesRequest_req10(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetNCChangesRequest10(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesRequest_val10_req10,0);
+       offset = drsuapi_dissect_struct_DsGetNCChangesRequest10(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesRequest_req10,0);
 
        return offset;
 }
@@ -5471,15 +5471,15 @@ drsuapi_dissect_DsGetNCChangesRequest(tvbuff_t *tvb _U_, int offset _U_, packet_
 
        switch(level) {
                case 5:
-                       offset = drsuapi_dissect_element_DsGetNCChangesRequest_val5_req5(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetNCChangesRequest_req5(tvb, offset, pinfo, tree, drep);
                break;
 
                case 8:
-                       offset = drsuapi_dissect_element_DsGetNCChangesRequest_val8_req8(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetNCChangesRequest_req8(tvb, offset, pinfo, tree, drep);
                break;
 
                case 10:
-                       offset = drsuapi_dissect_element_DsGetNCChangesRequest_val10_req10(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetNCChangesRequest_req10(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -7639,33 +7639,33 @@ drsuapi_dissect_enum_DsGetNCChangesCompressionType(tvbuff_t *tvb _U_, int offset
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsGetNCChangesCompressedCtr_val1DRSUAPI_COMPRESSION_TYPE_MSZIP16_mszip1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetNCChangesCompressedCtr_mszip1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetNCChangesMSZIPCtr1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_val1DRSUAPI_COMPRESSION_TYPE_MSZIP16_mszip1,0);
+       offset = drsuapi_dissect_struct_DsGetNCChangesMSZIPCtr1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_mszip1,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsGetNCChangesCompressedCtr_val6DRSUAPI_COMPRESSION_TYPE_MSZIP16_mszip6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetNCChangesCompressedCtr_mszip6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetNCChangesMSZIPCtr6(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_val6DRSUAPI_COMPRESSION_TYPE_MSZIP16_mszip6,0);
+       offset = drsuapi_dissect_struct_DsGetNCChangesMSZIPCtr6(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_mszip6,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsGetNCChangesCompressedCtr_val1DRSUAPI_COMPRESSION_TYPE_XPRESS16_xpress1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetNCChangesCompressedCtr_xpress1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetNCChangesXPRESSCtr1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_val1DRSUAPI_COMPRESSION_TYPE_XPRESS16_xpress1,0);
+       offset = drsuapi_dissect_struct_DsGetNCChangesXPRESSCtr1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_xpress1,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsGetNCChangesCompressedCtr_val6DRSUAPI_COMPRESSION_TYPE_XPRESS16_xpress6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetNCChangesCompressedCtr_xpress6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetNCChangesXPRESSCtr6(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_val6DRSUAPI_COMPRESSION_TYPE_XPRESS16_xpress6,0);
+       offset = drsuapi_dissect_struct_DsGetNCChangesXPRESSCtr6(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_xpress6,0);
 
        return offset;
 }
@@ -7686,19 +7686,19 @@ drsuapi_dissect_DsGetNCChangesCompressedCtr(tvbuff_t *tvb _U_, int offset _U_, p
 
        switch(level) {
                case 1|(DRSUAPI_COMPRESSION_TYPE_MSZIP<<16):
-                       offset = drsuapi_dissect_element_DsGetNCChangesCompressedCtr_val1DRSUAPI_COMPRESSION_TYPE_MSZIP16_mszip1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetNCChangesCompressedCtr_mszip1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 6|(DRSUAPI_COMPRESSION_TYPE_MSZIP<<16):
-                       offset = drsuapi_dissect_element_DsGetNCChangesCompressedCtr_val6DRSUAPI_COMPRESSION_TYPE_MSZIP16_mszip6(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetNCChangesCompressedCtr_mszip6(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1|(DRSUAPI_COMPRESSION_TYPE_XPRESS<<16):
-                       offset = drsuapi_dissect_element_DsGetNCChangesCompressedCtr_val1DRSUAPI_COMPRESSION_TYPE_XPRESS16_xpress1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetNCChangesCompressedCtr_xpress1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 6|(DRSUAPI_COMPRESSION_TYPE_XPRESS<<16):
-                       offset = drsuapi_dissect_element_DsGetNCChangesCompressedCtr_val6DRSUAPI_COMPRESSION_TYPE_XPRESS16_xpress6(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetNCChangesCompressedCtr_xpress6(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -7825,33 +7825,33 @@ drsuapi_dissect_struct_DsGetNCChangesCtr7(tvbuff_t *tvb _U_, int offset _U_, pac
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsGetNCChangesCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetNCChangesCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetNCChangesCtr1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesCtr_val1_ctr1,0);
+       offset = drsuapi_dissect_struct_DsGetNCChangesCtr1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesCtr_ctr1,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsGetNCChangesCtr_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetNCChangesCtr_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetNCChangesCtr2(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesCtr_val2_ctr2,0);
+       offset = drsuapi_dissect_struct_DsGetNCChangesCtr2(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesCtr_ctr2,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsGetNCChangesCtr_val6_ctr6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetNCChangesCtr_ctr6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetNCChangesCtr6(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesCtr_val6_ctr6,0);
+       offset = drsuapi_dissect_struct_DsGetNCChangesCtr6(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesCtr_ctr6,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsGetNCChangesCtr_val7_ctr7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetNCChangesCtr_ctr7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetNCChangesCtr7(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesCtr_val7_ctr7,0);
+       offset = drsuapi_dissect_struct_DsGetNCChangesCtr7(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNCChangesCtr_ctr7,0);
 
        return offset;
 }
@@ -7875,19 +7875,19 @@ drsuapi_dissect_DsGetNCChangesCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsGetNCChangesCtr_val1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetNCChangesCtr_ctr1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = drsuapi_dissect_element_DsGetNCChangesCtr_val2_ctr2(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetNCChangesCtr_ctr2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 6:
-                       offset = drsuapi_dissect_element_DsGetNCChangesCtr_val6_ctr6(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetNCChangesCtr_ctr6(tvb, offset, pinfo, tree, drep);
                break;
 
                case 7:
-                       offset = drsuapi_dissect_element_DsGetNCChangesCtr_val7_ctr7(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetNCChangesCtr_ctr7(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -7996,9 +7996,9 @@ drsuapi_dissect_struct_DsReplicaUpdateRefsRequest1(tvbuff_t *tvb _U_, int offset
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsReplicaUpdateRefsRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaUpdateRefsRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaUpdateRefsRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaUpdateRefsRequest_val1_req1,0);
+       offset = drsuapi_dissect_struct_DsReplicaUpdateRefsRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaUpdateRefsRequest_req1,0);
 
        return offset;
 }
@@ -8022,7 +8022,7 @@ drsuapi_dissect_DsReplicaUpdateRefsRequest(tvbuff_t *tvb _U_, int offset _U_, pa
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsReplicaUpdateRefsRequest_val1_req1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaUpdateRefsRequest_req1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -8289,17 +8289,17 @@ drsuapi_dissect_struct_DsReplicaAddRequest2(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsReplicaAddRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaAddRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaAddRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaAddRequest_val1_req1,0);
+       offset = drsuapi_dissect_struct_DsReplicaAddRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaAddRequest_req1,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaAddRequest_val2_req2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaAddRequest_req2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaAddRequest2(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaAddRequest_val2_req2,0);
+       offset = drsuapi_dissect_struct_DsReplicaAddRequest2(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaAddRequest_req2,0);
 
        return offset;
 }
@@ -8323,11 +8323,11 @@ drsuapi_dissect_DsReplicaAddRequest(tvbuff_t *tvb _U_, int offset _U_, packet_in
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsReplicaAddRequest_val1_req1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaAddRequest_req1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = drsuapi_dissect_element_DsReplicaAddRequest_val2_req2(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaAddRequest_req2(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -8425,9 +8425,9 @@ drsuapi_dissect_struct_DsReplicaDelRequest1(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsReplicaDelRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaDelRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaDelRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaDelRequest_val1_req1,0);
+       offset = drsuapi_dissect_struct_DsReplicaDelRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaDelRequest_req1,0);
 
        return offset;
 }
@@ -8451,7 +8451,7 @@ drsuapi_dissect_DsReplicaDelRequest(tvbuff_t *tvb _U_, int offset _U_, packet_in
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsReplicaDelRequest_val1_req1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaDelRequest_req1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -8605,9 +8605,9 @@ drsuapi_dissect_struct_DsReplicaModRequest1(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsReplicaModRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaModRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaModRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaModRequest_val1_req1,0);
+       offset = drsuapi_dissect_struct_DsReplicaModRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaModRequest_req1,0);
 
        return offset;
 }
@@ -8631,7 +8631,7 @@ drsuapi_dissect_DsReplicaModRequest(tvbuff_t *tvb _U_, int offset _U_, packet_in
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsReplicaModRequest_val1_req1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaModRequest_req1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -8837,9 +8837,9 @@ drsuapi_dissect_struct_DsGetMembershipsCtr1(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsGetMembershipsCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetMembershipsCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetMembershipsCtr1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetMembershipsCtr_val1_ctr1,0);
+       offset = drsuapi_dissect_struct_DsGetMembershipsCtr1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetMembershipsCtr_ctr1,0);
 
        return offset;
 }
@@ -8863,7 +8863,7 @@ drsuapi_dissect_DsGetMembershipsCtr(tvbuff_t *tvb _U_, int offset _U_, packet_in
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsGetMembershipsCtr_val1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetMembershipsCtr_ctr1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -8996,9 +8996,9 @@ drsuapi_dissect_struct_DsGetMembershipsRequest1(tvbuff_t *tvb _U_, int offset _U
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsGetMembershipsRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetMembershipsRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetMembershipsRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetMembershipsRequest_val1_req1,0);
+       offset = drsuapi_dissect_struct_DsGetMembershipsRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetMembershipsRequest_req1,0);
 
        return offset;
 }
@@ -9022,7 +9022,7 @@ drsuapi_dissect_DsGetMembershipsRequest(tvbuff_t *tvb _U_, int offset _U_, packe
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsGetMembershipsRequest_val1_req1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetMembershipsRequest_req1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -9177,9 +9177,9 @@ drsuapi_dissect_struct_DsGetNT4ChangeLogRequest1(tvbuff_t *tvb _U_, int offset _
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsGetNT4ChangeLogRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetNT4ChangeLogRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetNT4ChangeLogRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNT4ChangeLogRequest_val1_req1,0);
+       offset = drsuapi_dissect_struct_DsGetNT4ChangeLogRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNT4ChangeLogRequest_req1,0);
 
        return offset;
 }
@@ -9203,7 +9203,7 @@ drsuapi_dissect_DsGetNT4ChangeLogRequest(tvbuff_t *tvb _U_, int offset _U_, pack
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsGetNT4ChangeLogRequest_val1_req1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetNT4ChangeLogRequest_req1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -9402,9 +9402,9 @@ drsuapi_dissect_struct_DsGetNT4ChangeLogInfo1(tvbuff_t *tvb _U_, int offset _U_,
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsGetNT4ChangeLogInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetNT4ChangeLogInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetNT4ChangeLogInfo1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo_val1_info1,0);
+       offset = drsuapi_dissect_struct_DsGetNT4ChangeLogInfo1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo_info1,0);
 
        return offset;
 }
@@ -9428,7 +9428,7 @@ drsuapi_dissect_DsGetNT4ChangeLogInfo(tvbuff_t *tvb _U_, int offset _U_, packet_
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsGetNT4ChangeLogInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetNT4ChangeLogInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -9716,9 +9716,9 @@ drsuapi_dissect_struct_DsNameRequest1(tvbuff_t *tvb _U_, int offset _U_, packet_
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsNameRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsNameRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsNameRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsNameRequest_val1_req1,0);
+       offset = drsuapi_dissect_struct_DsNameRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsNameRequest_req1,0);
 
        return offset;
 }
@@ -9742,7 +9742,7 @@ drsuapi_dissect_DsNameRequest(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsNameRequest_val1_req1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsNameRequest_req1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -9913,17 +9913,17 @@ drsuapi_dissect_struct_DsNameCtr1(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsNameCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsNameCtr_ctr1(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, drsuapi_dissect_element_DsNameCtr_val1_ctr1_, NDR_POINTER_UNIQUE, "Pointer to Ctr1 (drsuapi_DsNameCtr1)",hf_drsuapi_drsuapi_DsNameCtr_val1_ctr1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, drsuapi_dissect_element_DsNameCtr_ctr1_, NDR_POINTER_UNIQUE, "Pointer to Ctr1 (drsuapi_DsNameCtr1)",hf_drsuapi_drsuapi_DsNameCtr_ctr1);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsNameCtr_val1_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsNameCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsNameCtr1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsNameCtr_val1_ctr1,0);
+       offset = drsuapi_dissect_struct_DsNameCtr1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsNameCtr_ctr1,0);
 
        return offset;
 }
@@ -9947,7 +9947,7 @@ drsuapi_dissect_DsNameCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsNameCtr_val1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsNameCtr_ctr1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -10096,9 +10096,9 @@ drsuapi_dissect_struct_DsWriteAccountSpnRequest1(tvbuff_t *tvb _U_, int offset _
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsWriteAccountSpnRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsWriteAccountSpnRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsWriteAccountSpnRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsWriteAccountSpnRequest_val1_req1,0);
+       offset = drsuapi_dissect_struct_DsWriteAccountSpnRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsWriteAccountSpnRequest_req1,0);
 
        return offset;
 }
@@ -10122,7 +10122,7 @@ drsuapi_dissect_DsWriteAccountSpnRequest(tvbuff_t *tvb _U_, int offset _U_, pack
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsWriteAccountSpnRequest_val1_req1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsWriteAccountSpnRequest_req1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -10179,9 +10179,9 @@ drsuapi_dissect_struct_DsWriteAccountSpnResult1(tvbuff_t *tvb _U_, int offset _U
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsWriteAccountSpnResult_val1_res1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsWriteAccountSpnResult_res1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsWriteAccountSpnResult1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsWriteAccountSpnResult_val1_res1,0);
+       offset = drsuapi_dissect_struct_DsWriteAccountSpnResult1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsWriteAccountSpnResult_res1,0);
 
        return offset;
 }
@@ -10205,7 +10205,7 @@ drsuapi_dissect_DsWriteAccountSpnResult(tvbuff_t *tvb _U_, int offset _U_, packe
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsWriteAccountSpnResult_val1_res1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsWriteAccountSpnResult_res1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -10306,9 +10306,9 @@ drsuapi_dissect_struct_DsRemoveDSServerRequest1(tvbuff_t *tvb _U_, int offset _U
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsRemoveDSServerRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsRemoveDSServerRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsRemoveDSServerRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsRemoveDSServerRequest_val1_req1,0);
+       offset = drsuapi_dissect_struct_DsRemoveDSServerRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsRemoveDSServerRequest_req1,0);
 
        return offset;
 }
@@ -10332,7 +10332,7 @@ drsuapi_dissect_DsRemoveDSServerRequest(tvbuff_t *tvb _U_, int offset _U_, packe
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsRemoveDSServerRequest_val1_req1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsRemoveDSServerRequest_req1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -10389,9 +10389,9 @@ drsuapi_dissect_struct_DsRemoveDSServerResult1(tvbuff_t *tvb _U_, int offset _U_
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsRemoveDSServerResult_val1_res1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsRemoveDSServerResult_res1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsRemoveDSServerResult1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsRemoveDSServerResult_val1_res1,0);
+       offset = drsuapi_dissect_struct_DsRemoveDSServerResult1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsRemoveDSServerResult_res1,0);
 
        return offset;
 }
@@ -10415,7 +10415,7 @@ drsuapi_dissect_DsRemoveDSServerResult(tvbuff_t *tvb _U_, int offset _U_, packet
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsRemoveDSServerResult_val1_res1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsRemoveDSServerResult_res1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -10516,9 +10516,9 @@ drsuapi_dissect_struct_DsGetDCInfoRequest1(tvbuff_t *tvb _U_, int offset _U_, pa
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsGetDCInfoRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetDCInfoRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetDCInfoRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetDCInfoRequest_val1_req1,0);
+       offset = drsuapi_dissect_struct_DsGetDCInfoRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetDCInfoRequest_req1,0);
 
        return offset;
 }
@@ -10542,7 +10542,7 @@ drsuapi_dissect_DsGetDCInfoRequest(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsGetDCInfoRequest_val1_req1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetDCInfoRequest_req1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -11660,33 +11660,33 @@ drsuapi_dissect_struct_DsGetDCConnectionCtr01(tvbuff_t *tvb _U_, int offset _U_,
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetDCInfoCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetDCInfoCtr1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_1_ctr1,0);
+       offset = drsuapi_dissect_struct_DsGetDCInfoCtr1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetDCInfoCtr_ctr1,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetDCInfoCtr_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetDCInfoCtr2(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_2_ctr2,0);
+       offset = drsuapi_dissect_struct_DsGetDCInfoCtr2(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetDCInfoCtr_ctr2,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_3_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetDCInfoCtr_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetDCInfoCtr3(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_3_ctr3,0);
+       offset = drsuapi_dissect_struct_DsGetDCInfoCtr3(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetDCInfoCtr_ctr3,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsGetDCInfoCtr_valDRSUAPI_DC_CONNECTION_CTR_01_ctr01(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetDCInfoCtr_ctr01(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetDCConnectionCtr01(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetDCInfoCtr_valDRSUAPI_DC_CONNECTION_CTR_01_ctr01,0);
+       offset = drsuapi_dissect_struct_DsGetDCConnectionCtr01(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetDCInfoCtr_ctr01,0);
 
        return offset;
 }
@@ -11710,19 +11710,19 @@ drsuapi_dissect_DsGetDCInfoCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 
        switch(level) {
                case DRSUAPI_DC_INFO_CTR_1:
-                       offset = drsuapi_dissect_element_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetDCInfoCtr_ctr1(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DC_INFO_CTR_2:
-                       offset = drsuapi_dissect_element_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_2_ctr2(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetDCInfoCtr_ctr2(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DC_INFO_CTR_3:
-                       offset = drsuapi_dissect_element_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_3_ctr3(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetDCInfoCtr_ctr3(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DC_CONNECTION_CTR_01:
-                       offset = drsuapi_dissect_element_DsGetDCInfoCtr_valDRSUAPI_DC_CONNECTION_CTR_01_ctr01(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetDCInfoCtr_ctr01(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -12119,17 +12119,17 @@ drsuapi_dissect_struct_DsAddEntryRequest3(tvbuff_t *tvb _U_, int offset _U_, pac
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsAddEntryRequest_val2_req2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsAddEntryRequest_req2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsAddEntryRequest2(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryRequest_val2_req2,0);
+       offset = drsuapi_dissect_struct_DsAddEntryRequest2(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryRequest_req2,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsAddEntryRequest_val3_req3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsAddEntryRequest_req3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsAddEntryRequest3(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryRequest_val3_req3,0);
+       offset = drsuapi_dissect_struct_DsAddEntryRequest3(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryRequest_req3,0);
 
        return offset;
 }
@@ -12153,11 +12153,11 @@ drsuapi_dissect_DsAddEntryRequest(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
        switch(level) {
                case 2:
-                       offset = drsuapi_dissect_element_DsAddEntryRequest_val2_req2(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsAddEntryRequest_req2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = drsuapi_dissect_element_DsAddEntryRequest_val3_req3(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsAddEntryRequest_req3(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -13012,57 +13012,57 @@ drsuapi_dissect_struct_DsAddEntryErrorInfo_Referr_V1(tvbuff_t *tvb _U_, int offs
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsAddEntryErrorInfo_val1_attr_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsAddEntryErrorInfo_attr_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsAddEntryErrorInfo_Attr_V1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val1_attr_err,0);
+       offset = drsuapi_dissect_struct_DsAddEntryErrorInfo_Attr_V1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryErrorInfo_attr_err,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsAddEntryErrorInfo_val2_name_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsAddEntryErrorInfo_name_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsAddEntryErrorInfo_Name_V1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val2_name_err,0);
+       offset = drsuapi_dissect_struct_DsAddEntryErrorInfo_Name_V1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryErrorInfo_name_err,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsAddEntryErrorInfo_val3_referral_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsAddEntryErrorInfo_referral_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsAddEntryErrorInfo_Referr_V1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val3_referral_err,0);
+       offset = drsuapi_dissect_struct_DsAddEntryErrorInfo_Referr_V1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryErrorInfo_referral_err,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsAddEntryErrorInfo_val4_security_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsAddEntryErrorInfo_security_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsAddEntryErrorInfoX(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val4_security_err,0);
+       offset = drsuapi_dissect_struct_DsAddEntryErrorInfoX(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryErrorInfo_security_err,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsAddEntryErrorInfo_val5_service_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsAddEntryErrorInfo_service_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsAddEntryErrorInfoX(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val5_service_err,0);
+       offset = drsuapi_dissect_struct_DsAddEntryErrorInfoX(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryErrorInfo_service_err,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsAddEntryErrorInfo_val6_update_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsAddEntryErrorInfo_update_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsAddEntryErrorInfoX(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val6_update_err,0);
+       offset = drsuapi_dissect_struct_DsAddEntryErrorInfoX(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryErrorInfo_update_err,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsAddEntryErrorInfo_val7_system_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsAddEntryErrorInfo_system_err(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsAddEntryErrorInfoX(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val7_system_err,0);
+       offset = drsuapi_dissect_struct_DsAddEntryErrorInfoX(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryErrorInfo_system_err,0);
 
        return offset;
 }
@@ -13086,31 +13086,31 @@ drsuapi_dissect_DsAddEntryErrorInfo(tvbuff_t *tvb _U_, int offset _U_, packet_in
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsAddEntryErrorInfo_val1_attr_err(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsAddEntryErrorInfo_attr_err(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = drsuapi_dissect_element_DsAddEntryErrorInfo_val2_name_err(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsAddEntryErrorInfo_name_err(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = drsuapi_dissect_element_DsAddEntryErrorInfo_val3_referral_err(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsAddEntryErrorInfo_referral_err(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = drsuapi_dissect_element_DsAddEntryErrorInfo_val4_security_err(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsAddEntryErrorInfo_security_err(tvb, offset, pinfo, tree, drep);
                break;
 
                case 5:
-                       offset = drsuapi_dissect_element_DsAddEntryErrorInfo_val5_service_err(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsAddEntryErrorInfo_service_err(tvb, offset, pinfo, tree, drep);
                break;
 
                case 6:
-                       offset = drsuapi_dissect_element_DsAddEntryErrorInfo_val6_update_err(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsAddEntryErrorInfo_update_err(tvb, offset, pinfo, tree, drep);
                break;
 
                case 7:
-                       offset = drsuapi_dissect_element_DsAddEntryErrorInfo_val7_system_err(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsAddEntryErrorInfo_system_err(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -13198,9 +13198,9 @@ drsuapi_dissect_struct_DsAddEntry_ErrData_V1(tvbuff_t *tvb _U_, int offset _U_,
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsAddEntry_ErrData_val1_v1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsAddEntry_ErrData_v1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsAddEntry_ErrData_V1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntry_ErrData_val1_v1,0);
+       offset = drsuapi_dissect_struct_DsAddEntry_ErrData_V1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntry_ErrData_v1,0);
 
        return offset;
 }
@@ -13224,7 +13224,7 @@ drsuapi_dissect_DsAddEntry_ErrData(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsAddEntry_ErrData_val1_v1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsAddEntry_ErrData_v1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -13562,17 +13562,17 @@ drsuapi_dissect_struct_DsAddEntryCtr3(tvbuff_t *tvb _U_, int offset _U_, packet_
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsAddEntryCtr_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsAddEntryCtr_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsAddEntryCtr2(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryCtr_val2_ctr2,0);
+       offset = drsuapi_dissect_struct_DsAddEntryCtr2(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryCtr_ctr2,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsAddEntryCtr_val3_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsAddEntryCtr_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsAddEntryCtr3(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryCtr_val3_ctr3,0);
+       offset = drsuapi_dissect_struct_DsAddEntryCtr3(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsAddEntryCtr_ctr3,0);
 
        return offset;
 }
@@ -13596,11 +13596,11 @@ drsuapi_dissect_DsAddEntryCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 
        switch(level) {
                case 2:
-                       offset = drsuapi_dissect_element_DsAddEntryCtr_val2_ctr2(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsAddEntryCtr_ctr2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = drsuapi_dissect_element_DsAddEntryCtr_val3_ctr3(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsAddEntryCtr_ctr3(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -13717,9 +13717,9 @@ drsuapi_dissect_struct_DsExecuteKCC1(tvbuff_t *tvb _U_, int offset _U_, packet_i
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsExecuteKCCRequest_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsExecuteKCCRequest_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsExecuteKCC1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsExecuteKCCRequest_val1_ctr1,0);
+       offset = drsuapi_dissect_struct_DsExecuteKCC1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsExecuteKCCRequest_ctr1,0);
 
        return offset;
 }
@@ -13743,7 +13743,7 @@ drsuapi_dissect_DsExecuteKCCRequest(tvbuff_t *tvb _U_, int offset _U_, packet_in
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsExecuteKCCRequest_val1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsExecuteKCCRequest_ctr1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -14029,17 +14029,17 @@ drsuapi_dissect_struct_DsReplicaGetInfoRequest2(tvbuff_t *tvb _U_, int offset _U
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsReplicaGetInfoRequest_valDRSUAPI_DS_REPLICA_GET_INFO_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaGetInfoRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaGetInfoRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaGetInfoRequest_valDRSUAPI_DS_REPLICA_GET_INFO_req1,0);
+       offset = drsuapi_dissect_struct_DsReplicaGetInfoRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaGetInfoRequest_req1,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaGetInfoRequest_valDRSUAPI_DS_REPLICA_GET_INFO2_req2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaGetInfoRequest_req2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaGetInfoRequest2(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaGetInfoRequest_valDRSUAPI_DS_REPLICA_GET_INFO2_req2,0);
+       offset = drsuapi_dissect_struct_DsReplicaGetInfoRequest2(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaGetInfoRequest_req2,0);
 
        return offset;
 }
@@ -14063,11 +14063,11 @@ drsuapi_dissect_DsReplicaGetInfoRequest(tvbuff_t *tvb _U_, int offset _U_, packe
 
        switch(level) {
                case DRSUAPI_DS_REPLICA_GET_INFO:
-                       offset = drsuapi_dissect_element_DsReplicaGetInfoRequest_valDRSUAPI_DS_REPLICA_GET_INFO_req1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaGetInfoRequest_req1(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DS_REPLICA_GET_INFO2:
-                       offset = drsuapi_dissect_element_DsReplicaGetInfoRequest_valDRSUAPI_DS_REPLICA_GET_INFO2_req2(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaGetInfoRequest_req2(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -16474,241 +16474,241 @@ drsuapi_dissect_struct_DsReplica06Ctr(tvbuff_t *tvb _U_, int offset _U_, packet_
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_NEIGHBORS_neighbours(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_neighbours(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, drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_NEIGHBORS_neighbours_, NDR_POINTER_UNIQUE, "Pointer to Neighbours (drsuapi_DsReplicaNeighbourCtr)",hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_NEIGHBORS_neighbours);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, drsuapi_dissect_element_DsReplicaInfo_neighbours_, NDR_POINTER_UNIQUE, "Pointer to Neighbours (drsuapi_DsReplicaNeighbourCtr)",hf_drsuapi_drsuapi_DsReplicaInfo_neighbours);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_NEIGHBORS_neighbours_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_neighbours_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaNeighbourCtr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_NEIGHBORS_neighbours,0);
+       offset = drsuapi_dissect_struct_DsReplicaNeighbourCtr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_neighbours,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS_cursors(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_cursors(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, drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS_cursors_, NDR_POINTER_UNIQUE, "Pointer to Cursors (drsuapi_DsReplicaCursorCtr)",hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS_cursors);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, drsuapi_dissect_element_DsReplicaInfo_cursors_, NDR_POINTER_UNIQUE, "Pointer to Cursors (drsuapi_DsReplicaCursorCtr)",hf_drsuapi_drsuapi_DsReplicaInfo_cursors);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS_cursors_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_cursors_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaCursorCtr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS_cursors,0);
+       offset = drsuapi_dissect_struct_DsReplicaCursorCtr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_cursors,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA_objmetadata(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_objmetadata(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, drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA_objmetadata_, NDR_POINTER_UNIQUE, "Pointer to Objmetadata (drsuapi_DsReplicaObjMetaDataCtr)",hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA_objmetadata);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, drsuapi_dissect_element_DsReplicaInfo_objmetadata_, NDR_POINTER_UNIQUE, "Pointer to Objmetadata (drsuapi_DsReplicaObjMetaDataCtr)",hf_drsuapi_drsuapi_DsReplicaInfo_objmetadata);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA_objmetadata_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_objmetadata_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaObjMetaDataCtr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA_objmetadata,0);
+       offset = drsuapi_dissect_struct_DsReplicaObjMetaDataCtr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_objmetadata,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES_connectfailures(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_connectfailures(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, drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES_connectfailures_, NDR_POINTER_UNIQUE, "Pointer to Connectfailures (drsuapi_DsReplicaKccDsaFailuresCtr)",hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES_connectfailures);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, drsuapi_dissect_element_DsReplicaInfo_connectfailures_, NDR_POINTER_UNIQUE, "Pointer to Connectfailures (drsuapi_DsReplicaKccDsaFailuresCtr)",hf_drsuapi_drsuapi_DsReplicaInfo_connectfailures);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES_connectfailures_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_connectfailures_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaKccDsaFailuresCtr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES_connectfailures,0);
+       offset = drsuapi_dissect_struct_DsReplicaKccDsaFailuresCtr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_connectfailures,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES_linkfailures(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_linkfailures(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, drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES_linkfailures_, NDR_POINTER_UNIQUE, "Pointer to Linkfailures (drsuapi_DsReplicaKccDsaFailuresCtr)",hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES_linkfailures);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, drsuapi_dissect_element_DsReplicaInfo_linkfailures_, NDR_POINTER_UNIQUE, "Pointer to Linkfailures (drsuapi_DsReplicaKccDsaFailuresCtr)",hf_drsuapi_drsuapi_DsReplicaInfo_linkfailures);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES_linkfailures_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_linkfailures_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaKccDsaFailuresCtr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES_linkfailures,0);
+       offset = drsuapi_dissect_struct_DsReplicaKccDsaFailuresCtr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_linkfailures,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_PENDING_OPS_pendingops(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_pendingops(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, drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_PENDING_OPS_pendingops_, NDR_POINTER_UNIQUE, "Pointer to Pendingops (drsuapi_DsReplicaOpCtr)",hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_PENDING_OPS_pendingops);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, drsuapi_dissect_element_DsReplicaInfo_pendingops_, NDR_POINTER_UNIQUE, "Pointer to Pendingops (drsuapi_DsReplicaOpCtr)",hf_drsuapi_drsuapi_DsReplicaInfo_pendingops);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_PENDING_OPS_pendingops_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_pendingops_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaOpCtr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_PENDING_OPS_pendingops,0);
+       offset = drsuapi_dissect_struct_DsReplicaOpCtr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_pendingops,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA_attrvalmetadata(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_attrvalmetadata(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, drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA_attrvalmetadata_, NDR_POINTER_UNIQUE, "Pointer to Attrvalmetadata (drsuapi_DsReplicaAttrValMetaDataCtr)",hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA_attrvalmetadata);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, drsuapi_dissect_element_DsReplicaInfo_attrvalmetadata_, NDR_POINTER_UNIQUE, "Pointer to Attrvalmetadata (drsuapi_DsReplicaAttrValMetaDataCtr)",hf_drsuapi_drsuapi_DsReplicaInfo_attrvalmetadata);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA_attrvalmetadata_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_attrvalmetadata_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaAttrValMetaDataCtr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA_attrvalmetadata,0);
+       offset = drsuapi_dissect_struct_DsReplicaAttrValMetaDataCtr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_attrvalmetadata,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS2_cursors2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_cursors2(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, drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS2_cursors2_, NDR_POINTER_UNIQUE, "Pointer to Cursors2 (drsuapi_DsReplicaCursor2Ctr)",hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS2_cursors2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, drsuapi_dissect_element_DsReplicaInfo_cursors2_, NDR_POINTER_UNIQUE, "Pointer to Cursors2 (drsuapi_DsReplicaCursor2Ctr)",hf_drsuapi_drsuapi_DsReplicaInfo_cursors2);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS2_cursors2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_cursors2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaCursor2Ctr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS2_cursors2,0);
+       offset = drsuapi_dissect_struct_DsReplicaCursor2Ctr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_cursors2,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS3_cursors3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_cursors3(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, drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS3_cursors3_, NDR_POINTER_UNIQUE, "Pointer to Cursors3 (drsuapi_DsReplicaCursor3Ctr)",hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS3_cursors3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, drsuapi_dissect_element_DsReplicaInfo_cursors3_, NDR_POINTER_UNIQUE, "Pointer to Cursors3 (drsuapi_DsReplicaCursor3Ctr)",hf_drsuapi_drsuapi_DsReplicaInfo_cursors3);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS3_cursors3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_cursors3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaCursor3Ctr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS3_cursors3,0);
+       offset = drsuapi_dissect_struct_DsReplicaCursor3Ctr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_cursors3,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2_objmetadata2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_objmetadata2(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, drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2_objmetadata2_, NDR_POINTER_UNIQUE, "Pointer to Objmetadata2 (drsuapi_DsReplicaObjMetaData2Ctr)",hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2_objmetadata2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, drsuapi_dissect_element_DsReplicaInfo_objmetadata2_, NDR_POINTER_UNIQUE, "Pointer to Objmetadata2 (drsuapi_DsReplicaObjMetaData2Ctr)",hf_drsuapi_drsuapi_DsReplicaInfo_objmetadata2);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2_objmetadata2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_objmetadata2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaObjMetaData2Ctr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2_objmetadata2,0);
+       offset = drsuapi_dissect_struct_DsReplicaObjMetaData2Ctr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_objmetadata2,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2_attrvalmetadata2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_attrvalmetadata2(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, drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2_attrvalmetadata2_, NDR_POINTER_UNIQUE, "Pointer to Attrvalmetadata2 (drsuapi_DsReplicaAttrValMetaData2Ctr)",hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2_attrvalmetadata2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, drsuapi_dissect_element_DsReplicaInfo_attrvalmetadata2_, NDR_POINTER_UNIQUE, "Pointer to Attrvalmetadata2 (drsuapi_DsReplicaAttrValMetaData2Ctr)",hf_drsuapi_drsuapi_DsReplicaInfo_attrvalmetadata2);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2_attrvalmetadata2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_attrvalmetadata2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaAttrValMetaData2Ctr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2_attrvalmetadata2,0);
+       offset = drsuapi_dissect_struct_DsReplicaAttrValMetaData2Ctr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_attrvalmetadata2,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_REPSTO_repsto(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_repsto(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, drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_REPSTO_repsto_, NDR_POINTER_UNIQUE, "Pointer to Repsto (drsuapi_DsReplicaNeighbourCtr)",hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_REPSTO_repsto);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, drsuapi_dissect_element_DsReplicaInfo_repsto_, NDR_POINTER_UNIQUE, "Pointer to Repsto (drsuapi_DsReplicaNeighbourCtr)",hf_drsuapi_drsuapi_DsReplicaInfo_repsto);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_REPSTO_repsto_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_repsto_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaNeighbourCtr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_REPSTO_repsto,0);
+       offset = drsuapi_dissect_struct_DsReplicaNeighbourCtr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_repsto,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CLIENT_CONTEXTS_clientctx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_clientctx(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, drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CLIENT_CONTEXTS_clientctx_, NDR_POINTER_UNIQUE, "Pointer to Clientctx (drsuapi_DsReplicaConnection04Ctr)",hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CLIENT_CONTEXTS_clientctx);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, drsuapi_dissect_element_DsReplicaInfo_clientctx_, NDR_POINTER_UNIQUE, "Pointer to Clientctx (drsuapi_DsReplicaConnection04Ctr)",hf_drsuapi_drsuapi_DsReplicaInfo_clientctx);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CLIENT_CONTEXTS_clientctx_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_clientctx_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaConnection04Ctr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CLIENT_CONTEXTS_clientctx,0);
+       offset = drsuapi_dissect_struct_DsReplicaConnection04Ctr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_clientctx,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_UPTODATE_VECTOR_V1_udv1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_udv1(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, drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_UPTODATE_VECTOR_V1_udv1_, NDR_POINTER_UNIQUE, "Pointer to Udv1 (drsuapi_DsReplicaCursorCtrEx)",hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_UPTODATE_VECTOR_V1_udv1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, drsuapi_dissect_element_DsReplicaInfo_udv1_, NDR_POINTER_UNIQUE, "Pointer to Udv1 (drsuapi_DsReplicaCursorCtrEx)",hf_drsuapi_drsuapi_DsReplicaInfo_udv1);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_UPTODATE_VECTOR_V1_udv1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_udv1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplicaCursorCtrEx(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_UPTODATE_VECTOR_V1_udv1,0);
+       offset = drsuapi_dissect_struct_DsReplicaCursorCtrEx(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_udv1,0);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_SERVER_OUTGOING_CALLS_srvoutgoingcalls(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_srvoutgoingcalls(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, drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_SERVER_OUTGOING_CALLS_srvoutgoingcalls_, NDR_POINTER_UNIQUE, "Pointer to Srvoutgoingcalls (drsuapi_DsReplica06Ctr)",hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_SERVER_OUTGOING_CALLS_srvoutgoingcalls);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, drsuapi_dissect_element_DsReplicaInfo_srvoutgoingcalls_, NDR_POINTER_UNIQUE, "Pointer to Srvoutgoingcalls (drsuapi_DsReplica06Ctr)",hf_drsuapi_drsuapi_DsReplicaInfo_srvoutgoingcalls);
 
        return offset;
 }
 
 static int
-drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_SERVER_OUTGOING_CALLS_srvoutgoingcalls_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsReplicaInfo_srvoutgoingcalls_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsReplica06Ctr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_SERVER_OUTGOING_CALLS_srvoutgoingcalls,0);
+       offset = drsuapi_dissect_struct_DsReplica06Ctr(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaInfo_srvoutgoingcalls,0);
 
        return offset;
 }
@@ -16732,63 +16732,63 @@ drsuapi_dissect_DsReplicaInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 
        switch(level) {
                case DRSUAPI_DS_REPLICA_INFO_NEIGHBORS:
-                       offset = drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_NEIGHBORS_neighbours(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaInfo_neighbours(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DS_REPLICA_INFO_CURSORS:
-                       offset = drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS_cursors(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaInfo_cursors(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DS_REPLICA_INFO_OBJ_METADATA:
-                       offset = drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA_objmetadata(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaInfo_objmetadata(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES:
-                       offset = drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES_connectfailures(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaInfo_connectfailures(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES:
-                       offset = drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES_linkfailures(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaInfo_linkfailures(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DS_REPLICA_INFO_PENDING_OPS:
-                       offset = drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_PENDING_OPS_pendingops(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaInfo_pendingops(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA:
-                       offset = drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA_attrvalmetadata(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaInfo_attrvalmetadata(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DS_REPLICA_INFO_CURSORS2:
-                       offset = drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS2_cursors2(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaInfo_cursors2(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DS_REPLICA_INFO_CURSORS3:
-                       offset = drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS3_cursors3(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaInfo_cursors3(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2:
-                       offset = drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2_objmetadata2(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaInfo_objmetadata2(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2:
-                       offset = drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2_attrvalmetadata2(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaInfo_attrvalmetadata2(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DS_REPLICA_INFO_REPSTO:
-                       offset = drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_REPSTO_repsto(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaInfo_repsto(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DS_REPLICA_INFO_CLIENT_CONTEXTS:
-                       offset = drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CLIENT_CONTEXTS_clientctx(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaInfo_clientctx(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DS_REPLICA_INFO_UPTODATE_VECTOR_V1:
-                       offset = drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_UPTODATE_VECTOR_V1_udv1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaInfo_udv1(tvb, offset, pinfo, tree, drep);
                break;
 
                case DRSUAPI_DS_REPLICA_INFO_SERVER_OUTGOING_CALLS:
-                       offset = drsuapi_dissect_element_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_SERVER_OUTGOING_CALLS_srvoutgoingcalls(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsReplicaInfo_srvoutgoingcalls(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -16880,9 +16880,9 @@ drsuapi_dissect_struct_DsGetMemberships2Ctr1(tvbuff_t *tvb _U_, int offset _U_,
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsGetMemberships2Ctr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetMemberships2Ctr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetMembershipsCtr1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetMemberships2Ctr_val1_ctr1,0);
+       offset = drsuapi_dissect_struct_DsGetMembershipsCtr1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetMemberships2Ctr_ctr1,0);
 
        return offset;
 }
@@ -16906,7 +16906,7 @@ drsuapi_dissect_DsGetMemberships2Ctr(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsGetMemberships2Ctr_val1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetMemberships2Ctr_ctr1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -16998,9 +16998,9 @@ drsuapi_dissect_struct_DsGetMemberships2Request1(tvbuff_t *tvb _U_, int offset _
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsGetMemberships2Request_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_DsGetMemberships2Request_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_DsGetMemberships2Request1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetMemberships2Request_val1_req1,0);
+       offset = drsuapi_dissect_struct_DsGetMemberships2Request1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetMemberships2Request_req1,0);
 
        return offset;
 }
@@ -17024,7 +17024,7 @@ drsuapi_dissect_DsGetMemberships2Request(tvbuff_t *tvb _U_, int offset _U_, pack
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_DsGetMemberships2Request_val1_req1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_DsGetMemberships2Request_req1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -17173,9 +17173,9 @@ drsuapi_dissect_struct_QuerySitesByCostCtr1(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_QuerySitesByCostCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_QuerySitesByCostCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_QuerySitesByCostCtr1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_QuerySitesByCostCtr_val1_ctr1,0);
+       offset = drsuapi_dissect_struct_QuerySitesByCostCtr1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_QuerySitesByCostCtr_ctr1,0);
 
        return offset;
 }
@@ -17199,7 +17199,7 @@ drsuapi_dissect_QuerySitesByCostCtr(tvbuff_t *tvb _U_, int offset _U_, packet_in
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_QuerySitesByCostCtr_val1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_QuerySitesByCostCtr_ctr1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -17327,9 +17327,9 @@ drsuapi_dissect_struct_QuerySitesByCostRequest1(tvbuff_t *tvb _U_, int offset _U
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_QuerySitesByCostRequest_val1_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+drsuapi_dissect_element_QuerySitesByCostRequest_req1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_QuerySitesByCostRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_QuerySitesByCostRequest_val1_req1,0);
+       offset = drsuapi_dissect_struct_QuerySitesByCostRequest1(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_QuerySitesByCostRequest_req1,0);
 
        return offset;
 }
@@ -17353,7 +17353,7 @@ drsuapi_dissect_QuerySitesByCostRequest(tvbuff_t *tvb _U_, int offset _U_, packe
 
        switch(level) {
                case 1:
-                       offset = drsuapi_dissect_element_QuerySitesByCostRequest_val1_req1(tvb, offset, pinfo, tree, drep);
+                       offset = drsuapi_dissect_element_QuerySitesByCostRequest_req1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -19353,18 +19353,16 @@ void proto_register_dcerpc_drsuapi(void)
          { "U7", "drsuapi.drsuapi_DsReplica06.u7", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaUpdateRefsRequest1_dest_dsa_guid,
          { "Dest Dsa Guid", "drsuapi.drsuapi_DsReplicaUpdateRefsRequest1.dest_dsa_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_3_ctr3,
-         { "Ctr3", "drsuapi.drsuapi_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_3.ctr3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfoCtr3_count,
          { "Count", "drsuapi.drsuapi_DsGetDCInfoCtr3.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GET_REPL_INFO,
          { "Drsuapi Supported Extension Get Repl Info", "drsuapi.drsuapi_SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_GET_REPL_INFO", FT_BOOLEAN, 32, TFS(&drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GET_REPL_INFO_tfs), ( 0x00004000 ), NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaAddRequest_val1_req1,
-         { "Req1", "drsuapi.drsuapi_DsReplicaAddRequest_val1.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaOp_serial_num,
          { "Serial Num", "drsuapi.drsuapi_DsReplicaOp.serial_num", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaGetInfoRequest1_object_dn,
          { "Object Dn", "drsuapi.drsuapi_DsReplicaGetInfoRequest1.object_dn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaInfo_neighbours,
+         { "Neighbours", "drsuapi.drsuapi_DsReplicaInfo.neighbours", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsBindInfoCtr___ndr_length,
          { "  Ndr Length", "drsuapi.drsuapi_DsBindInfoCtr.__ndr_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjMetaData2Ctr_enumeration_context,
@@ -19373,8 +19371,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Drsuapi Drs Sync Urgent", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_SYNC_URGENT", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_SYNC_URGENT_tfs), ( 0x00080000 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_DISABLE_AUTO_SYNC,
          { "Drsuapi Drs Disable Auto Sync", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_DISABLE_AUTO_SYNC", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_DISABLE_AUTO_SYNC_tfs), ( 0x04000000 ), NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsAddEntry_ErrData_val1_v1,
-         { "V1", "drsuapi.drsuapi_DsAddEntry_ErrData_val1.v1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaGetInfo_info_type,
          { "Info Type", "drsuapi.drsuapi_DsReplicaGetInfo.info_type", FT_UINT32, BASE_DEC, VALS(drsuapi_drsuapi_DsReplicaInfoType_vals), 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaNeighbour_transport_obj_guid,
@@ -19405,8 +19401,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "U4", "drsuapi.drsuapi_DsReplica06.u4", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetMembershipsRequest1_flags,
          { "Flags", "drsuapi.drsuapi_DsGetMembershipsRequest1.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaUpdateRefsRequest_val1_req1,
-         { "Req1", "drsuapi.drsuapi_DsReplicaUpdateRefsRequest_val1.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaOIDMapping_oid,
          { "Oid", "drsuapi.drsuapi_DsReplicaOIDMapping.oid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_werror,
@@ -19443,8 +19437,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Reserved2", "drsuapi.drsuapi_DsReplicaCursorCtrEx.reserved2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaCursor2CtrEx_reserved1,
          { "Reserved1", "drsuapi.drsuapi_DsReplicaCursor2CtrEx.reserved1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetDCInfoRequest_val1_req1,
-         { "Req1", "drsuapi.drsuapi_DsGetDCInfoRequest_val1.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest5_max_object_count,
          { "Max Object Count", "drsuapi.drsuapi_DsGetNCChangesRequest5.max_object_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaUpdateRefs_level,
@@ -19457,8 +19449,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Source Dsa Address", "drsuapi.drsuapi_DsReplicaDelRequest1.source_dsa_address", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6,
          { "Drsuapi Supported Extension Getchgreq V6", "drsuapi.drsuapi_SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6", FT_BOOLEAN, 32, TFS(&drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6_tfs), ( 0x00400000 ), NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaGetInfoRequest_valDRSUAPI_DS_REPLICA_GET_INFO_req1,
-         { "Req1", "drsuapi.drsuapi_DsReplicaGetInfoRequest_valDRSUAPI_DS_REPLICA_GET_INFO.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaCursor3_highest_usn,
          { "Highest Usn", "drsuapi.drsuapi_DsReplicaCursor3.highest_usn", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAttrValMetaDataCtr_array,
@@ -19469,14 +19459,14 @@ void proto_register_dcerpc_drsuapi(void)
          { "Naming Context Obj Guid", "drsuapi.drsuapi_DsReplicaNeighbour.naming_context_obj_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaCursor3Ctr_enumeration_context,
          { "Enumeration Context", "drsuapi.drsuapi_DsReplicaCursor3Ctr.enumeration_context", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetMemberships2Ctr_val1_ctr1,
-         { "Ctr1", "drsuapi.drsuapi_DsGetMemberships2Ctr_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_Referr_V1_refer,
          { "Refer", "drsuapi.drsuapi_DsAddEntryErrorInfo_Referr_V1.refer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntry_req,
          { "Req", "drsuapi.drsuapi_DsAddEntry.req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsBindInfoCtr_length,
          { "Length", "drsuapi.drsuapi_DsBindInfoCtr.length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsBindInfo_info24,
+         { "Info24", "drsuapi.drsuapi_DsBindInfo.info24", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsExecuteKCC1_taskID,
          { "Taskid", "drsuapi.drsuapi_DsExecuteKCC1.taskID", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntry_level,
@@ -19489,8 +19479,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Drsuapi Supported Extension Reserved Part2", "drsuapi.drsuapi_SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_RESERVED_PART2", FT_BOOLEAN, 32, TFS(&drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_RESERVED_PART2_tfs), ( 0x40000000 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest8_mapping_ctr,
          { "Mapping Ctr", "drsuapi.drsuapi_DsGetNCChangesRequest8.mapping_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_val6DRSUAPI_COMPRESSION_TYPE_MSZIP16_mszip6,
-         { "Mszip6", "drsuapi.drsuapi_DsGetNCChangesCompressedCtr_val6DRSUAPI_COMPRESSION_TYPE_MSZIP16.mszip6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetMemberships_ctr,
          { "Ctr", "drsuapi.drsuapi_DsGetMemberships.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V5,
@@ -19501,22 +19489,22 @@ void proto_register_dcerpc_drsuapi(void)
          { "Reserved Usn", "drsuapi.drsuapi_DsReplicaHighWaterMark.reserved_usn", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetMemberships2Request1_num_req,
          { "Num Req", "drsuapi.drsuapi_DsGetMemberships2Request1.num_req", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val6_update_err,
-         { "Update Err", "drsuapi.drsuapi_DsAddEntryErrorInfo_val6.update_err", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetMembershipsRequest1_domain,
          { "Domain", "drsuapi.drsuapi_DsGetMembershipsRequest1.domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjMetaDataCtr_count,
          { "Count", "drsuapi.drsuapi_DsReplicaObjMetaDataCtr.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesMSZIPCtr1_ts_,
          { "Subcontext length", "drsuapi.drsuapi_DsGetNCChangesMSZIPCtr1.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetDCInfoCtr_valDRSUAPI_DC_CONNECTION_CTR_01_ctr01,
-         { "Ctr01", "drsuapi.drsuapi_DsGetDCInfoCtr_valDRSUAPI_DC_CONNECTION_CTR_01.ctr01", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetMemberships2_req,
          { "Req", "drsuapi.drsuapi_DsGetMemberships2.req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfoCtr2_count,
          { "Count", "drsuapi.drsuapi_DsGetDCInfoCtr2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaModRequest_req1,
+         { "Req1", "drsuapi.drsuapi_DsReplicaModRequest.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3Binary_dn,
          { "Dn", "drsuapi.drsuapi_DsReplicaObjectIdentifier3Binary.dn", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaGetInfoRequest_req1,
+         { "Req1", "drsuapi.drsuapi_DsReplicaGetInfoRequest.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsBindInfo28_site_guid,
          { "Site Guid", "drsuapi.drsuapi_DsBindInfo28.site_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjectFlags_DRSUAPI_DS_REPLICA_OBJECT_REMOTE_MODIFY,
@@ -19525,14 +19513,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Sids", "drsuapi.drsuapi_DsGetMembershipsCtr1.sids", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetMembershipsCtr1_group_attrs,
          { "Group Attrs", "drsuapi.drsuapi_DsGetMembershipsCtr1.group_attrs", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetNCChangesCtr_val7_ctr7,
-         { "Ctr7", "drsuapi.drsuapi_DsGetNCChangesCtr_val7.ctr7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest8_partial_attribute_set_ex,
          { "Partial Attribute Set Ex", "drsuapi.drsuapi_DsGetNCChangesRequest8.partial_attribute_set_ex", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA_attrvalmetadata,
-         { "Attrvalmetadata", "drsuapi.drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA.attrvalmetadata", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_val1DRSUAPI_COMPRESSION_TYPE_XPRESS16_xpress1,
-         { "Xpress1", "drsuapi.drsuapi_DsGetNCChangesCompressedCtr_val1DRSUAPI_COMPRESSION_TYPE_XPRESS16.xpress1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_CRITICAL_ONLY,
          { "Drsuapi Drs Critical Only", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_CRITICAL_ONLY", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_CRITICAL_ONLY_tfs), ( 0x00000400 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SecBufferDesc_buffers,
@@ -19553,6 +19535,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Server Guid", "drsuapi.drsuapi_DsGetDCInfo2.server_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntryErrorInfoX_dsid,
          { "Dsid", "drsuapi.drsuapi_DsAddEntryErrorInfoX.dsid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo_info1,
+         { "Info1", "drsuapi.drsuapi_DsGetNT4ChangeLogInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsWriteAccountSpnResult1_status,
          { "Status", "drsuapi.drsuapi_DsWriteAccountSpnResult1.status", FT_UINT32, BASE_DEC, VALS(WERR_errors), 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaCursor3Ctr_array,
@@ -19563,8 +19547,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "U1", "drsuapi.drsuapi_DsReplicaConnection04.u1", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplica06Ctr_array,
          { "Array", "drsuapi.drsuapi_DsReplica06Ctr.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetMembershipsRequest_val1_req1,
-         { "Req1", "drsuapi.drsuapi_DsGetMembershipsRequest_val1.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjectIdentifier2_sid,
          { "Sid", "drsuapi.drsuapi_DsReplicaObjectIdentifier2.sid", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_BASE,
@@ -19577,16 +19559,12 @@ void proto_register_dcerpc_drsuapi(void)
          { "Destination Dsa Guid", "drsuapi.drsuapi_DsGetNCChangesRequest5.destination_dsa_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_LOCAL_ONLY,
          { "Drsuapi Drs Local Only", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_LOCAL_ONLY", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_LOCAL_ONLY_tfs), ( 0x00001000 ), NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaAddRequest_val2_req2,
-         { "Req2", "drsuapi.drsuapi_DsReplicaAddRequest_val2.req2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaCursor3_source_dsa_obj_dn,
          { "Source Dsa Obj Dn", "drsuapi.drsuapi_DsReplicaCursor3.source_dsa_obj_dn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAddRequest1_source_dsa_address,
          { "Source Dsa Address", "drsuapi.drsuapi_DsReplicaAddRequest1.source_dsa_address", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3_sid,
          { "Sid", "drsuapi.drsuapi_DsReplicaObjectIdentifier3.sid", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA_objmetadata,
-         { "Objmetadata", "drsuapi.drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA.objmetadata", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaCursor_source_dsa_invocation_id,
          { "Source Dsa Invocation Id", "drsuapi.drsuapi_DsReplicaCursor.source_dsa_invocation_id", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaModRequest1_modify_fields,
@@ -19595,6 +19573,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Max Ndr Size", "drsuapi.drsuapi_DsGetNCChangesRequest8.max_ndr_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest8_partial_attribute_set,
          { "Partial Attribute Set", "drsuapi.drsuapi_DsGetNCChangesRequest8.partial_attribute_set", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetMemberships2Request_req1,
+         { "Req1", "drsuapi.drsuapi_DsGetMemberships2Request.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo3_site_name,
          { "Site Name", "drsuapi.drsuapi_DsGetDCInfo3.site_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjMetaData2_local_usn,
@@ -19613,8 +19593,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Flags Reserved", "drsuapi.drsuapi_QuerySitesByCostCtr1.flags_reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SecBuffer_buf_type,
          { "Buf Type", "drsuapi.drsuapi_SecBuffer.buf_type", FT_UINT32, BASE_DEC, VALS(drsuapi_drsuapi_SecBufferType_vals), 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_1_ctr1,
-         { "Ctr1", "drsuapi.drsuapi_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsUpdate_DRSUAPI_DRS_UPDATE_ADDRESS,
          { "Drsuapi Drs Update Address", "drsuapi.drsuapi_DrsUpdate.DRSUAPI_DRS_UPDATE_ADDRESS", FT_BOOLEAN, 32, TFS(&drsuapi_DrsUpdate_DRSUAPI_DRS_UPDATE_ADDRESS_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaConnection04Ctr_count,
@@ -19625,14 +19603,14 @@ void proto_register_dcerpc_drsuapi(void)
          { "Uptodateness Vector", "drsuapi.drsuapi_DsGetNCChangesCtr1.uptodateness_vector", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaCursor2_last_sync_success,
          { "Last Sync Success", "drsuapi.drsuapi_DsReplicaCursor2.last_sync_success", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaInfo_cursors2,
+         { "Cursors2", "drsuapi.drsuapi_DsReplicaInfo.cursors2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaNeighbour_tmp_highest_usn,
          { "Tmp Highest Usn", "drsuapi.drsuapi_DsReplicaNeighbour.tmp_highest_usn", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaMod_req,
          { "Req", "drsuapi.drsuapi_DsReplicaMod.req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaSync_level,
          { "Level", "drsuapi.drsuapi_DsReplicaSync.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val5_service_err,
-         { "Service Err", "drsuapi.drsuapi_DsAddEntryErrorInfo_val5.service_err", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAdd_req,
          { "Req", "drsuapi.drsuapi_DsReplicaAdd.req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsCrackNames_bind_handle,
@@ -19641,8 +19619,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Level", "drsuapi.drsuapi_DsRemoveDSServer.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjMetaData_local_usn,
          { "Local Usn", "drsuapi.drsuapi_DsReplicaObjMetaData.local_usn", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaDelRequest_val1_req1,
-         { "Req1", "drsuapi.drsuapi_DsReplicaDelRequest_val1.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_QuerySitesByCost_req,
          { "Req", "drsuapi.drsuapi_QuerySitesByCost.req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaOp_remote_dsa_address,
@@ -19663,12 +19639,10 @@ void proto_register_dcerpc_drsuapi(void)
          { "Req", "drsuapi.drsuapi_DsRemoveDSServer.req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjMetaData2_attribute_name,
          { "Attribute Name", "drsuapi.drsuapi_DsReplicaObjMetaData2.attribute_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val4_security_err,
-         { "Security Err", "drsuapi.drsuapi_DsAddEntryErrorInfo_val4.security_err", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsRemoveDSServerRequest_val1_req1,
-         { "Req1", "drsuapi.drsuapi_DsRemoveDSServerRequest_val1.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3Binary_binary,
          { "Binary", "drsuapi.drsuapi_DsReplicaObjectIdentifier3Binary.binary", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetNCChangesRequest_req10,
+         { "Req10", "drsuapi.drsuapi_DsGetNCChangesRequest.req10", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo2_is_enabled,
          { "Is Enabled", "drsuapi.drsuapi_DsGetDCInfo2.is_enabled", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesCtr6_source_dsa_guid,
@@ -19677,18 +19651,12 @@ void proto_register_dcerpc_drsuapi(void)
          { "Length", "drsuapi.drsuapi_DsReplicaOID.length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjectIdentifier___ndr_size_dn,
          { "  Ndr Size Dn", "drsuapi.drsuapi_DsReplicaObjectIdentifier.__ndr_size_dn", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_NEIGHBORS_neighbours,
-         { "Neighbours", "drsuapi.drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_NEIGHBORS.neighbours", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntry_AttrErrListItem_V1_err_data,
          { "Err Data", "drsuapi.drsuapi_DsAddEntry_AttrErrListItem_V1.err_data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsSiteCostInfo_error_code,
          { "Error Code", "drsuapi.drsuapi_DsSiteCostInfo.error_code", FT_UINT32, BASE_DEC, VALS(WERR_errors), 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaGetInfoRequest_valDRSUAPI_DS_REPLICA_GET_INFO2_req2,
-         { "Req2", "drsuapi.drsuapi_DsReplicaGetInfoRequest_valDRSUAPI_DS_REPLICA_GET_INFO2.req2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntry_AttrErr_V1_extended_err,
          { "Extended Err", "drsuapi.drsuapi_DsAddEntry_AttrErr_V1.extended_err", FT_UINT32, BASE_DEC, VALS(WERR_errors), 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2_attrvalmetadata2,
-         { "Attrvalmetadata2", "drsuapi.drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2.attrvalmetadata2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaNeighbourCtr_array,
          { "Array", "drsuapi.drsuapi_DsReplicaNeighbourCtr.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntryCtr3_objects,
@@ -19697,6 +19665,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Builtin Serial Number", "drsuapi.drsuapi_DsGetNT4ChangeLogInfo1.builtin_serial_number", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo1_is_enabled,
          { "Is Enabled", "drsuapi.drsuapi_DsGetDCInfo1.is_enabled", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_referral_err,
+         { "Referral Err", "drsuapi.drsuapi_DsAddEntryErrorInfo.referral_err", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest10_highwatermark,
          { "Highwatermark", "drsuapi.drsuapi_DsGetNCChangesRequest10.highwatermark", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_SYNC_ALL,
@@ -19709,8 +19679,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Array", "drsuapi.drsuapi_DsReplicaAttrValMetaData2Ctr.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaKccDsaFailure_last_result,
          { "Last Result", "drsuapi.drsuapi_DsReplicaKccDsaFailure.last_result", FT_UINT32, BASE_DEC, VALS(WERR_errors), 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetNCChangesCtr_val1_ctr1,
-         { "Ctr1", "drsuapi.drsuapi_DsGetNCChangesCtr_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntry_RefErrListItem_V1_id_target,
          { "Id Target", "drsuapi.drsuapi_DsAddEntry_RefErrListItem_V1.id_target", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesMSZIPCtr6_ts_,
@@ -19725,8 +19693,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Schedule", "drsuapi.drsuapi_DsReplicaModRequest1.schedule", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest8_source_dsa_invocation_id,
          { "Source Dsa Invocation Id", "drsuapi.drsuapi_DsGetNCChangesRequest8.source_dsa_invocation_id", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetMembershipsCtr_val1_ctr1,
-         { "Ctr1", "drsuapi.drsuapi_DsGetMembershipsCtr_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaLinkedAttribute_value,
          { "Value", "drsuapi.drsuapi_DsReplicaLinkedAttribute.value", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntry_level_out,
@@ -19741,6 +19707,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Level", "drsuapi.drsuapi_DsGetMemberships2.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAttributeCtr_attributes,
          { "Attributes", "drsuapi.drsuapi_DsReplicaAttributeCtr.attributes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaInfo_repsto,
+         { "Repsto", "drsuapi.drsuapi_DsReplicaInfo.repsto", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntryErrorInfoX_extended_err,
          { "Extended Err", "drsuapi.drsuapi_DsAddEntryErrorInfoX.extended_err", FT_UINT32, BASE_DEC, VALS(WERR_errors), 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAttrValMetaData_object_dn,
@@ -19757,8 +19725,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Highest Usn", "drsuapi.drsuapi_DsReplicaHighWaterMark.highest_usn", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaKccDsaFailure_num_failures,
          { "Num Failures", "drsuapi.drsuapi_DsReplicaKccDsaFailure.num_failures", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsBindInfo_val48_info48_,
-         { "Subcontext length", "drsuapi.drsuapi_DsBindInfo_val48.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsCrackNames_level,
          { "Level", "drsuapi.drsuapi_DsCrackNames.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjMetaData2_originating_usn,
@@ -19773,6 +19739,10 @@ void proto_register_dcerpc_drsuapi(void)
          { "Drsuapi Drs Nongc Ro Rep", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_NONGC_RO_REP", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_NONGC_RO_REP_tfs), ( 0x00002000 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfoRequest1_level,
          { "Level", "drsuapi.drsuapi_DsGetDCInfoRequest1.level", FT_UINT32, BASE_DEC, VALS(drsuapi_drsuapi_DsGetDCInfoCtrLevels_vals), 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaInfo_connectfailures,
+         { "Connectfailures", "drsuapi.drsuapi_DsReplicaInfo.connectfailures", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsBindInfo_info24_,
+         { "Subcontext length", "drsuapi.drsuapi_DsBindInfo.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_WRIT_REP,
          { "Drsuapi Drs Writ Rep", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_WRIT_REP", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_WRIT_REP_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaDelRequest1_options,
@@ -19781,20 +19751,18 @@ void proto_register_dcerpc_drsuapi(void)
          { "Level", "drsuapi.drsuapi_DsReplicaAdd.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_CRYPTO_BIND,
          { "Drsuapi Supported Extension Crypto Bind", "drsuapi.drsuapi_SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_CRYPTO_BIND", FT_BOOLEAN, 32, TFS(&drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_CRYPTO_BIND_tfs), ( 0x00002000 ), NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetMemberships2Request_val1_req1,
-         { "Req1", "drsuapi.drsuapi_DsGetMemberships2Request_val1.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo2_computer_guid,
          { "Computer Guid", "drsuapi.drsuapi_DsGetDCInfo2.computer_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES_connectfailures,
-         { "Connectfailures", "drsuapi.drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES.connectfailures", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetNCChangesCtr_ctr6,
+         { "Ctr6", "drsuapi.drsuapi_DsGetNCChangesCtr.ctr6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo1_server_dn,
          { "Server Dn", "drsuapi.drsuapi_DsGetDCInfo1.server_dn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaModRequest1_source_dra,
          { "Source Dra", "drsuapi.drsuapi_DsReplicaModRequest1.source_dra", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_service_err,
+         { "Service Err", "drsuapi.drsuapi_DsAddEntryErrorInfo.service_err", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_QuerySitesByCostCtr1_num_info,
          { "Num Info", "drsuapi.drsuapi_QuerySitesByCostCtr1.num_info", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetNCChangesRequest_val10_req10,
-         { "Req10", "drsuapi.drsuapi_DsGetNCChangesRequest_val10.req10", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3Binary_sid,
          { "Sid", "drsuapi.drsuapi_DsReplicaObjectIdentifier3Binary.sid", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaOp_remote_dsa_obj_dn,
@@ -19805,8 +19773,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Transport Obj Dn", "drsuapi.drsuapi_DsReplicaNeighbour.transport_obj_dn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo2_ntds_guid,
          { "Ntds Guid", "drsuapi.drsuapi_DsGetDCInfo2.ntds_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val7_system_err,
-         { "System Err", "drsuapi.drsuapi_DsAddEntryErrorInfo_val7.system_err", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsNameRequest1_names,
          { "Names", "drsuapi.drsuapi_DsNameRequest1.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaDel_level,
@@ -19831,10 +19797,14 @@ void proto_register_dcerpc_drsuapi(void)
          { "Dsid", "drsuapi.drsuapi_DsAddEntry_AttrErr_V1.dsid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesCtr6_old_highwatermark,
          { "Old Highwatermark", "drsuapi.drsuapi_DsGetNCChangesCtr6.old_highwatermark", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetDCInfoCtr_ctr2,
+         { "Ctr2", "drsuapi.drsuapi_DsGetDCInfoCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_SYNC_PAS,
          { "Drsuapi Drs Sync Pas", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_SYNC_PAS", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_SYNC_PAS_tfs), ( 0x40000000 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesCtr6_extended_ret,
          { "Extended Ret", "drsuapi.drsuapi_DsGetNCChangesCtr6.extended_ret", FT_UINT32, BASE_DEC, VALS(drsuapi_drsuapi_DsExtendedError_vals), 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaInfo_pendingops,
+         { "Pendingops", "drsuapi.drsuapi_DsReplicaInfo.pendingops", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaCursor2CtrEx_version,
          { "Version", "drsuapi.drsuapi_DsReplicaCursor2CtrEx.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY_V2,
@@ -19843,10 +19813,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Compressed Length", "drsuapi.drsuapi_DsGetNCChangesXPRESSCtr1.compressed_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsBind_bind_guid,
          { "Bind Guid", "drsuapi.drsuapi_DsBind.bind_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_QuerySitesByCostRequest_val1_req1,
-         { "Req1", "drsuapi.drsuapi_QuerySitesByCostRequest_val1.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_val1DRSUAPI_COMPRESSION_TYPE_MSZIP16_mszip1,
-         { "Mszip1", "drsuapi.drsuapi_DsGetNCChangesCompressedCtr_val1DRSUAPI_COMPRESSION_TYPE_MSZIP16.mszip1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesCtr6_source_dsa_invocation_id,
          { "Source Dsa Invocation Id", "drsuapi.drsuapi_DsGetNCChangesCtr6.source_dsa_invocation_id", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfoCtr3_array,
@@ -19855,12 +19821,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Mszip1", "drsuapi.drsuapi_DsGetNCChangesCtr2.mszip1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_REF_OK,
          { "Drsuapi Drs Ref Ok", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_REF_OK", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_REF_OK_tfs), ( 0x00004000 ), NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsAddEntryRequest_val3_req3,
-         { "Req3", "drsuapi.drsuapi_DsAddEntryRequest_val3.req3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest10_max_ndr_size,
          { "Max Ndr Size", "drsuapi.drsuapi_DsGetNCChangesRequest10.max_ndr_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo_val1_info1,
-         { "Info1", "drsuapi.drsuapi_DsGetNT4ChangeLogInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaGetInfo_req,
          { "Req", "drsuapi.drsuapi_DsReplicaGetInfo.req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2Ctr_count,
@@ -19877,8 +19839,10 @@ void proto_register_dcerpc_drsuapi(void)
          { "Count", "drsuapi.drsuapi_DsReplicaCursorCtrEx.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntryCtr2_dir_err,
          { "Dir Err", "drsuapi.drsuapi_DsAddEntryCtr2.dir_err", FT_UINT32, BASE_DEC, VALS(drsuapi_drsuapi_DsAddEntry_DirErr_vals), 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_UPTODATE_VECTOR_V1_udv1,
-         { "Udv1", "drsuapi.drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_UPTODATE_VECTOR_V1.udv1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetNCChangesCtr_ctr1,
+         { "Ctr1", "drsuapi.drsuapi_DsGetNCChangesCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_security_err,
+         { "Security Err", "drsuapi.drsuapi_DsAddEntryErrorInfo.security_err", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_QuerySitesByCost_level_out,
          { "Level Out", "drsuapi.drsuapi_QuerySitesByCost.level_out", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_DEL_REF,
@@ -19887,8 +19851,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Is Pdc", "drsuapi.drsuapi_DsGetDCInfo3.is_pdc", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsRemoveDSServer_res,
          { "Res", "drsuapi.drsuapi_DsRemoveDSServer.res", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsWriteAccountSpnRequest_val1_req1,
-         { "Req1", "drsuapi.drsuapi_DsWriteAccountSpnRequest_val1.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_PREEMPTED,
          { "Drsuapi Drs Preempted", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_PREEMPTED", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_PREEMPTED_tfs), ( 0x01000000 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsBindInfo24_pid,
@@ -19897,6 +19859,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Array", "drsuapi.drsuapi_DsGetDCInfoCtr2.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3Binary___ndr_size_binary,
          { "  Ndr Size Binary", "drsuapi.drsuapi_DsReplicaObjectIdentifier3Binary.__ndr_size_binary", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_update_err,
+         { "Update Err", "drsuapi.drsuapi_DsAddEntryErrorInfo.update_err", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_DISABLE_PERIODIC_SYNC,
          { "Drsuapi Drs Disable Periodic Sync", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_DISABLE_PERIODIC_SYNC", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_DISABLE_PERIODIC_SYNC_tfs), ( 0x08000000 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo2_ntds_dn,
@@ -19905,8 +19869,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Version", "drsuapi.drsuapi_DsReplicaObjMetaData.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntry_RefErrListItem_V1_ref_type,
          { "Ref Type", "drsuapi.drsuapi_DsAddEntry_RefErrListItem_V1.ref_type", FT_UINT16, BASE_DEC, VALS(drsuapi_drsuapi_DsAddEntry_RefType_vals), 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES_linkfailures,
-         { "Linkfailures", "drsuapi.drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES.linkfailures", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplica06_u2,
          { "U2", "drsuapi.drsuapi_DsReplica06.u2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2_originating_change_time,
@@ -19921,14 +19883,10 @@ void proto_register_dcerpc_drsuapi(void)
          { "Reserved", "drsuapi.drsuapi_DsReplicaCursorCtr.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_SPECIAL_SECRET_PROCESSING,
          { "Drsuapi Drs Special Secret Processing", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_SPECIAL_SECRET_PROCESSING", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_SPECIAL_SECRET_PROCESSING_tfs), ( 0x00400000 ), NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetNCChangesRequest_val8_req8,
-         { "Req8", "drsuapi.drsuapi_DsGetNCChangesRequest_val8.req8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaDelRequest1_naming_context,
          { "Naming Context", "drsuapi.drsuapi_DsReplicaDelRequest1.naming_context", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SupportedExtensionsExt_DRSUAPI_SUPPORTED_EXTENSION_ADAM,
          { "Drsuapi Supported Extension Adam", "drsuapi.drsuapi_SupportedExtensionsExt.DRSUAPI_SUPPORTED_EXTENSION_ADAM", FT_BOOLEAN, 32, TFS(&drsuapi_SupportedExtensionsExt_DRSUAPI_SUPPORTED_EXTENSION_ADAM_tfs), ( 0x00000001 ), NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS2_cursors2,
-         { "Cursors2", "drsuapi.drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS2.cursors2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest8_highwatermark,
          { "Highwatermark", "drsuapi.drsuapi_DsGetNCChangesRequest8.highwatermark", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesCtr1_first_object,
@@ -19937,6 +19895,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Uptodateness Vector", "drsuapi.drsuapi_DsGetNCChangesCtr6.uptodateness_vector", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo2_site_name,
          { "Site Name", "drsuapi.drsuapi_DsGetDCInfo2.site_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetDCInfoRequest_req1,
+         { "Req1", "drsuapi.drsuapi_DsGetDCInfoRequest.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaUpdateRefsRequest1_naming_context,
          { "Naming Context", "drsuapi.drsuapi_DsReplicaUpdateRefsRequest1.naming_context", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesXPRESSCtr6_decompressed_length,
@@ -19949,8 +19909,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Buffer", "drsuapi.drsuapi_SecBuffer.buffer", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCConnection01_unknown2,
          { "Unknown2", "drsuapi.drsuapi_DsGetDCConnection01.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetNCChangesCtr_val2_ctr2,
-         { "Ctr2", "drsuapi.drsuapi_DsGetNCChangesCtr_val2.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_GET_ANC,
          { "Drsuapi Drs Get Anc", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_GET_ANC", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_GET_ANC_tfs), ( 0x00000800 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest8_extended_op,
@@ -19961,8 +19919,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "  Ndr Size Binary", "drsuapi.drsuapi_DsReplicaAttrValMetaData2.__ndr_size_binary", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntryErrorInfoX_problem,
          { "Problem", "drsuapi.drsuapi_DsAddEntryErrorInfoX.problem", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsBindInfo_val24_info24_,
-         { "Subcontext length", "drsuapi.drsuapi_DsBindInfo_val24.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_GETCHG_CHECK,
          { "Drsuapi Drs Getchg Check", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_GETCHG_CHECK", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_GETCHG_CHECK_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_Attr_V1_count,
@@ -19971,12 +19927,16 @@ void proto_register_dcerpc_drsuapi(void)
          { "First Object", "drsuapi.drsuapi_DsGetNCChangesCtr6.first_object", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaCursor2CtrEx_cursors,
          { "Cursors", "drsuapi.drsuapi_DsReplicaCursor2CtrEx.cursors", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaAddRequest_req1,
+         { "Req1", "drsuapi.drsuapi_DsReplicaAddRequest.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V01,
          { "Drsuapi Supported Extension Dcinfo V01", "drsuapi.drsuapi_SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V01", FT_BOOLEAN, 32, TFS(&drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V01_tfs), ( 0x00010000 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2_object_dn,
          { "Object Dn", "drsuapi.drsuapi_DsReplicaAttrValMetaData2.object_dn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDomainControllerInfo_level,
          { "Level", "drsuapi.drsuapi_DsGetDomainControllerInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsBindInfo_info28_,
+         { "Subcontext length", "drsuapi.drsuapi_DsBindInfo.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2_originating_usn,
          { "Originating Usn", "drsuapi.drsuapi_DsReplicaAttrValMetaData2.originating_usn", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntryCtr2_extended_err,
@@ -20003,6 +19963,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Count", "drsuapi.drsuapi_DsReplica06Ctr.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2_deleted,
          { "Deleted", "drsuapi.drsuapi_DsReplicaAttrValMetaData2.deleted", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsBindInfo_info48_,
+         { "Subcontext length", "drsuapi.drsuapi_DsBindInfo.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAttrValMetaDataCtr_count,
          { "Count", "drsuapi.drsuapi_DsReplicaAttrValMetaDataCtr.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaGetInfoRequest2_value_dn_str,
@@ -20013,8 +19975,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "  Ndr Size", "drsuapi.drsuapi_DsGetNCChangesCtr6.__ndr_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsExecuteKCCFlags_DRSUAPI_DS_EXECUTE_KCC_ASYNCHRONOUS_OPERATION,
          { "Drsuapi Ds Execute Kcc Asynchronous Operation", "drsuapi.drsuapi_DsExecuteKCCFlags.DRSUAPI_DS_EXECUTE_KCC_ASYNCHRONOUS_OPERATION", FT_BOOLEAN, 32, TFS(&drsuapi_DsExecuteKCCFlags_DRSUAPI_DS_EXECUTE_KCC_ASYNCHRONOUS_OPERATION_tfs), ( 0x00000001 ), NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val1_attr_err,
-         { "Attr Err", "drsuapi.drsuapi_DsAddEntryErrorInfo_val1.attr_err", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo2_computer_dn,
          { "Computer Dn", "drsuapi.drsuapi_DsGetDCInfo2.computer_dn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAddRequest2_source_dsa_address,
@@ -20023,8 +19983,12 @@ void proto_register_dcerpc_drsuapi(void)
          { "Originating Usn", "drsuapi.drsuapi_DsReplicaObjMetaData.originating_usn", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesXPRESSCtr1_ts_,
          { "Subcontext length", "drsuapi.drsuapi_DsGetNCChangesXPRESSCtr1.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_xpress1,
+         { "Xpress1", "drsuapi.drsuapi_DsGetNCChangesCompressedCtr.xpress1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesCtr6TS_ctr6_,
          { "Subcontext length", "drsuapi.drsuapi_DsGetNCChangesCtr6TS.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaInfo_attrvalmetadata2,
+         { "Attrvalmetadata2", "drsuapi.drsuapi_DsReplicaInfo.attrvalmetadata2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsBindInfoCtr_info,
          { "Info", "drsuapi.drsuapi_DsBindInfoCtr.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsaAddressListItem_V1_address,
@@ -20033,6 +19997,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Bind Handle", "drsuapi.drsuapi_DsReplicaDel.bind_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo3_is_gc,
          { "Is Gc", "drsuapi.drsuapi_DsGetDCInfo3.is_gc", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_mszip1,
+         { "Mszip1", "drsuapi.drsuapi_DsGetNCChangesCompressedCtr.mszip1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesCtr6_linked_attributes,
          { "Linked Attributes", "drsuapi.drsuapi_DsGetNCChangesCtr6.linked_attributes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplica06_str1,
@@ -20059,6 +20025,10 @@ void proto_register_dcerpc_drsuapi(void)
          { "Restart Data", "drsuapi.drsuapi_DsGetNT4ChangeLogInfo1.restart_data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_INIT_SYNC,
          { "Drsuapi Drs Init Sync", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_INIT_SYNC", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_INIT_SYNC_tfs), ( 0x00000020 ), NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsExecuteKCCRequest_ctr1,
+         { "Ctr1", "drsuapi.drsuapi_DsExecuteKCCRequest.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetMembershipsRequest_req1,
+         { "Req1", "drsuapi.drsuapi_DsGetMembershipsRequest.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsWriteAccountSpn_bind_handle,
          { "Bind Handle", "drsuapi.drsuapi_DsWriteAccountSpn.bind_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest10_partial_attribute_set,
@@ -20067,6 +20037,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Flags", "drsuapi.drsuapi_DsGetNT4ChangeLogRequest1.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_SYNC_REQUEUE,
          { "Drsuapi Drs Sync Requeue", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_SYNC_REQUEUE", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_SYNC_REQUEUE_tfs), ( 0x00040000 ), NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetDCInfoCtr_ctr1,
+         { "Ctr1", "drsuapi.drsuapi_DsGetDCInfoCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsBindInfo28_repl_epoch,
          { "Repl Epoch", "drsuapi.drsuapi_DsBindInfo28.repl_epoch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2_version,
@@ -20105,8 +20077,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Ctr", "drsuapi.drsuapi_DsAddEntry.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetMemberships_level,
          { "Level", "drsuapi.drsuapi_DsGetMemberships.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsBindInfo_valdefault_Fallback_,
-         { "Subcontext length", "drsuapi.drsuapi_DsBindInfo_valdefault.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaNeighbour_reserved,
          { "Reserved", "drsuapi.drsuapi_DsReplicaNeighbour.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaOp_nc_obj_guid,
@@ -20133,6 +20103,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Next", "drsuapi.drsuapi_DsAddEntry_RefErrListItem_V1.next", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAdd_bind_handle,
          { "Bind Handle", "drsuapi.drsuapi_DsReplicaAdd.bind_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaInfo_clientctx,
+         { "Clientctx", "drsuapi.drsuapi_DsReplicaInfo.clientctx", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjMetaData2_version,
          { "Version", "drsuapi.drsuapi_DsReplicaObjMetaData2.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_XPRESS_COMPRESS,
@@ -20161,8 +20133,12 @@ void proto_register_dcerpc_drsuapi(void)
          { "Priority", "drsuapi.drsuapi_DsReplicaOp.priority", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V2,
          { "Drsuapi Supported Extension Dcinfo V2", "drsuapi.drsuapi_SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V2", FT_BOOLEAN, 32, TFS(&drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V2_tfs), ( 0x00000800 ), NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsBindInfo_Fallback,
+         { "Fallback", "drsuapi.drsuapi_DsBindInfo.Fallback", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest10_source_dsa_invocation_id,
          { "Source Dsa Invocation Id", "drsuapi.drsuapi_DsGetNCChangesRequest10.source_dsa_invocation_id", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaInfo_cursors3,
+         { "Cursors3", "drsuapi.drsuapi_DsReplicaInfo.cursors3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo1_computer_dn,
          { "Computer Dn", "drsuapi.drsuapi_DsGetDCInfo1.computer_dn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest8_naming_context,
@@ -20171,6 +20147,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Ts", "drsuapi.drsuapi_DsGetNCChangesXPRESSCtr6.ts", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaCursor2CtrEx_reserved2,
          { "Reserved2", "drsuapi.drsuapi_DsReplicaCursor2CtrEx.reserved2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_system_err,
+         { "System Err", "drsuapi.drsuapi_DsAddEntryErrorInfo.system_err", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObject_flags,
          { "Flags", "drsuapi.drsuapi_DsReplicaObject.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNT4ChangeLogRequest1_preferred_maximum_length,
@@ -20179,6 +20157,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Restart Length", "drsuapi.drsuapi_DsGetNT4ChangeLogRequest1.restart_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo3_dns_name,
          { "Dns Name", "drsuapi.drsuapi_DsGetDCInfo3.dns_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetDCInfoCtr_ctr3,
+         { "Ctr3", "drsuapi.drsuapi_DsGetDCInfoCtr.ctr3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjMetaData2Ctr_array,
          { "Array", "drsuapi.drsuapi_DsReplicaObjMetaData2Ctr.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V1,
@@ -20187,6 +20167,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Count", "drsuapi.drsuapi_DsWriteAccountSpnRequest1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsUpdate_DRSUAPI_DRS_UPDATE_SCHEDULE,
          { "Drsuapi Drs Update Schedule", "drsuapi.drsuapi_DrsUpdate.DRSUAPI_DRS_UPDATE_SCHEDULE", FT_BOOLEAN, 32, TFS(&drsuapi_DrsUpdate_DRSUAPI_DRS_UPDATE_SCHEDULE_tfs), ( 0x00000004 ), NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaInfo_udv1,
+         { "Udv1", "drsuapi.drsuapi_DsReplicaInfo.udv1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo1_sam_serial_number,
          { "Sam Serial Number", "drsuapi.drsuapi_DsGetNT4ChangeLogInfo1.sam_serial_number", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaConnection04Ctr_reserved,
@@ -20201,10 +20183,12 @@ void proto_register_dcerpc_drsuapi(void)
          { "Last Sync Success", "drsuapi.drsuapi_DsReplicaCursor3.last_sync_success", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsRemoveDSServerRequest1_server_dn,
          { "Server Dn", "drsuapi.drsuapi_DsRemoveDSServerRequest1.server_dn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsNameCtr_ctr1,
+         { "Ctr1", "drsuapi.drsuapi_DsNameCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCConnectionCtr01_count,
          { "Count", "drsuapi.drsuapi_DsGetDCConnectionCtr01.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetNCChangesRequest_val5_req5,
-         { "Req5", "drsuapi.drsuapi_DsGetNCChangesRequest_val5.req5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetNCChangesRequest_req5,
+         { "Req5", "drsuapi.drsuapi_DsGetNCChangesRequest.req5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo2_is_pdc,
          { "Is Pdc", "drsuapi.drsuapi_DsGetDCInfo2.is_pdc", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaMetaData_version,
@@ -20213,30 +20197,40 @@ void proto_register_dcerpc_drsuapi(void)
          { "Is Nc Prefix", "drsuapi.drsuapi_DsReplicaObjectListItemEx.is_nc_prefix", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaOIDMapping_Ctr_num_mappings,
          { "Num Mappings", "drsuapi.drsuapi_DsReplicaOIDMapping_Ctr.num_mappings", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsAddEntryCtr_ctr2,
+         { "Ctr2", "drsuapi.drsuapi_DsAddEntryCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAttributeValue___ndr_size,
          { "  Ndr Size", "drsuapi.drsuapi_DsAttributeValue.__ndr_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaMod_level,
          { "Level", "drsuapi.drsuapi_DsReplicaMod.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_UPDATE_NOTIFICATION,
          { "Drsuapi Drs Update Notification", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_UPDATE_NOTIFICATION", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_UPDATE_NOTIFICATION_tfs), ( 0x00000002 ), NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaInfo_objmetadata2,
+         { "Objmetadata2", "drsuapi.drsuapi_DsReplicaInfo.objmetadata2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetMembershipsRequest1_type,
          { "Type", "drsuapi.drsuapi_DsGetMembershipsRequest1.type", FT_UINT32, BASE_DEC, VALS(drsuapi_drsuapi_DsMembershipType_vals), 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsBindInfo48_supported_extensions_ext,
          { "Supported Extensions Ext", "drsuapi.drsuapi_DsBindInfo48.supported_extensions_ext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaInfo_srvoutgoingcalls,
+         { "Srvoutgoingcalls", "drsuapi.drsuapi_DsReplicaInfo.srvoutgoingcalls", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaGetInfo_bind_handle,
          { "Bind Handle", "drsuapi.drsuapi_DsReplicaGetInfo.bind_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAttributeValue_blob,
          { "Blob", "drsuapi.drsuapi_DsAttributeValue.blob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_name_err,
+         { "Name Err", "drsuapi.drsuapi_DsAddEntryErrorInfo.name_err", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaKccDsaFailuresCtr_count,
          { "Count", "drsuapi.drsuapi_DsReplicaKccDsaFailuresCtr.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjectListItemEx_next_object,
          { "Next Object", "drsuapi.drsuapi_DsReplicaObjectListItemEx.next_object", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsAddEntryCtr_ctr3,
+         { "Ctr3", "drsuapi.drsuapi_DsAddEntryCtr.ctr3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsNameInfo1_dns_domain_name,
          { "Dns Domain Name", "drsuapi.drsuapi_DsNameInfo1.dns_domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsBindInfo_val28_info28,
-         { "Info28", "drsuapi.drsuapi_DsBindInfo_val28.info28", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2_originating_invocation_id,
          { "Originating Invocation Id", "drsuapi.drsuapi_DsReplicaAttrValMetaData2.originating_invocation_id", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaAddRequest_req2,
+         { "Req2", "drsuapi.drsuapi_DsReplicaAddRequest.req2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2Ctr_enumeration_context,
          { "Enumeration Context", "drsuapi.drsuapi_DsReplicaAttrValMetaData2Ctr.enumeration_context", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_SYNC_BYNAME,
@@ -20269,6 +20263,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Ntds Dn", "drsuapi.drsuapi_DsGetDCInfo3.ntds_dn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_INSTANCE_TYPE_NOT_REQ_ON_MOD,
          { "Drsuapi Supported Extension Instance Type Not Req On Mod", "drsuapi.drsuapi_SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_INSTANCE_TYPE_NOT_REQ_ON_MOD", FT_BOOLEAN, 32, TFS(&drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_INSTANCE_TYPE_NOT_REQ_ON_MOD_tfs), ( 0x00001000 ), NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsWriteAccountSpnResult_res1,
+         { "Res1", "drsuapi.drsuapi_DsWriteAccountSpnResult.res1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaCursorCtrEx_cursors,
          { "Cursors", "drsuapi.drsuapi_DsReplicaCursorCtrEx.cursors", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_QuerySitesByCost_ctr,
@@ -20317,16 +20313,14 @@ void proto_register_dcerpc_drsuapi(void)
          { "Is Rodc", "drsuapi.drsuapi_DsGetDCInfo3.is_rodc", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntryRequest3_first_object,
          { "First Object", "drsuapi.drsuapi_DsAddEntryRequest3.first_object", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsExecuteKCCRequest_val1_ctr1,
-         { "Ctr1", "drsuapi.drsuapi_DsExecuteKCCRequest_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaNeighbour_source_dsa_obj_guid,
          { "Source Dsa Obj Guid", "drsuapi.drsuapi_DsReplicaNeighbour.source_dsa_obj_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetNCChangesCtr_ctr7,
+         { "Ctr7", "drsuapi.drsuapi_DsGetNCChangesCtr.ctr7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsaAddressListItem_V1_next,
          { "Next", "drsuapi.drsuapi_DsaAddressListItem_V1.next", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaCursor2Ctr_array,
          { "Array", "drsuapi.drsuapi_DsReplicaCursor2Ctr.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CLIENT_CONTEXTS_clientctx,
-         { "Clientctx", "drsuapi.drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CLIENT_CONTEXTS.clientctx", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_Referr_V1_extended_err,
          { "Extended Err", "drsuapi.drsuapi_DsAddEntryErrorInfo_Referr_V1.extended_err", FT_UINT32, BASE_DEC, VALS(WERR_errors), 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_MAIL_REP,
@@ -20339,10 +20333,16 @@ void proto_register_dcerpc_drsuapi(void)
          { "Num Attids", "drsuapi.drsuapi_DsPartialAttributeSet.num_attids", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjMetaData_originating_change_time,
          { "Originating Change Time", "drsuapi.drsuapi_DsReplicaObjMetaData.originating_change_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaInfo_attrvalmetadata,
+         { "Attrvalmetadata", "drsuapi.drsuapi_DsReplicaInfo.attrvalmetadata", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3Binary___ndr_size_sid,
          { "  Ndr Size Sid", "drsuapi.drsuapi_DsReplicaObjectIdentifier3Binary.__ndr_size_sid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest10_uptodateness_vector,
          { "Uptodateness Vector", "drsuapi.drsuapi_DsGetNCChangesRequest10.uptodateness_vector", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsWriteAccountSpnRequest_req1,
+         { "Req1", "drsuapi.drsuapi_DsWriteAccountSpnRequest.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsRemoveDSServerRequest_req1,
+         { "Req1", "drsuapi.drsuapi_DsRemoveDSServerRequest.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest10_destination_dsa_guid,
          { "Destination Dsa Guid", "drsuapi.drsuapi_DsGetNCChangesRequest10.destination_dsa_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_POST_BETA3,
@@ -20357,10 +20357,10 @@ void proto_register_dcerpc_drsuapi(void)
          { "  Ndr Size Dn", "drsuapi.drsuapi_DsReplicaObjectIdentifier3.__ndr_size_dn", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesCtr6_drs_error,
          { "Drs Error", "drsuapi.drsuapi_DsGetNCChangesCtr6.drs_error", FT_UINT32, BASE_DEC, VALS(WERR_errors), 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaModRequest_val1_req1,
-         { "Req1", "drsuapi.drsuapi_DsReplicaModRequest_val1.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsExecuteKCCFlags_DRSUAPI_DS_EXECUTE_KCC_DAMPED,
          { "Drsuapi Ds Execute Kcc Damped", "drsuapi.drsuapi_DsExecuteKCCFlags.DRSUAPI_DS_EXECUTE_KCC_DAMPED", FT_BOOLEAN, 32, TFS(&drsuapi_DsExecuteKCCFlags_DRSUAPI_DS_EXECUTE_KCC_DAMPED_tfs), ( 0x00000002 ), NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaGetInfoRequest_req2,
+         { "Req2", "drsuapi.drsuapi_DsReplicaGetInfoRequest.req2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_Name_V1_extended_err,
          { "Extended Err", "drsuapi.drsuapi_DsAddEntryErrorInfo_Name_V1.extended_err", FT_UINT32, BASE_DEC, VALS(WERR_errors), 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsBindInfo48_supported_extensions,
@@ -20375,8 +20375,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Source Dsa Invocation Id", "drsuapi.drsuapi_DsReplicaCursor3.source_dsa_invocation_id", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaOp_operation_type,
          { "Operation Type", "drsuapi.drsuapi_DsReplicaOp.operation_type", FT_UINT1632, BASE_DEC, VALS(drsuapi_drsuapi_DsReplicaOpType_vals), 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsBindInfo_valdefault_Fallback,
-         { "Fallback", "drsuapi.drsuapi_DsBindInfo_valdefault.Fallback", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfoRequest1_domain_name,
          { "Domain Name", "drsuapi.drsuapi_DsGetDCInfoRequest1.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAddRequest1_schedule,
@@ -20395,10 +20393,14 @@ void proto_register_dcerpc_drsuapi(void)
          { "Err Ver", "drsuapi.drsuapi_DsAddEntryCtr3.err_ver", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_IGNORE_ERROR,
          { "Drsuapi Drs Ignore Error", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_IGNORE_ERROR", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_IGNORE_ERROR_tfs), ( 0x00000100 ), NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaInfo_linkfailures,
+         { "Linkfailures", "drsuapi.drsuapi_DsReplicaInfo.linkfailures", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaGetInfoRequest2_info_type,
          { "Info Type", "drsuapi.drsuapi_DsReplicaGetInfoRequest2.info_type", FT_UINT32, BASE_DEC, VALS(drsuapi_drsuapi_DsReplicaInfoType_vals), 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaHighWaterMark_tmp_highest_usn,
          { "Tmp Highest Usn", "drsuapi.drsuapi_DsReplicaHighWaterMark.tmp_highest_usn", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsBindInfo_info48,
+         { "Info48", "drsuapi.drsuapi_DsBindInfo.info48", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo1_is_pdc,
          { "Is Pdc", "drsuapi.drsuapi_DsGetDCInfo1.is_pdc", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_Name_V1_dsid,
@@ -20413,6 +20415,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Unknown1", "drsuapi.drsuapi_DsWriteAccountSpnRequest1.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaKccDsaFailure_dsa_obj_guid,
          { "Dsa Obj Guid", "drsuapi.drsuapi_DsReplicaKccDsaFailure.dsa_obj_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsBindInfo_info28,
+         { "Info28", "drsuapi.drsuapi_DsBindInfo.info28", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNT4ChangeLogFlags_DRSUAPI_NT4_CHANGELOG_GET_CHANGELOG,
          { "Drsuapi Nt4 Changelog Get Changelog", "drsuapi.drsuapi_DsGetNT4ChangeLogFlags.DRSUAPI_NT4_CHANGELOG_GET_CHANGELOG", FT_BOOLEAN, 32, TFS(&drsuapi_DsGetNT4ChangeLogFlags_DRSUAPI_NT4_CHANGELOG_GET_CHANGELOG_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntryErrorInfoX_extended_data,
@@ -20427,6 +20431,10 @@ void proto_register_dcerpc_drsuapi(void)
          { "Drsuapi Supported Extension Get Memberships2", "drsuapi.drsuapi_SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2", FT_BOOLEAN, 32, TFS(&drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2_tfs), ( 0x00200000 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesXPRESSCtr1_decompressed_length,
          { "Decompressed Length", "drsuapi.drsuapi_DsGetNCChangesXPRESSCtr1.decompressed_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaInfo_cursors,
+         { "Cursors", "drsuapi.drsuapi_DsReplicaInfo.cursors", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetNT4ChangeLogRequest_req1,
+         { "Req1", "drsuapi.drsuapi_DsGetNT4ChangeLogRequest.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_ASYNC_REPLICATION,
          { "Drsuapi Supported Extension Async Replication", "drsuapi.drsuapi_SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_ASYNC_REPLICATION", FT_BOOLEAN, 32, TFS(&drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_ASYNC_REPLICATION_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest10_mapping_ctr,
@@ -20435,18 +20443,16 @@ void proto_register_dcerpc_drsuapi(void)
          { "First Failure", "drsuapi.drsuapi_DsReplicaKccDsaFailure.first_failure", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest10_fsmo_info,
          { "Fsmo Info", "drsuapi.drsuapi_DsGetNCChangesRequest10.fsmo_info", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsBindInfo_Fallback_,
+         { "Subcontext length", "drsuapi.drsuapi_DsBindInfo.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntry_ErrData_V1_status,
          { "Status", "drsuapi.drsuapi_DsAddEntry_ErrData_V1.status", FT_UINT32, BASE_DEC, VALS(WERR_errors), 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNT4ChangeLog_req,
          { "Req", "drsuapi.drsuapi_DsGetNT4ChangeLog.req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsNameCtr_val1_ctr1,
-         { "Ctr1", "drsuapi.drsuapi_DsNameCtr_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaNeighbour_source_dsa_address,
          { "Source Dsa Address", "drsuapi.drsuapi_DsReplicaNeighbour.source_dsa_address", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAttrValMetaData2_created,
          { "Created", "drsuapi.drsuapi_DsReplicaAttrValMetaData2.created", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaSyncRequest_val1_req1,
-         { "Req1", "drsuapi.drsuapi_DsReplicaSyncRequest_val1.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_NEVER_NOTIFY,
          { "Drsuapi Drs Never Notify", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_NEVER_NOTIFY", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_NEVER_NOTIFY_tfs), ( 0x20000000 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsBindInfo24_supported_extensions,
@@ -20469,22 +20475,20 @@ void proto_register_dcerpc_drsuapi(void)
          { "Extended Data", "drsuapi.drsuapi_DsAddEntryCtr2.extended_data", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaGetInfo_level,
          { "Level", "drsuapi.drsuapi_DsReplicaGetInfo.level", FT_UINT32, BASE_DEC, VALS(drsuapi_drsuapi_DsReplicaGetInfoLevel_vals), 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS_cursors,
-         { "Cursors", "drsuapi.drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS.cursors", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_xpress6,
+         { "Xpress6", "drsuapi.drsuapi_DsGetNCChangesCompressedCtr.xpress6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaSyncRequest1_naming_context,
          { "Naming Context", "drsuapi.drsuapi_DsReplicaSyncRequest1.naming_context", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo2_netbios_name,
          { "Netbios Name", "drsuapi.drsuapi_DsGetDCInfo2.netbios_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplica06_u3,
          { "U3", "drsuapi.drsuapi_DsReplica06.u3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2_objmetadata2,
-         { "Objmetadata2", "drsuapi.drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2.objmetadata2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaLinkedAttribute_flags,
          { "Flags", "drsuapi.drsuapi_DsReplicaLinkedAttribute.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS3_cursors3,
-         { "Cursors3", "drsuapi.drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_CURSORS3.cursors3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsWriteAccountSpnRequest1_spn_names,
          { "Spn Names", "drsuapi.drsuapi_DsWriteAccountSpnRequest1.spn_names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_QuerySitesByCostRequest_req1,
+         { "Req1", "drsuapi.drsuapi_QuerySitesByCostRequest.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAttributeValueCtr_num_values,
          { "Num Values", "drsuapi.drsuapi_DsAttributeValueCtr.num_values", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsRemoveDSServerRequest1_commit,
@@ -20493,6 +20497,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Drsuapi Drs Sync Forced", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_SYNC_FORCED", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_SYNC_FORCED_tfs), ( 0x02000000 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjectListItemEx_parent_object_guid,
          { "Parent Object Guid", "drsuapi.drsuapi_DsReplicaObjectListItemEx.parent_object_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaDelRequest_req1,
+         { "Req1", "drsuapi.drsuapi_DsReplicaDelRequest.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDomainControllerInfo_ctr,
          { "Ctr", "drsuapi.drsuapi_DsGetDomainControllerInfo.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsBindInfo48_site_guid,
@@ -20523,6 +20529,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Options", "drsuapi.drsuapi_DsReplicaUpdateRefsRequest1.options", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsExecuteKCC_level,
          { "Level", "drsuapi.drsuapi_DsExecuteKCC.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetNCChangesCtr_ctr2,
+         { "Ctr2", "drsuapi.drsuapi_DsGetNCChangesCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCConnection01_client_account,
          { "Client Account", "drsuapi.drsuapi_DsGetDCConnection01.client_account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsCrackNames_level_out,
@@ -20557,14 +20565,14 @@ void proto_register_dcerpc_drsuapi(void)
          { "Restart Length", "drsuapi.drsuapi_DsGetNT4ChangeLogInfo1.restart_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntry_ErrData_V1_dir_err,
          { "Dir Err", "drsuapi.drsuapi_DsAddEntry_ErrData_V1.dir_err", FT_UINT32, BASE_DEC, VALS(drsuapi_drsuapi_DsAddEntry_DirErr_vals), 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val3_referral_err,
-         { "Referral Err", "drsuapi.drsuapi_DsAddEntryErrorInfo_val3.referral_err", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaGetInfo_info,
          { "Info", "drsuapi.drsuapi_DsReplicaGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntryCtr3_err_data,
          { "Err Data", "drsuapi.drsuapi_DsAddEntryCtr3.err_data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCConnection01_connection_time,
          { "Connection Time", "drsuapi.drsuapi_DsGetDCConnection01.connection_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_attr_err,
+         { "Attr Err", "drsuapi.drsuapi_DsAddEntryErrorInfo.attr_err", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_NameResOp_V1_next_rdn,
          { "Next Rdn", "drsuapi.drsuapi_NameResOp_V1.next_rdn", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest5_naming_context,
@@ -20575,8 +20583,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Count", "drsuapi.drsuapi_DsGetMembershipsRequest1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_NO_SOURCE,
          { "Drsuapi Drs No Source", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_NO_SOURCE", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_NO_SOURCE_tfs), ( 0x00008000 ), NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_SERVER_OUTGOING_CALLS_srvoutgoingcalls,
-         { "Srvoutgoingcalls", "drsuapi.drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_SERVER_OUTGOING_CALLS.srvoutgoingcalls", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo1_netbios_name,
          { "Netbios Name", "drsuapi.drsuapi_DsGetDCInfo1.netbios_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntry_RefErrListItem_V1_rdn_internal,
@@ -20589,6 +20595,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Guid", "drsuapi.drsuapi_DsReplicaObjectIdentifier.guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntry_AttrErr_V1_attr_val,
          { "Attr Val", "drsuapi.drsuapi_DsAddEntry_AttrErr_V1.attr_val", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaInfo_objmetadata,
+         { "Objmetadata", "drsuapi.drsuapi_DsReplicaInfo.objmetadata", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaConnection04_bind_time,
          { "Bind Time", "drsuapi.drsuapi_DsReplicaConnection04.bind_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNT4ChangeLogRequest1_restart_data,
@@ -20599,8 +20607,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "New Highwatermark", "drsuapi.drsuapi_DsGetNCChangesCtr6.new_highwatermark", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaMetaData_originating_invocation_id,
          { "Originating Invocation Id", "drsuapi.drsuapi_DsReplicaMetaData.originating_invocation_id", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsRemoveDSServerResult_val1_res1,
-         { "Res1", "drsuapi.drsuapi_DsRemoveDSServerResult_val1.res1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaCursorCtrEx_version,
          { "Version", "drsuapi.drsuapi_DsReplicaCursorCtrEx.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_NO_DISCARD,
@@ -20621,14 +20627,18 @@ void proto_register_dcerpc_drsuapi(void)
          { "Lsa Creation Time", "drsuapi.drsuapi_DsGetNT4ChangeLogInfo1.lsa_creation_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaUpdateRefs_req,
          { "Req", "drsuapi.drsuapi_DsReplicaUpdateRefs.req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsAddEntryErrorInfo_val2_name_err,
-         { "Name Err", "drsuapi.drsuapi_DsAddEntryErrorInfo_val2.name_err", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntry_RefErrListItem_V1_is_choice_set,
          { "Is Choice Set", "drsuapi.drsuapi_DsAddEntry_RefErrListItem_V1.is_choice_set", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesCtr6_linked_attributes_count,
          { "Linked Attributes Count", "drsuapi.drsuapi_DsGetNCChangesCtr6.linked_attributes_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsRemoveDSServerResult_res1,
+         { "Res1", "drsuapi.drsuapi_DsRemoveDSServerResult.res1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaSyncRequest_req1,
+         { "Req1", "drsuapi.drsuapi_DsReplicaSyncRequest.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsBindInfo48_config_dn_guid,
          { "Config Dn Guid", "drsuapi.drsuapi_DsBindInfo48.config_dn_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsAddEntryRequest_req2,
+         { "Req2", "drsuapi.drsuapi_DsAddEntryRequest.req2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest10_naming_context,
          { "Naming Context", "drsuapi.drsuapi_DsGetNCChangesRequest10.naming_context", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest5_max_ndr_size,
@@ -20645,6 +20655,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Num Sids", "drsuapi.drsuapi_DsGetMembershipsCtr1.num_sids", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesCtr7_type,
          { "Type", "drsuapi.drsuapi_DsGetNCChangesCtr7.type", FT_UINT1632, BASE_DEC, VALS(drsuapi_drsuapi_DsGetNCChangesCompressionType_vals), 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsAddEntry_ErrData_v1,
+         { "V1", "drsuapi.drsuapi_DsAddEntry_ErrData.v1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaConnection04_client_ip_address,
          { "Client Ip Address", "drsuapi.drsuapi_DsReplicaConnection04.client_ip_address", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_FULL_SYNC_IN_PROGRESS,
@@ -20671,8 +20683,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Fsmo Info", "drsuapi.drsuapi_DsGetNCChangesRequest5.fsmo_info", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaMetaData_originating_usn,
          { "Originating Usn", "drsuapi.drsuapi_DsReplicaMetaData.originating_usn", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetNCChangesCtr_val6_ctr6,
-         { "Ctr6", "drsuapi.drsuapi_DsGetNCChangesCtr_val6.ctr6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaModRequest1_source_dra_address,
          { "Source Dra Address", "drsuapi.drsuapi_DsReplicaModRequest1.source_dra_address", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo1_lsa_serial_number,
@@ -20705,8 +20715,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Client Ip Address", "drsuapi.drsuapi_DsGetDCConnection01.client_ip_address", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_QuerySitesByCost_level,
          { "Level", "drsuapi.drsuapi_QuerySitesByCost.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_val6DRSUAPI_COMPRESSION_TYPE_XPRESS16_xpress6,
-         { "Xpress6", "drsuapi.drsuapi_DsGetNCChangesCompressedCtr_val6DRSUAPI_COMPRESSION_TYPE_XPRESS16.xpress6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjMetaData2_originating_change_time,
          { "Originating Change Time", "drsuapi.drsuapi_DsReplicaObjMetaData2.originating_change_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsWriteAccountSpn_res,
@@ -20719,14 +20727,10 @@ void proto_register_dcerpc_drsuapi(void)
          { "Attribute Ctr", "drsuapi.drsuapi_DsReplicaObject.attribute_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesCtr6_naming_context,
          { "Naming Context", "drsuapi.drsuapi_DsGetNCChangesCtr6.naming_context", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsBindInfo_val28_info28_,
-         { "Subcontext length", "drsuapi.drsuapi_DsBindInfo_val28.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaGetInfoRequest2_attribute_name,
          { "Attribute Name", "drsuapi.drsuapi_DsReplicaGetInfoRequest2.attribute_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_QuerySitesByCostRequest1_num_req,
          { "Num Req", "drsuapi.drsuapi_QuerySitesByCostRequest1.num_req", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_PENDING_OPS_pendingops,
-         { "Pendingops", "drsuapi.drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_PENDING_OPS.pendingops", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaNeighbour_source_dsa_invocation_id,
          { "Source Dsa Invocation Id", "drsuapi.drsuapi_DsReplicaNeighbour.source_dsa_invocation_id", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaAddRequest2_options,
@@ -20757,18 +20761,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "  Ndr Size", "drsuapi.drsuapi_DsReplicaObjectIdentifier3Binary.__ndr_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_INIT_SYNC_NOW,
          { "Drsuapi Drs Init Sync Now", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_INIT_SYNC_NOW", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_INIT_SYNC_NOW_tfs), ( 0x00800000 ), NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsAddEntryCtr_val2_ctr2,
-         { "Ctr2", "drsuapi.drsuapi_DsAddEntryCtr_val2.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsAddEntryRequest_val2_req2,
-         { "Req2", "drsuapi.drsuapi_DsAddEntryRequest_val2.req2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_QuerySitesByCostCtr_val1_ctr1,
-         { "Ctr1", "drsuapi.drsuapi_QuerySitesByCostCtr_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_REPSTO_repsto,
-         { "Repsto", "drsuapi.drsuapi_DsReplicaInfo_valDRSUAPI_DS_REPLICA_INFO_REPSTO.repsto", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsBindInfo_val48_info48,
-         { "Info48", "drsuapi.drsuapi_DsBindInfo_val48.info48", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsAddEntryCtr_val3_ctr3,
-         { "Ctr3", "drsuapi.drsuapi_DsAddEntryCtr_val3.ctr3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsBindInfo28_pid,
          { "Pid", "drsuapi.drsuapi_DsBindInfo28.pid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SecBuffer_buf_size,
@@ -20779,6 +20771,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Remote Dsa Obj Guid", "drsuapi.drsuapi_DsReplicaOp.remote_dsa_obj_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesCtr6_nc_object_count,
          { "Nc Object Count", "drsuapi.drsuapi_DsGetNCChangesCtr6.nc_object_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetNCChangesRequest_req8,
+         { "Req8", "drsuapi.drsuapi_DsGetNCChangesRequest.req8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntry_ErrData_V1_info,
          { "Info", "drsuapi.drsuapi_DsAddEntry_ErrData_V1.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaGetInfoRequest1_source_dsa_guid,
@@ -20791,10 +20785,10 @@ void proto_register_dcerpc_drsuapi(void)
          { "Pid", "drsuapi.drsuapi_DsBindInfo48.pid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsRemoveDSServer_bind_handle,
          { "Bind Handle", "drsuapi.drsuapi_DsRemoveDSServer.bind_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsWriteAccountSpnResult_val1_res1,
-         { "Res1", "drsuapi.drsuapi_DsWriteAccountSpnResult_val1.res1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntry_RefErrListItem_V1_rdn_alias,
          { "Rdn Alias", "drsuapi.drsuapi_DsAddEntry_RefErrListItem_V1.rdn_alias", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetMemberships2Ctr_ctr1,
+         { "Ctr1", "drsuapi.drsuapi_DsGetMemberships2Ctr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNT4ChangeLogFlags_DRSUAPI_NT4_CHANGELOG_GET_SERIAL_NUMBERS,
          { "Drsuapi Nt4 Changelog Get Serial Numbers", "drsuapi.drsuapi_DsGetNT4ChangeLogFlags.DRSUAPI_NT4_CHANGELOG_GET_SERIAL_NUMBERS", FT_BOOLEAN, 32, TFS(&drsuapi_DsGetNT4ChangeLogFlags_DRSUAPI_NT4_CHANGELOG_GET_SERIAL_NUMBERS_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjectIdentifier_dn,
@@ -20807,12 +20801,12 @@ void proto_register_dcerpc_drsuapi(void)
          { "New Highwatermark", "drsuapi.drsuapi_DsGetNCChangesCtr1.new_highwatermark", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo1_log_length,
          { "Log Length", "drsuapi.drsuapi_DsGetNT4ChangeLogInfo1.log_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsNameRequest_val1_req1,
-         { "Req1", "drsuapi.drsuapi_DsNameRequest_val1.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNT4ChangeLogInfo1_status,
          { "Status", "drsuapi.drsuapi_DsGetNT4ChangeLogInfo1.status", FT_UINT32, BASE_DEC, VALS(NT_errors), 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_ASYNC_OP,
          { "Drsuapi Drs Async Op", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_ASYNC_OP", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_ASYNC_OP_tfs), ( 0x00000001 ), NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsAddEntryRequest_req3,
+         { "Req3", "drsuapi.drsuapi_DsAddEntryRequest.req3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesRequest8_max_object_count,
          { "Max Object Count", "drsuapi.drsuapi_DsGetNCChangesRequest8.max_object_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo2_site_dn,
@@ -20823,18 +20817,28 @@ void proto_register_dcerpc_drsuapi(void)
          { "Compressed Length", "drsuapi.drsuapi_DsGetNCChangesMSZIPCtr1.compressed_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT,
          { "Drsuapi Supported Extension Verify Object", "drsuapi.drsuapi_SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT", FT_BOOLEAN, 32, TFS(&drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT_tfs), ( 0x08000000 ), NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetNCChangesCompressedCtr_mszip6,
+         { "Mszip6", "drsuapi.drsuapi_DsGetNCChangesCompressedCtr.mszip6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaCursorCtrEx_reserved1,
          { "Reserved1", "drsuapi.drsuapi_DsReplicaCursorCtrEx.reserved1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfoCtr1_array,
          { "Array", "drsuapi.drsuapi_DsGetDCInfoCtr1.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsNameRequest_req1,
+         { "Req1", "drsuapi.drsuapi_DsNameRequest.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesCtr1TS_ctr1_,
          { "Subcontext length", "drsuapi.drsuapi_DsGetNCChangesCtr1TS.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetDCInfoCtr_ctr01,
+         { "Ctr01", "drsuapi.drsuapi_DsGetDCInfoCtr.ctr01", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaMod_bind_handle,
          { "Bind Handle", "drsuapi.drsuapi_DsReplicaMod.bind_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaGetInfoRequest2_source_dsa_guid,
          { "Source Dsa Guid", "drsuapi.drsuapi_DsReplicaGetInfoRequest2.source_dsa_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_QuerySitesByCostCtr_ctr1,
+         { "Ctr1", "drsuapi.drsuapi_QuerySitesByCostCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetMemberships2Ctr1_num_entries,
          { "Num Entries", "drsuapi.drsuapi_DsGetMemberships2Ctr1.num_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsReplicaUpdateRefsRequest_req1,
+         { "Req1", "drsuapi.drsuapi_DsReplicaUpdateRefsRequest.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetDCInfo3_site_dn,
          { "Site Dn", "drsuapi.drsuapi_DsGetDCInfo3.site_dn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_NameResOp_V1_unused_pad,
@@ -20861,10 +20865,8 @@ void proto_register_dcerpc_drsuapi(void)
          { "Site From", "drsuapi.drsuapi_QuerySitesByCostRequest1.site_from", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaMetaData_originating_change_time,
          { "Originating Change Time", "drsuapi.drsuapi_DsReplicaMetaData.originating_change_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsBindInfo_val24_info24,
-         { "Info24", "drsuapi.drsuapi_DsBindInfo_val24.info24", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_2_ctr2,
-         { "Ctr2", "drsuapi.drsuapi_DsGetDCInfoCtr_valDRSUAPI_DC_INFO_CTR_2.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_drsuapi_drsuapi_DsGetMembershipsCtr_ctr1,
+         { "Ctr1", "drsuapi.drsuapi_DsGetMembershipsCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DrsOptions_DRSUAPI_DRS_ADD_REF,
          { "Drsuapi Drs Add Ref", "drsuapi.drsuapi_DrsOptions.DRSUAPI_DRS_ADD_REF", FT_BOOLEAN, 32, TFS(&drsuapi_DrsOptions_DRSUAPI_DRS_ADD_REF_tfs), ( 0x00000004 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V7,
@@ -20873,8 +20875,6 @@ void proto_register_dcerpc_drsuapi(void)
          { "Last Success", "drsuapi.drsuapi_DsReplicaNeighbour.last_success", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChangesMSZIPCtr1_decompressed_length,
          { "Decompressed Length", "drsuapi.drsuapi_DsGetNCChangesMSZIPCtr1.decompressed_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_drsuapi_drsuapi_DsGetNT4ChangeLogRequest_val1_req1,
-         { "Req1", "drsuapi.drsuapi_DsGetNT4ChangeLogRequest_val1.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntryCtr2_dsid,
          { "Dsid", "drsuapi.drsuapi_DsAddEntryCtr2.dsid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetNCChanges_level,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-dssetup.c b/bin/default/librpc/gen_ndr/packet-dcerpc-dssetup.c
index c5a29533716d2212fa4190cac7b4dc51aa2cbd41..93c4952ed08255b35ff9655f9b2932079d85a4af 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-dssetup.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-dssetup.c
@@ -39,17 +39,17 @@ static gint ett_dssetup_dssetup_DsRoleInfo = -1;
 
 /* Header field declarations */
 static gint hf_dssetup_dssetup_DsRoleGetPrimaryDomainInformation_level = -1;
-static gint hf_dssetup_dssetup_DsRoleInfo_valDS_ROLE_BASIC_INFORMATION_basic = -1;
 static gint hf_dssetup_opnum = -1;
 static gint hf_dssetup_dssetup_DsRolePrimaryDomInfoBasic_flags = -1;
 static gint hf_dssetup_dssetup_DsRoleUpgradeStatus_previous_role = -1;
+static gint hf_dssetup_dssetup_DsRoleInfo_opstatus = -1;
 static gint hf_dssetup_dssetup_DsRolePrimaryDomInfoBasic_domain_guid = -1;
 static gint hf_dssetup_dssetup_DsRoleOpStatus_status = -1;
-static gint hf_dssetup_dssetup_DsRoleInfo_valDS_ROLE_UPGRADE_STATUS_upgrade = -1;
-static gint hf_dssetup_dssetup_DsRoleInfo_valDS_ROLE_OP_STATUS_opstatus = -1;
+static gint hf_dssetup_dssetup_DsRoleInfo_upgrade = -1;
 static gint hf_dssetup_dssetup_DsRoleGetPrimaryDomainInformation_info = -1;
 static gint hf_dssetup_dssetup_DsRoleFlags_DS_ROLE_UPGRADE_IN_PROGRESS = -1;
 static gint hf_dssetup_dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DOMAIN_GUID_PRESENT = -1;
+static gint hf_dssetup_dssetup_DsRoleInfo_basic = -1;
 static gint hf_dssetup_dssetup_DsRolePrimaryDomInfoBasic_role = -1;
 static gint hf_dssetup_dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DS_RUNNING = -1;
 static gint hf_dssetup_dssetup_DsRolePrimaryDomInfoBasic_dns_domain = -1;
@@ -129,9 +129,9 @@ const value_string dssetup_dssetup_DsRoleInfoLevel_vals[] = {
        { DS_ROLE_OP_STATUS, "DS_ROLE_OP_STATUS" },
 { 0, NULL }
 };
-static int dssetup_dissect_element_DsRoleInfo_valDS_ROLE_BASIC_INFORMATION_basic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dssetup_dissect_element_DsRoleInfo_valDS_ROLE_UPGRADE_STATUS_upgrade(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dssetup_dissect_element_DsRoleInfo_valDS_ROLE_OP_STATUS_opstatus(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dssetup_dissect_element_DsRoleInfo_basic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dssetup_dissect_element_DsRoleInfo_upgrade(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int dssetup_dissect_element_DsRoleInfo_opstatus(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dssetup_dissect_element_DsRoleGetPrimaryDomainInformation_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dssetup_dissect_element_DsRoleGetPrimaryDomainInformation_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dssetup_dissect_element_DsRoleGetPrimaryDomainInformation_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -546,25 +546,25 @@ dssetup_dissect_enum_DsRoleInfoLevel(tvbuff_t *tvb _U_, int offset _U_, packet_i
 /* IDL: } */
 
 static int
-dssetup_dissect_element_DsRoleInfo_valDS_ROLE_BASIC_INFORMATION_basic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dssetup_dissect_element_DsRoleInfo_basic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dssetup_dissect_struct_DsRolePrimaryDomInfoBasic(tvb,offset,pinfo,tree,drep,hf_dssetup_dssetup_DsRoleInfo_valDS_ROLE_BASIC_INFORMATION_basic,0);
+       offset = dssetup_dissect_struct_DsRolePrimaryDomInfoBasic(tvb,offset,pinfo,tree,drep,hf_dssetup_dssetup_DsRoleInfo_basic,0);
 
        return offset;
 }
 
 static int
-dssetup_dissect_element_DsRoleInfo_valDS_ROLE_UPGRADE_STATUS_upgrade(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dssetup_dissect_element_DsRoleInfo_upgrade(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dssetup_dissect_struct_DsRoleUpgradeStatus(tvb,offset,pinfo,tree,drep,hf_dssetup_dssetup_DsRoleInfo_valDS_ROLE_UPGRADE_STATUS_upgrade,0);
+       offset = dssetup_dissect_struct_DsRoleUpgradeStatus(tvb,offset,pinfo,tree,drep,hf_dssetup_dssetup_DsRoleInfo_upgrade,0);
 
        return offset;
 }
 
 static int
-dssetup_dissect_element_DsRoleInfo_valDS_ROLE_OP_STATUS_opstatus(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+dssetup_dissect_element_DsRoleInfo_opstatus(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dssetup_dissect_struct_DsRoleOpStatus(tvb,offset,pinfo,tree,drep,hf_dssetup_dssetup_DsRoleInfo_valDS_ROLE_OP_STATUS_opstatus,0);
+       offset = dssetup_dissect_struct_DsRoleOpStatus(tvb,offset,pinfo,tree,drep,hf_dssetup_dssetup_DsRoleInfo_opstatus,0);
 
        return offset;
 }
@@ -588,15 +588,15 @@ dssetup_dissect_DsRoleInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case DS_ROLE_BASIC_INFORMATION:
-                       offset = dssetup_dissect_element_DsRoleInfo_valDS_ROLE_BASIC_INFORMATION_basic(tvb, offset, pinfo, tree, drep);
+                       offset = dssetup_dissect_element_DsRoleInfo_basic(tvb, offset, pinfo, tree, drep);
                break;
 
                case DS_ROLE_UPGRADE_STATUS:
-                       offset = dssetup_dissect_element_DsRoleInfo_valDS_ROLE_UPGRADE_STATUS_upgrade(tvb, offset, pinfo, tree, drep);
+                       offset = dssetup_dissect_element_DsRoleInfo_upgrade(tvb, offset, pinfo, tree, drep);
                break;
 
                case DS_ROLE_OP_STATUS:
-                       offset = dssetup_dissect_element_DsRoleInfo_valDS_ROLE_OP_STATUS_opstatus(tvb, offset, pinfo, tree, drep);
+                       offset = dssetup_dissect_element_DsRoleInfo_opstatus(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -941,28 +941,28 @@ void proto_register_dcerpc_dssetup(void)
        static hf_register_info hf[] = {
        { &hf_dssetup_dssetup_DsRoleGetPrimaryDomainInformation_level,
          { "Level", "dssetup.dssetup_DsRoleGetPrimaryDomainInformation.level", FT_UINT1632, BASE_DEC, VALS(dssetup_dssetup_DsRoleInfoLevel_vals), 0, NULL, HFILL }},
-       { &hf_dssetup_dssetup_DsRoleInfo_valDS_ROLE_BASIC_INFORMATION_basic,
-         { "Basic", "dssetup.dssetup_DsRoleInfo_valDS_ROLE_BASIC_INFORMATION.basic", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dssetup_opnum,
          { "Operation", "dssetup.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_dssetup_dssetup_DsRolePrimaryDomInfoBasic_flags,
          { "Flags", "dssetup.dssetup_DsRolePrimaryDomInfoBasic.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_dssetup_dssetup_DsRoleUpgradeStatus_previous_role,
          { "Previous Role", "dssetup.dssetup_DsRoleUpgradeStatus.previous_role", FT_UINT1632, BASE_DEC, VALS(dssetup_dssetup_DsPrevious_vals), 0, NULL, HFILL }},
+       { &hf_dssetup_dssetup_DsRoleInfo_opstatus,
+         { "Opstatus", "dssetup.dssetup_DsRoleInfo.opstatus", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dssetup_dssetup_DsRolePrimaryDomInfoBasic_domain_guid,
          { "Domain Guid", "dssetup.dssetup_DsRolePrimaryDomInfoBasic.domain_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dssetup_dssetup_DsRoleOpStatus_status,
          { "Status", "dssetup.dssetup_DsRoleOpStatus.status", FT_UINT1632, BASE_DEC, VALS(dssetup_dssetup_DsRoleOp_vals), 0, NULL, HFILL }},
-       { &hf_dssetup_dssetup_DsRoleInfo_valDS_ROLE_UPGRADE_STATUS_upgrade,
-         { "Upgrade", "dssetup.dssetup_DsRoleInfo_valDS_ROLE_UPGRADE_STATUS.upgrade", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_dssetup_dssetup_DsRoleInfo_valDS_ROLE_OP_STATUS_opstatus,
-         { "Opstatus", "dssetup.dssetup_DsRoleInfo_valDS_ROLE_OP_STATUS.opstatus", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_dssetup_dssetup_DsRoleInfo_upgrade,
+         { "Upgrade", "dssetup.dssetup_DsRoleInfo.upgrade", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dssetup_dssetup_DsRoleGetPrimaryDomainInformation_info,
          { "Info", "dssetup.dssetup_DsRoleGetPrimaryDomainInformation.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dssetup_dssetup_DsRoleFlags_DS_ROLE_UPGRADE_IN_PROGRESS,
          { "Ds Role Upgrade In Progress", "dssetup.dssetup_DsRoleFlags.DS_ROLE_UPGRADE_IN_PROGRESS", FT_BOOLEAN, 32, TFS(&dssetup_DsRoleFlags_DS_ROLE_UPGRADE_IN_PROGRESS_tfs), ( 0x00000004 ), NULL, HFILL }},
        { &hf_dssetup_dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DOMAIN_GUID_PRESENT,
          { "Ds Role Primary Domain Guid Present", "dssetup.dssetup_DsRoleFlags.DS_ROLE_PRIMARY_DOMAIN_GUID_PRESENT", FT_BOOLEAN, 32, TFS(&dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DOMAIN_GUID_PRESENT_tfs), ( 0x01000000 ), NULL, HFILL }},
+       { &hf_dssetup_dssetup_DsRoleInfo_basic,
+         { "Basic", "dssetup.dssetup_DsRoleInfo.basic", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_dssetup_dssetup_DsRolePrimaryDomInfoBasic_role,
          { "Role", "dssetup.dssetup_DsRolePrimaryDomInfoBasic.role", FT_UINT1632, BASE_DEC, VALS(dssetup_dssetup_DsRole_vals), 0, NULL, HFILL }},
        { &hf_dssetup_dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DS_RUNNING,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-epmapper.c b/bin/default/librpc/gen_ndr/packet-dcerpc-epmapper.c
index 984045ff73816871730a28794dd71ed1cc02f02c..574fecacc30d3bf2bfe675059bab9b39c9aefe43 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-epmapper.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-epmapper.c
@@ -69,92 +69,92 @@ static gint ett_epmapper_epm_twr_p_t = -1;
 /* Header field declarations */
 static gint hf_epmapper_epm_rhs_ncalrpc_minor_version = -1;
 static gint hf_epmapper_rpc_if_id_t_uuid = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_SPX_spx = -1;
 static gint hf_epmapper_epm_MgmtDelete_object_speced = -1;
+static gint hf_epmapper_epm_rhs_uuid = -1;
 static gint hf_epmapper_epm_Map_map_tower = -1;
 static gint hf_epmapper_epm_Insert_replace = -1;
 static gint hf_epmapper_epm_entry_t___annotation_offset = -1;
 static gint hf_epmapper_epm_rhs_named_pipe_path = -1;
 static gint hf_epmapper_epm_Lookup_inquiry_type = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_IPX_ipx = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_NCACN_ncacn = -1;
 static gint hf_epmapper_epm_twr_p_t_twr = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_VINES_SPP_vines_spp = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_UNIX_DS_unix_ds = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_OSI_TP4_osi_tp4 = -1;
 static gint hf_epmapper_epm_Lookup_object = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_OSI_CLNS_osi_clns = -1;
 static gint hf_epmapper_epm_Map_object = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_DNET_NSP_dnet_nsp = -1;
+static gint hf_epmapper_epm_rhs_ncadg = -1;
 static gint hf_epmapper_epm_tower_floors = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_DDP_atalk_datagram = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_NCADG_ncadg = -1;
 static gint hf_epmapper_epm_Delete_entries = -1;
 static gint hf_epmapper_epm_rhs_netbios_name = -1;
+static gint hf_epmapper_epm_rhs_smb = -1;
 static gint hf_epmapper_epm_MgmtDelete_tower = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_UDP_udp = -1;
 static gint hf_epmapper_epm_Map_entry_handle = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_SMB_smb = -1;
+static gint hf_epmapper_epm_rhs_unix_ds = -1;
 static gint hf_epmapper_epm_rhs_ncadg_minor_version = -1;
+static gint hf_epmapper_epm_rhs_osi_clns = -1;
 static gint hf_epmapper_epm_Delete_num_ents = -1;
 static gint hf_epmapper_epm_floor_lhs = -1;
+static gint hf_epmapper_epm_rhs_ncacn = -1;
 static gint hf_epmapper_epm_Lookup_entry_handle = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_NAMED_PIPE_named_pipe = -1;
+static gint hf_epmapper_epm_rhs_ip = -1;
+static gint hf_epmapper_epm_rhs_atalk_datagram = -1;
 static gint hf_epmapper_epm_Insert_entries = -1;
 static gint hf_epmapper_epm_rhs_tcp_port = -1;
+static gint hf_epmapper_epm_rhs_ipx = -1;
 static gint hf_epmapper_epm_rhs_vines_ipc_port = -1;
+static gint hf_epmapper_epm_rhs_vines_spp = -1;
 static gint hf_epmapper_epm_rhs_unix_ds_path = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_NULL_null = -1;
 static gint hf_epmapper_epm_twr_t_tower_ = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_NB_IPX_nb_ipx = -1;
 static gint hf_epmapper_epm_lhs_protocol = -1;
+static gint hf_epmapper_epm_rhs_appletalk = -1;
 static gint hf_epmapper_epm_MgmtDelete_object = -1;
 static gint hf_epmapper_epm_twr_t_tower_length = -1;
+static gint hf_epmapper_epm_rhs_streettalk = -1;
 static gint hf_epmapper_epm_Lookup_max_ents = -1;
 static gint hf_epmapper_epm_entry_t___annotation_length = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_NCALRPC_ncalrpc = -1;
+static gint hf_epmapper_epm_rhs_nb_ipx = -1;
 static gint hf_epmapper_opnum = -1;
 static gint hf_epmapper_epm_Map_num_towers = -1;
-static gint hf_epmapper_epm_rhs_valdefault_unknown = -1;
+static gint hf_epmapper_epm_rhs_osi_tp4 = -1;
+static gint hf_epmapper_epm_rhs_netbeui = -1;
+static gint hf_epmapper_epm_rhs_http = -1;
 static gint hf_epmapper_epm_Map_towers = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_TCP_tcp = -1;
 static gint hf_epmapper_epm_Lookup_num_ents = -1;
+static gint hf_epmapper_epm_rhs_null = -1;
 static gint hf_epmapper_epm_rhs_ip_ipaddr = -1;
 static gint hf_epmapper_epm_rhs_udp_port = -1;
 static gint hf_epmapper_epm_floor_lhs_ = -1;
 static gint hf_epmapper_epm_entry_t_tower = -1;
 static gint hf_epmapper_epm_rhs_uuid_unknown = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_UUID_uuid = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_NETBIOS_netbios = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_NETBEUI_netbeui = -1;
 static gint hf_epmapper_epm_floor_rhs_ = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_DSP_atalk_stream = -1;
 static gint hf_epmapper_epm_twr_t_tower = -1;
+static gint hf_epmapper_epm_rhs_spx = -1;
 static gint hf_epmapper_epm_rhs_ncacn_minor_version = -1;
 static gint hf_epmapper_epm_entry_t_object = -1;
 static gint hf_epmapper_epm_entry_t_annotation = -1;
 static gint hf_epmapper_epm_rhs_smb_unc = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_STREETTALK_streettalk = -1;
+static gint hf_epmapper_epm_rhs_netbios = -1;
+static gint hf_epmapper_epm_rhs_udp = -1;
+static gint hf_epmapper_epm_rhs_dnet_nsp = -1;
 static gint hf_epmapper_epm_Lookup_vers_option = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_VINES_IPC_vines_ipc = -1;
 static gint hf_epmapper_epm_Map_max_towers = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_HTTP_http = -1;
+static gint hf_epmapper_epm_rhs_ncalrpc = -1;
 static gint hf_epmapper_rpc_if_id_t_vers_major = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_IP_ip = -1;
 static gint hf_epmapper_epm_LookupHandleFree_entry_handle = -1;
+static gint hf_epmapper_epm_rhs_tcp = -1;
 static gint hf_epmapper_epm_rhs_streettalk_streettalk = -1;
 static gint hf_epmapper_epm_rhs_http_port = -1;
+static gint hf_epmapper_epm_rhs_atalk_stream = -1;
 static gint hf_epmapper_uint32_status = -1;
+static gint hf_epmapper_epm_rhs_vines_ipc = -1;
 static gint hf_epmapper_epm_floor_rhs = -1;
 static gint hf_epmapper_epm_rhs_vines_spp_port = -1;
 static gint hf_epmapper_epm_InqObject_epm_object = -1;
 static gint hf_epmapper_epm_Lookup_interface_id = -1;
-static gint hf_epmapper_epm_rhs_valEPM_PROTOCOL_APPLETALK_appletalk = -1;
 static gint hf_epmapper_rpc_if_id_t_vers_minor = -1;
 static gint hf_epmapper_epm_tower_num_floors = -1;
+static gint hf_epmapper_epm_rhs_named_pipe = -1;
 static gint hf_epmapper_epm_Insert_num_ents = -1;
 static gint hf_epmapper_epm_lhs_lhs_data = -1;
 static gint hf_epmapper_epm_Lookup_entries = -1;
+static gint hf_epmapper_epm_rhs_unknown = -1;
 
 static gint proto_dcerpc_epmapper = -1;
 /* Version information */
@@ -210,33 +210,33 @@ static int epmapper_dissect_element_epm_rhs_ncalrpc_minor_version(tvbuff_t *tvb
 static int epmapper_dissect_element_epm_rhs_vines_spp_port(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int epmapper_dissect_element_epm_rhs_vines_ipc_port(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int epmapper_dissect_element_epm_rhs_streettalk_streettalk(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_DNET_NSP_dnet_nsp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_OSI_TP4_osi_tp4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_OSI_CLNS_osi_clns(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_TCP_tcp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_UDP_udp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_IP_ip(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NCADG_ncadg(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NCACN_ncacn(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NCALRPC_ncalrpc(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_UUID_uuid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_IPX_ipx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_SMB_smb(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NAMED_PIPE_named_pipe(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NETBIOS_netbios(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NETBEUI_netbeui(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_SPX_spx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NB_IPX_nb_ipx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_DSP_atalk_stream(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_DDP_atalk_datagram(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_APPLETALK_appletalk(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_VINES_SPP_vines_spp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_VINES_IPC_vines_ipc(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_STREETTALK_streettalk(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_HTTP_http(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_UNIX_DS_unix_ds(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NULL_null(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_rhs_valdefault_unknown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_dnet_nsp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_osi_tp4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_osi_clns(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_tcp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_udp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_ip(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_ncadg(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_ncacn(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_ncalrpc(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_uuid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_ipx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_smb(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_named_pipe(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_netbios(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_netbeui(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_spx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_nb_ipx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_atalk_stream(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_atalk_datagram(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_appletalk(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_vines_spp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_vines_ipc(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_streettalk(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_http(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_unix_ds(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_null(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int epmapper_dissect_element_epm_rhs_unknown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int epmapper_dissect_element_epm_lhs_protocol(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int epmapper_dissect_element_epm_lhs_lhs_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int epmapper_dissect_element_epm_floor_lhs(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *lhs);
@@ -1324,217 +1324,217 @@ epmapper_dissect_struct_epm_rhs_streettalk(tvbuff_t *tvb _U_, int offset _U_, pa
 /* IDL: } */
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_DNET_NSP_dnet_nsp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_dnet_nsp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_dnet_nsp(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_DNET_NSP_dnet_nsp,0);
+       offset = epmapper_dissect_struct_epm_rhs_dnet_nsp(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_dnet_nsp,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_OSI_TP4_osi_tp4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_osi_tp4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_osi_tp4(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_OSI_TP4_osi_tp4,0);
+       offset = epmapper_dissect_struct_epm_rhs_osi_tp4(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_osi_tp4,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_OSI_CLNS_osi_clns(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_osi_clns(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_osi_clns(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_OSI_CLNS_osi_clns,0);
+       offset = epmapper_dissect_struct_epm_rhs_osi_clns(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_osi_clns,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_TCP_tcp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_tcp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_tcp(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_TCP_tcp,0);
+       offset = epmapper_dissect_struct_epm_rhs_tcp(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_tcp,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_UDP_udp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_udp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_udp(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_UDP_udp,0);
+       offset = epmapper_dissect_struct_epm_rhs_udp(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_udp,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_IP_ip(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_ip(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_ip(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_IP_ip,0);
+       offset = epmapper_dissect_struct_epm_rhs_ip(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_ip,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NCADG_ncadg(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_ncadg(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_ncadg(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_NCADG_ncadg,0);
+       offset = epmapper_dissect_struct_epm_rhs_ncadg(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_ncadg,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NCACN_ncacn(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_ncacn(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_ncacn(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_NCACN_ncacn,0);
+       offset = epmapper_dissect_struct_epm_rhs_ncacn(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_ncacn,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NCALRPC_ncalrpc(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_ncalrpc(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_ncalrpc(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_NCALRPC_ncalrpc,0);
+       offset = epmapper_dissect_struct_epm_rhs_ncalrpc(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_ncalrpc,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_UUID_uuid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_uuid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_uuid(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_UUID_uuid,0);
+       offset = epmapper_dissect_struct_epm_rhs_uuid(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_uuid,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_IPX_ipx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_ipx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_ipx(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_IPX_ipx,0);
+       offset = epmapper_dissect_struct_epm_rhs_ipx(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_ipx,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_SMB_smb(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_smb(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_smb(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_SMB_smb,0);
+       offset = epmapper_dissect_struct_epm_rhs_smb(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_smb,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NAMED_PIPE_named_pipe(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_named_pipe(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_named_pipe(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_NAMED_PIPE_named_pipe,0);
+       offset = epmapper_dissect_struct_epm_rhs_named_pipe(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_named_pipe,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NETBIOS_netbios(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_netbios(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_netbios(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_NETBIOS_netbios,0);
+       offset = epmapper_dissect_struct_epm_rhs_netbios(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_netbios,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NETBEUI_netbeui(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_netbeui(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_netbeui(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_NETBEUI_netbeui,0);
+       offset = epmapper_dissect_struct_epm_rhs_netbeui(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_netbeui,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_SPX_spx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_spx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_spx(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_SPX_spx,0);
+       offset = epmapper_dissect_struct_epm_rhs_spx(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_spx,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NB_IPX_nb_ipx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_nb_ipx(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_nb_ipx(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_NB_IPX_nb_ipx,0);
+       offset = epmapper_dissect_struct_epm_rhs_nb_ipx(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_nb_ipx,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_DSP_atalk_stream(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_atalk_stream(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_atalk_stream(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_DSP_atalk_stream,0);
+       offset = epmapper_dissect_struct_epm_rhs_atalk_stream(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_atalk_stream,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_DDP_atalk_datagram(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_atalk_datagram(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_atalk_datagram(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_DDP_atalk_datagram,0);
+       offset = epmapper_dissect_struct_epm_rhs_atalk_datagram(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_atalk_datagram,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_APPLETALK_appletalk(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_appletalk(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_appletalk(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_APPLETALK_appletalk,0);
+       offset = epmapper_dissect_struct_epm_rhs_appletalk(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_appletalk,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_VINES_SPP_vines_spp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_vines_spp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_vines_spp(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_VINES_SPP_vines_spp,0);
+       offset = epmapper_dissect_struct_epm_rhs_vines_spp(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_vines_spp,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_VINES_IPC_vines_ipc(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_vines_ipc(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_vines_ipc(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_VINES_IPC_vines_ipc,0);
+       offset = epmapper_dissect_struct_epm_rhs_vines_ipc(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_vines_ipc,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_STREETTALK_streettalk(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_streettalk(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_streettalk(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_STREETTALK_streettalk,0);
+       offset = epmapper_dissect_struct_epm_rhs_streettalk(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_streettalk,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_HTTP_http(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_http(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_http(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_HTTP_http,0);
+       offset = epmapper_dissect_struct_epm_rhs_http(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_http,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_UNIX_DS_unix_ds(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_unix_ds(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_unix_ds(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_UNIX_DS_unix_ds,0);
+       offset = epmapper_dissect_struct_epm_rhs_unix_ds(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_unix_ds,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NULL_null(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_null(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = epmapper_dissect_struct_epm_rhs_null(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_valEPM_PROTOCOL_NULL_null,0);
+       offset = epmapper_dissect_struct_epm_rhs_null(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_rhs_null,0);
 
        return offset;
 }
 
 static int
-epmapper_dissect_element_epm_rhs_valdefault_unknown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+epmapper_dissect_element_epm_rhs_unknown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_epmapper_epm_rhs_valdefault_unknown, 1);
+       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_epmapper_epm_rhs_unknown, 1);
 
        return offset;
 }
@@ -1555,111 +1555,111 @@ epmapper_dissect_epm_rhs(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _
 
        switch(level) {
                case EPM_PROTOCOL_DNET_NSP:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_DNET_NSP_dnet_nsp(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_dnet_nsp(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_OSI_TP4:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_OSI_TP4_osi_tp4(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_osi_tp4(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_OSI_CLNS:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_OSI_CLNS_osi_clns(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_osi_clns(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_TCP:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_TCP_tcp(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_tcp(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_UDP:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_UDP_udp(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_udp(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_IP:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_IP_ip(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_ip(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_NCADG:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NCADG_ncadg(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_ncadg(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_NCACN:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NCACN_ncacn(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_ncacn(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_NCALRPC:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NCALRPC_ncalrpc(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_ncalrpc(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_UUID:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_UUID_uuid(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_uuid(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_IPX:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_IPX_ipx(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_ipx(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_SMB:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_SMB_smb(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_smb(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_NAMED_PIPE:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NAMED_PIPE_named_pipe(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_named_pipe(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_NETBIOS:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NETBIOS_netbios(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_netbios(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_NETBEUI:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NETBEUI_netbeui(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_netbeui(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_SPX:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_SPX_spx(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_spx(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_NB_IPX:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NB_IPX_nb_ipx(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_nb_ipx(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_DSP:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_DSP_atalk_stream(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_atalk_stream(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_DDP:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_DDP_atalk_datagram(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_atalk_datagram(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_APPLETALK:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_APPLETALK_appletalk(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_appletalk(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_VINES_SPP:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_VINES_SPP_vines_spp(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_vines_spp(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_VINES_IPC:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_VINES_IPC_vines_ipc(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_vines_ipc(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_STREETTALK:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_STREETTALK_streettalk(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_streettalk(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_HTTP:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_HTTP_http(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_http(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_UNIX_DS:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_UNIX_DS_unix_ds(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_unix_ds(tvb, offset, pinfo, tree, drep);
                break;
 
                case EPM_PROTOCOL_NULL:
-                       offset = epmapper_dissect_element_epm_rhs_valEPM_PROTOCOL_NULL_null(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_null(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = epmapper_dissect_element_epm_rhs_valdefault_unknown(tvb, offset, pinfo, tree, drep);
+                       offset = epmapper_dissect_element_epm_rhs_unknown(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -2828,10 +2828,10 @@ void proto_register_dcerpc_epmapper(void)
          { "Minor Version", "epmapper.epm_rhs_ncalrpc.minor_version", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_rpc_if_id_t_uuid,
          { "Uuid", "epmapper.rpc_if_id_t.uuid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_SPX_spx,
-         { "Spx", "epmapper.epm_rhs_valEPM_PROTOCOL_SPX.spx", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_MgmtDelete_object_speced,
          { "Object Speced", "epmapper.epm_MgmtDelete.object_speced", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_uuid,
+         { "Uuid", "epmapper.epm_rhs.uuid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Map_map_tower,
          { "Map Tower", "epmapper.epm_Map.map_tower", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Insert_replace,
@@ -2842,92 +2842,90 @@ void proto_register_dcerpc_epmapper(void)
          { "Path", "epmapper.epm_rhs_named_pipe.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Lookup_inquiry_type,
          { "Inquiry Type", "epmapper.epm_Lookup.inquiry_type", FT_UINT32, BASE_DEC, VALS(epmapper_epm_InquiryType_vals), 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_IPX_ipx,
-         { "Ipx", "epmapper.epm_rhs_valEPM_PROTOCOL_IPX.ipx", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_NCACN_ncacn,
-         { "Ncacn", "epmapper.epm_rhs_valEPM_PROTOCOL_NCACN.ncacn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_twr_p_t_twr,
          { "Twr", "epmapper.epm_twr_p_t.twr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_VINES_SPP_vines_spp,
-         { "Vines Spp", "epmapper.epm_rhs_valEPM_PROTOCOL_VINES_SPP.vines_spp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_UNIX_DS_unix_ds,
-         { "Unix Ds", "epmapper.epm_rhs_valEPM_PROTOCOL_UNIX_DS.unix_ds", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_OSI_TP4_osi_tp4,
-         { "Osi Tp4", "epmapper.epm_rhs_valEPM_PROTOCOL_OSI_TP4.osi_tp4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Lookup_object,
          { "Object", "epmapper.epm_Lookup.object", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_OSI_CLNS_osi_clns,
-         { "Osi Clns", "epmapper.epm_rhs_valEPM_PROTOCOL_OSI_CLNS.osi_clns", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Map_object,
          { "Object", "epmapper.epm_Map.object", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_DNET_NSP_dnet_nsp,
-         { "Dnet Nsp", "epmapper.epm_rhs_valEPM_PROTOCOL_DNET_NSP.dnet_nsp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_ncadg,
+         { "Ncadg", "epmapper.epm_rhs.ncadg", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_tower_floors,
          { "Floors", "epmapper.epm_tower.floors", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_DDP_atalk_datagram,
-         { "Atalk Datagram", "epmapper.epm_rhs_valEPM_PROTOCOL_DDP.atalk_datagram", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_NCADG_ncadg,
-         { "Ncadg", "epmapper.epm_rhs_valEPM_PROTOCOL_NCADG.ncadg", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Delete_entries,
          { "Entries", "epmapper.epm_Delete.entries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_rhs_netbios_name,
          { "Name", "epmapper.epm_rhs_netbios.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_smb,
+         { "Smb", "epmapper.epm_rhs.smb", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_MgmtDelete_tower,
          { "Tower", "epmapper.epm_MgmtDelete.tower", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_UDP_udp,
-         { "Udp", "epmapper.epm_rhs_valEPM_PROTOCOL_UDP.udp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Map_entry_handle,
          { "Entry Handle", "epmapper.epm_Map.entry_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_SMB_smb,
-         { "Smb", "epmapper.epm_rhs_valEPM_PROTOCOL_SMB.smb", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_unix_ds,
+         { "Unix Ds", "epmapper.epm_rhs.unix_ds", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_rhs_ncadg_minor_version,
          { "Minor Version", "epmapper.epm_rhs_ncadg.minor_version", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_osi_clns,
+         { "Osi Clns", "epmapper.epm_rhs.osi_clns", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Delete_num_ents,
          { "Num Ents", "epmapper.epm_Delete.num_ents", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_floor_lhs,
          { "Lhs", "epmapper.epm_floor.lhs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_ncacn,
+         { "Ncacn", "epmapper.epm_rhs.ncacn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Lookup_entry_handle,
          { "Entry Handle", "epmapper.epm_Lookup.entry_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_NAMED_PIPE_named_pipe,
-         { "Named Pipe", "epmapper.epm_rhs_valEPM_PROTOCOL_NAMED_PIPE.named_pipe", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_ip,
+         { "Ip", "epmapper.epm_rhs.ip", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_atalk_datagram,
+         { "Atalk Datagram", "epmapper.epm_rhs.atalk_datagram", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Insert_entries,
          { "Entries", "epmapper.epm_Insert.entries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_rhs_tcp_port,
          { "Port", "epmapper.epm_rhs_tcp.port", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_ipx,
+         { "Ipx", "epmapper.epm_rhs.ipx", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_rhs_vines_ipc_port,
          { "Port", "epmapper.epm_rhs_vines_ipc.port", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_vines_spp,
+         { "Vines Spp", "epmapper.epm_rhs.vines_spp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_rhs_unix_ds_path,
          { "Path", "epmapper.epm_rhs_unix_ds.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_NULL_null,
-         { "Null", "epmapper.epm_rhs_valEPM_PROTOCOL_NULL.null", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_twr_t_tower_,
          { "Subcontext length", "epmapper.epm_twr_t.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_NB_IPX_nb_ipx,
-         { "Nb Ipx", "epmapper.epm_rhs_valEPM_PROTOCOL_NB_IPX.nb_ipx", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_lhs_protocol,
          { "Protocol", "epmapper.epm_lhs.protocol", FT_UINT8, BASE_DEC, VALS(epmapper_epm_protocol_vals), 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_appletalk,
+         { "Appletalk", "epmapper.epm_rhs.appletalk", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_MgmtDelete_object,
          { "Object", "epmapper.epm_MgmtDelete.object", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_twr_t_tower_length,
          { "Tower Length", "epmapper.epm_twr_t.tower_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_streettalk,
+         { "Streettalk", "epmapper.epm_rhs.streettalk", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Lookup_max_ents,
          { "Max Ents", "epmapper.epm_Lookup.max_ents", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_entry_t___annotation_length,
          { "  Annotation Length", "epmapper.epm_entry_t.__annotation_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_NCALRPC_ncalrpc,
-         { "Ncalrpc", "epmapper.epm_rhs_valEPM_PROTOCOL_NCALRPC.ncalrpc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_nb_ipx,
+         { "Nb Ipx", "epmapper.epm_rhs.nb_ipx", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_opnum,
          { "Operation", "epmapper.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Map_num_towers,
          { "Num Towers", "epmapper.epm_Map.num_towers", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valdefault_unknown,
-         { "Unknown", "epmapper.epm_rhs_valdefault.unknown", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_osi_tp4,
+         { "Osi Tp4", "epmapper.epm_rhs.osi_tp4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_netbeui,
+         { "Netbeui", "epmapper.epm_rhs.netbeui", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_http,
+         { "Http", "epmapper.epm_rhs.http", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Map_towers,
          { "Towers", "epmapper.epm_Map.towers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_TCP_tcp,
-         { "Tcp", "epmapper.epm_rhs_valEPM_PROTOCOL_TCP.tcp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Lookup_num_ents,
          { "Num Ents", "epmapper.epm_Lookup.num_ents", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_null,
+         { "Null", "epmapper.epm_rhs.null", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_rhs_ip_ipaddr,
          { "Ipaddr", "epmapper.epm_rhs_ip.ipaddr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_rhs_udp_port,
@@ -2938,18 +2936,12 @@ void proto_register_dcerpc_epmapper(void)
          { "Tower", "epmapper.epm_entry_t.tower", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_rhs_uuid_unknown,
          { "Unknown", "epmapper.epm_rhs_uuid.unknown", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_UUID_uuid,
-         { "Uuid", "epmapper.epm_rhs_valEPM_PROTOCOL_UUID.uuid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_NETBIOS_netbios,
-         { "Netbios", "epmapper.epm_rhs_valEPM_PROTOCOL_NETBIOS.netbios", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_NETBEUI_netbeui,
-         { "Netbeui", "epmapper.epm_rhs_valEPM_PROTOCOL_NETBEUI.netbeui", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_floor_rhs_,
          { "Subcontext length", "epmapper.epm_floor.subcontext", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_DSP_atalk_stream,
-         { "Atalk Stream", "epmapper.epm_rhs_valEPM_PROTOCOL_DSP.atalk_stream", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_twr_t_tower,
          { "Tower", "epmapper.epm_twr_t.tower", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_spx,
+         { "Spx", "epmapper.epm_rhs.spx", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_rhs_ncacn_minor_version,
          { "Minor Version", "epmapper.epm_rhs_ncacn.minor_version", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_entry_t_object,
@@ -2958,28 +2950,34 @@ void proto_register_dcerpc_epmapper(void)
          { "Annotation", "epmapper.epm_entry_t.annotation", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_rhs_smb_unc,
          { "Unc", "epmapper.epm_rhs_smb.unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_STREETTALK_streettalk,
-         { "Streettalk", "epmapper.epm_rhs_valEPM_PROTOCOL_STREETTALK.streettalk", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_netbios,
+         { "Netbios", "epmapper.epm_rhs.netbios", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_udp,
+         { "Udp", "epmapper.epm_rhs.udp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_dnet_nsp,
+         { "Dnet Nsp", "epmapper.epm_rhs.dnet_nsp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Lookup_vers_option,
          { "Vers Option", "epmapper.epm_Lookup.vers_option", FT_UINT32, BASE_DEC, VALS(epmapper_epm_VersionOption_vals), 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_VINES_IPC_vines_ipc,
-         { "Vines Ipc", "epmapper.epm_rhs_valEPM_PROTOCOL_VINES_IPC.vines_ipc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Map_max_towers,
          { "Max Towers", "epmapper.epm_Map.max_towers", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_HTTP_http,
-         { "Http", "epmapper.epm_rhs_valEPM_PROTOCOL_HTTP.http", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_ncalrpc,
+         { "Ncalrpc", "epmapper.epm_rhs.ncalrpc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_rpc_if_id_t_vers_major,
          { "Vers Major", "epmapper.rpc_if_id_t.vers_major", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_IP_ip,
-         { "Ip", "epmapper.epm_rhs_valEPM_PROTOCOL_IP.ip", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_LookupHandleFree_entry_handle,
          { "Entry Handle", "epmapper.epm_LookupHandleFree.entry_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_tcp,
+         { "Tcp", "epmapper.epm_rhs.tcp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_rhs_streettalk_streettalk,
          { "Streettalk", "epmapper.epm_rhs_streettalk.streettalk", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_rhs_http_port,
          { "Port", "epmapper.epm_rhs_http.port", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_atalk_stream,
+         { "Atalk Stream", "epmapper.epm_rhs.atalk_stream", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_uint32_status,
          { "uint32", "epmapper.uint32_status", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_vines_ipc,
+         { "Vines Ipc", "epmapper.epm_rhs.vines_ipc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_floor_rhs,
          { "Rhs", "epmapper.epm_floor.rhs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_rhs_vines_spp_port,
@@ -2988,18 +2986,20 @@ void proto_register_dcerpc_epmapper(void)
          { "Epm Object", "epmapper.epm_InqObject.epm_object", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Lookup_interface_id,
          { "Interface Id", "epmapper.epm_Lookup.interface_id", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_epmapper_epm_rhs_valEPM_PROTOCOL_APPLETALK_appletalk,
-         { "Appletalk", "epmapper.epm_rhs_valEPM_PROTOCOL_APPLETALK.appletalk", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_rpc_if_id_t_vers_minor,
          { "Vers Minor", "epmapper.rpc_if_id_t.vers_minor", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_tower_num_floors,
          { "Num Floors", "epmapper.epm_tower.num_floors", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_named_pipe,
+         { "Named Pipe", "epmapper.epm_rhs.named_pipe", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Insert_num_ents,
          { "Num Ents", "epmapper.epm_Insert.num_ents", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_lhs_lhs_data,
          { "Lhs Data", "epmapper.epm_lhs.lhs_data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_epmapper_epm_Lookup_entries,
          { "Entries", "epmapper.epm_Lookup.entries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_epmapper_epm_rhs_unknown,
+         { "Unknown", "epmapper.epm_rhs.unknown", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        };
 
 

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-eventlog6.c b/bin/default/librpc/gen_ndr/packet-dcerpc-eventlog6.c
index 9cd28e7422e78e05281cb4f9694d18c9b8a4e835..d9dfd31d76521f77ff3a47e03caa6d279dfecd98 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-eventlog6.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-eventlog6.c
@@ -45,6 +45,7 @@ static gint ett_eventlog6_eventlog6_EvtRpcQueryChannelInfo = -1;
 /* Header field declarations */
 static gint hf_eventlog6_eventlog6_EvtRpcGetPublisherResourceMetadata_pubMetadataProps = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcLocalizeExportLog_control = -1;
+static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_uint32Val = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRegisterRemoteSubscription_handle = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcQueryChannelInfo_name = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetClassicLogDisplayName_flags = -1;
@@ -64,15 +65,15 @@ static gint hf_eventlog6_eventlog6_EvtRpcGetLogFileInfo_propertyId = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcMessageRenderDefault_error = -1;
 static gint hf_eventlog6_eventlog6_StringArray_count = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcQuerySeek_flags = -1;
+static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_guidVal = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcMessageRenderDefault_maxSizeString = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcVariant_var = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetPublisherMetadata_locale = -1;
-static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeGuidArray_guidArray = -1;
+static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_nullVal = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcQuerySeek_error = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRegisterRemoteSubscription_queryChannelInfo = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcMessageRenderDefault_messageId = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRegisterRemoteSubscription_bookmarkXml = -1;
-static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeGuid_guidVal = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcOpenLogHandle_channel = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcLocalizeExportLog_logFilePath = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetChannelList_channelPaths = -1;
@@ -82,7 +83,7 @@ static gint hf_eventlog6_eventlog6_EvtRpcMessageRenderDefault_sizeEventId = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRemoteSubscriptionNext_numActualRecords = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRegisterRemoteSubscription_error = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcExportLog_channelPath = -1;
-static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeStringArray_stringArray = -1;
+static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_guidArray = -1;
 static gint hf_eventlog6_eventlog6_RpcInfo_error = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcOpenLogHandle_error = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetPublisherResourceMetadata_propertyId = -1;
@@ -111,12 +112,11 @@ static gint hf_eventlog6_eventlog6_EvtRpcGetLogFileInfo_logHandle = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcPutChannelConfig_channelPath = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRegisterLogQuery_queryChannelInfoSize = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetNextEventMetadata_eventMetadataInstances = -1;
-static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeUInt64Array_uint64Array = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRegisterRemoteSubscription_control = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcQueryChannelInfo_status = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcVariantList_props = -1;
+static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_uint64Array = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetChannelList_flags = -1;
-static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeNull_nullVal = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetClassicLogDisplayName_logName = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcVariant_type = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRegisterRemoteSubscription_flags = -1;
@@ -135,11 +135,11 @@ static gint hf_eventlog6_eventlog6_EvtRpcRegisterLogQuery_opControl = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetPublisherMetadata_logFilePath = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRemoteSubscriptionNextAsync_resultBufferSize = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRemoteSubscriptionNextAsync_flags = -1;
-static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeboolean8Array_boolean8Array = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetPublisherListForChannel_publisherIds = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetPublisherListForChannel_channelName = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcMessageRender_messageId = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRemoteSubscriptionNextAsync_resultBuffer = -1;
+static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_boolean8Val = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcLocalizeExportLog_locale = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRemoteSubscriptionNextAsync_numActualRecords = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcMessageRender_string = -1;
@@ -151,7 +151,6 @@ static gint hf_eventlog6_eventlog6_EvtRpcMessageRenderDefault_values = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRegisterLogQuery_error = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetEventMetadataEnum_reservedForFilter = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetPublisherMetadata_flags = -1;
-static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeUInt32Array_uint32Array = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRetractConfig_flags = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRemoteSubscriptionNextAsync_handle = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcQueryNext_flags = -1;
@@ -161,11 +160,10 @@ static gint hf_eventlog6_eventlog6_EvtRpcVariant_flags = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcClearLog_backupPath = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcClose_handle = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetClassicLogDisplayName_locale = -1;
-static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeString_stringVal = -1;
-static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeUInt32_uint32Val = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcMessageRenderDefault_string = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcQuerySeek_timeOut = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcPutChannelConfig_error = -1;
+static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_uint64Val = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetPublisherList_publisherIds = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcMessageRender_neededSizeString = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRemoteSubscriptionNext_eventDataIndices = -1;
@@ -173,6 +171,7 @@ static gint hf_eventlog6_eventlog6_EvtRpcRegisterRemoteSubscription_query = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcMessageRender_eventId = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetPublisherListForChannel_flags = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRegisterRemoteSubscription_channelPath = -1;
+static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_stringArray = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetClassicLogDisplayName_displayName = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetNextEventMetadata_numRequested = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRegisterControllableOperation_handle = -1;
@@ -187,9 +186,9 @@ static gint hf_eventlog6_eventlog6_EvtRpcRemoteSubscriptionNextAsync_eventDataIn
 static gint hf_eventlog6_eventlog6_EvtRpcPutChannelConfig_props = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcExportLog_error = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetPublisherMetadata_publisherId = -1;
-static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeboolean8_boolean8Val = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcOpenLogHandle_flags = -1;
 static gint hf_eventlog6_eventlog6_UInt32Array_ptr = -1;
+static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_uint32Array = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetChannelConfig_props = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRegisterLogQuery_flags = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetEventMetadataEnum_eventMetaDataEnum = -1;
@@ -202,8 +201,9 @@ static gint hf_eventlog6_eventlog6_EvtRpcExportLog_backupPath = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcCancel_handle = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetPublisherResourceMetadata_handle = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetChannelList_numChannelPaths = -1;
-static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeUInt64_uint64Val = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetChannelConfig_channelPath = -1;
+static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_stringVal = -1;
+static gint hf_eventlog6_eventlog6_EvtRpcVariantUnion_boolean8Array = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcQueryNext_numActualRecords = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcRetractConfig_path = -1;
 static gint hf_eventlog6_eventlog6_EvtRpcGetEventMetadataEnum_pubMetadata = -1;
@@ -273,19 +273,19 @@ const value_string eventlog6_eventlog6_EvtRpcAssertConfigFlags_vals[] = {
        { EvtRpcPublisherName, "EvtRpcPublisherName" },
 { 0, NULL }
 };
-static int eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeNull_nullVal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeboolean8_boolean8Val(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeUInt32_uint32Val(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeUInt64_uint64Val(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeString_stringVal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeString_stringVal_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeGuid_guidVal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeGuid_guidVal_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeboolean8Array_boolean8Array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeUInt32Array_uint32Array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeUInt64Array_uint64Array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeStringArray_stringArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeGuidArray_guidArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int eventlog6_dissect_element_EvtRpcVariantUnion_nullVal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int eventlog6_dissect_element_EvtRpcVariantUnion_boolean8Val(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int eventlog6_dissect_element_EvtRpcVariantUnion_uint32Val(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int eventlog6_dissect_element_EvtRpcVariantUnion_uint64Val(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int eventlog6_dissect_element_EvtRpcVariantUnion_stringVal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int eventlog6_dissect_element_EvtRpcVariantUnion_stringVal_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int eventlog6_dissect_element_EvtRpcVariantUnion_guidVal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int eventlog6_dissect_element_EvtRpcVariantUnion_guidVal_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int eventlog6_dissect_element_EvtRpcVariantUnion_boolean8Array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int eventlog6_dissect_element_EvtRpcVariantUnion_uint32Array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int eventlog6_dissect_element_EvtRpcVariantUnion_uint64Array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int eventlog6_dissect_element_EvtRpcVariantUnion_stringArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int eventlog6_dissect_element_EvtRpcVariantUnion_guidArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int eventlog6_dissect_element_EvtRpcVariant_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *type);
 static int eventlog6_dissect_element_EvtRpcVariant_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int eventlog6_dissect_element_EvtRpcVariant_var(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *type);
@@ -1073,108 +1073,108 @@ eventlog6_dissect_enum_EvtRpcAssertConfigFlags(tvbuff_t *tvb _U_, int offset _U_
 /* IDL: } */
 
 static int
-eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeNull_nullVal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+eventlog6_dissect_element_EvtRpcVariantUnion_nullVal(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_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeNull_nullVal, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_eventlog6_eventlog6_EvtRpcVariantUnion_nullVal, 0);
 
        return offset;
 }
 
 static int
-eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeboolean8_boolean8Val(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+eventlog6_dissect_element_EvtRpcVariantUnion_boolean8Val(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_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeboolean8_boolean8Val, 0);
+       offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, drep, hf_eventlog6_eventlog6_EvtRpcVariantUnion_boolean8Val, 0);
 
        return offset;
 }
 
 static int
-eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeUInt32_uint32Val(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+eventlog6_dissect_element_EvtRpcVariantUnion_uint32Val(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_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeUInt32_uint32Val, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_eventlog6_eventlog6_EvtRpcVariantUnion_uint32Val, 0);
 
        return offset;
 }
 
 static int
-eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeUInt64_uint64Val(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+eventlog6_dissect_element_EvtRpcVariantUnion_uint64Val(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeUInt64_uint64Val, NULL);
+       offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_eventlog6_eventlog6_EvtRpcVariantUnion_uint64Val, NULL);
 
        return offset;
 }
 
 static int
-eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeString_stringVal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+eventlog6_dissect_element_EvtRpcVariantUnion_stringVal(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, eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeString_stringVal_, NDR_POINTER_UNIQUE, "Pointer to Stringval (uint16)",hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeString_stringVal);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, eventlog6_dissect_element_EvtRpcVariantUnion_stringVal_, NDR_POINTER_UNIQUE, "Pointer to Stringval (uint16)",hf_eventlog6_eventlog6_EvtRpcVariantUnion_stringVal);
 
        return offset;
 }
 
 static int
-eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeString_stringVal_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+eventlog6_dissect_element_EvtRpcVariantUnion_stringVal_(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_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeString_stringVal, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_eventlog6_eventlog6_EvtRpcVariantUnion_stringVal, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeGuid_guidVal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+eventlog6_dissect_element_EvtRpcVariantUnion_guidVal(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, eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeGuid_guidVal_, NDR_POINTER_UNIQUE, "Pointer to Guidval (GUID)",hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeGuid_guidVal);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, eventlog6_dissect_element_EvtRpcVariantUnion_guidVal_, NDR_POINTER_UNIQUE, "Pointer to Guidval (GUID)",hf_eventlog6_eventlog6_EvtRpcVariantUnion_guidVal);
 
        return offset;
 }
 
 static int
-eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeGuid_guidVal_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+eventlog6_dissect_element_EvtRpcVariantUnion_guidVal_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, drep, hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeGuid_guidVal, NULL);
+       offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, drep, hf_eventlog6_eventlog6_EvtRpcVariantUnion_guidVal, NULL);
 
        return offset;
 }
 
 static int
-eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeboolean8Array_boolean8Array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+eventlog6_dissect_element_EvtRpcVariantUnion_boolean8Array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = eventlog6_dissect_struct_boolean8Array(tvb,offset,pinfo,tree,drep,hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeboolean8Array_boolean8Array,0);
+       offset = eventlog6_dissect_struct_boolean8Array(tvb,offset,pinfo,tree,drep,hf_eventlog6_eventlog6_EvtRpcVariantUnion_boolean8Array,0);
 
        return offset;
 }
 
 static int
-eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeUInt32Array_uint32Array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+eventlog6_dissect_element_EvtRpcVariantUnion_uint32Array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = eventlog6_dissect_struct_UInt32Array(tvb,offset,pinfo,tree,drep,hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeUInt32Array_uint32Array,0);
+       offset = eventlog6_dissect_struct_UInt32Array(tvb,offset,pinfo,tree,drep,hf_eventlog6_eventlog6_EvtRpcVariantUnion_uint32Array,0);
 
        return offset;
 }
 
 static int
-eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeUInt64Array_uint64Array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+eventlog6_dissect_element_EvtRpcVariantUnion_uint64Array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = eventlog6_dissect_struct_UInt64Array(tvb,offset,pinfo,tree,drep,hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeUInt64Array_uint64Array,0);
+       offset = eventlog6_dissect_struct_UInt64Array(tvb,offset,pinfo,tree,drep,hf_eventlog6_eventlog6_EvtRpcVariantUnion_uint64Array,0);
 
        return offset;
 }
 
 static int
-eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeStringArray_stringArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+eventlog6_dissect_element_EvtRpcVariantUnion_stringArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = eventlog6_dissect_struct_StringArray(tvb,offset,pinfo,tree,drep,hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeStringArray_stringArray,0);
+       offset = eventlog6_dissect_struct_StringArray(tvb,offset,pinfo,tree,drep,hf_eventlog6_eventlog6_EvtRpcVariantUnion_stringArray,0);
 
        return offset;
 }
 
 static int
-eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeGuidArray_guidArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+eventlog6_dissect_element_EvtRpcVariantUnion_guidArray(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = eventlog6_dissect_struct_GuidArray(tvb,offset,pinfo,tree,drep,hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeGuidArray_guidArray,0);
+       offset = eventlog6_dissect_struct_GuidArray(tvb,offset,pinfo,tree,drep,hf_eventlog6_eventlog6_EvtRpcVariantUnion_guidArray,0);
 
        return offset;
 }
@@ -1198,47 +1198,47 @@ eventlog6_dissect_EvtRpcVariantUnion(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
        switch(level) {
                case EvtRpcVarTypeNull:
-                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeNull_nullVal(tvb, offset, pinfo, tree, drep);
+                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_nullVal(tvb, offset, pinfo, tree, drep);
                break;
 
                case EvtRpcVarTypeboolean8:
-                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeboolean8_boolean8Val(tvb, offset, pinfo, tree, drep);
+                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_boolean8Val(tvb, offset, pinfo, tree, drep);
                break;
 
                case EvtRpcVarTypeUInt32:
-                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeUInt32_uint32Val(tvb, offset, pinfo, tree, drep);
+                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_uint32Val(tvb, offset, pinfo, tree, drep);
                break;
 
                case EvtRpcVarTypeUInt64:
-                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeUInt64_uint64Val(tvb, offset, pinfo, tree, drep);
+                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_uint64Val(tvb, offset, pinfo, tree, drep);
                break;
 
                case EvtRpcVarTypeString:
-                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeString_stringVal(tvb, offset, pinfo, tree, drep);
+                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_stringVal(tvb, offset, pinfo, tree, drep);
                break;
 
                case EvtRpcVarTypeGuid:
-                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeGuid_guidVal(tvb, offset, pinfo, tree, drep);
+                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_guidVal(tvb, offset, pinfo, tree, drep);
                break;
 
                case EvtRpcVarTypeboolean8Array:
-                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeboolean8Array_boolean8Array(tvb, offset, pinfo, tree, drep);
+                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_boolean8Array(tvb, offset, pinfo, tree, drep);
                break;
 
                case EvtRpcVarTypeUInt32Array:
-                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeUInt32Array_uint32Array(tvb, offset, pinfo, tree, drep);
+                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_uint32Array(tvb, offset, pinfo, tree, drep);
                break;
 
                case EvtRpcVarTypeUInt64Array:
-                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeUInt64Array_uint64Array(tvb, offset, pinfo, tree, drep);
+                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_uint64Array(tvb, offset, pinfo, tree, drep);
                break;
 
                case EvtRpcVarTypeStringArray:
-                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeStringArray_stringArray(tvb, offset, pinfo, tree, drep);
+                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_stringArray(tvb, offset, pinfo, tree, drep);
                break;
 
                case EvtRpcVarTypeGuidArray:
-                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_valEvtRpcVarTypeGuidArray_guidArray(tvb, offset, pinfo, tree, drep);
+                       offset = eventlog6_dissect_element_EvtRpcVariantUnion_guidArray(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -5054,6 +5054,8 @@ void proto_register_dcerpc_eventlog6(void)
          { "Pubmetadataprops", "eventlog6.eventlog6_EvtRpcGetPublisherResourceMetadata.pubMetadataProps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcLocalizeExportLog_control,
          { "Control", "eventlog6.eventlog6_EvtRpcLocalizeExportLog.control", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_uint32Val,
+         { "Uint32val", "eventlog6.eventlog6_EvtRpcVariantUnion.uint32Val", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcRegisterRemoteSubscription_handle,
          { "Handle", "eventlog6.eventlog6_EvtRpcRegisterRemoteSubscription.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcQueryChannelInfo_name,
@@ -5092,14 +5094,16 @@ void proto_register_dcerpc_eventlog6(void)
          { "Count", "eventlog6.eventlog6_StringArray.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcQuerySeek_flags,
          { "Flags", "eventlog6.eventlog6_EvtRpcQuerySeek.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_guidVal,
+         { "Guidval", "eventlog6.eventlog6_EvtRpcVariantUnion.guidVal", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcMessageRenderDefault_maxSizeString,
          { "Maxsizestring", "eventlog6.eventlog6_EvtRpcMessageRenderDefault.maxSizeString", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcVariant_var,
          { "Var", "eventlog6.eventlog6_EvtRpcVariant.var", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcGetPublisherMetadata_locale,
          { "Locale", "eventlog6.eventlog6_EvtRpcGetPublisherMetadata.locale", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeGuidArray_guidArray,
-         { "Guidarray", "eventlog6.eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeGuidArray.guidArray", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_nullVal,
+         { "Nullval", "eventlog6.eventlog6_EvtRpcVariantUnion.nullVal", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcQuerySeek_error,
          { "Error", "eventlog6.eventlog6_EvtRpcQuerySeek.error", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcRegisterRemoteSubscription_queryChannelInfo,
@@ -5108,8 +5112,6 @@ void proto_register_dcerpc_eventlog6(void)
          { "Messageid", "eventlog6.eventlog6_EvtRpcMessageRenderDefault.messageId", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcRegisterRemoteSubscription_bookmarkXml,
          { "Bookmarkxml", "eventlog6.eventlog6_EvtRpcRegisterRemoteSubscription.bookmarkXml", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeGuid_guidVal,
-         { "Guidval", "eventlog6.eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeGuid.guidVal", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcOpenLogHandle_channel,
          { "Channel", "eventlog6.eventlog6_EvtRpcOpenLogHandle.channel", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcLocalizeExportLog_logFilePath,
@@ -5128,8 +5130,8 @@ void proto_register_dcerpc_eventlog6(void)
          { "Error", "eventlog6.eventlog6_EvtRpcRegisterRemoteSubscription.error", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcExportLog_channelPath,
          { "Channelpath", "eventlog6.eventlog6_EvtRpcExportLog.channelPath", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeStringArray_stringArray,
-         { "Stringarray", "eventlog6.eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeStringArray.stringArray", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_guidArray,
+         { "Guidarray", "eventlog6.eventlog6_EvtRpcVariantUnion.guidArray", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_RpcInfo_error,
          { "Error", "eventlog6.eventlog6_RpcInfo.error", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcOpenLogHandle_error,
@@ -5186,18 +5188,16 @@ void proto_register_dcerpc_eventlog6(void)
          { "Querychannelinfosize", "eventlog6.eventlog6_EvtRpcRegisterLogQuery.queryChannelInfoSize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcGetNextEventMetadata_eventMetadataInstances,
          { "Eventmetadatainstances", "eventlog6.eventlog6_EvtRpcGetNextEventMetadata.eventMetadataInstances", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeUInt64Array_uint64Array,
-         { "Uint64array", "eventlog6.eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeUInt64Array.uint64Array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcRegisterRemoteSubscription_control,
          { "Control", "eventlog6.eventlog6_EvtRpcRegisterRemoteSubscription.control", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcQueryChannelInfo_status,
          { "Status", "eventlog6.eventlog6_EvtRpcQueryChannelInfo.status", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcVariantList_props,
          { "Props", "eventlog6.eventlog6_EvtRpcVariantList.props", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_uint64Array,
+         { "Uint64array", "eventlog6.eventlog6_EvtRpcVariantUnion.uint64Array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcGetChannelList_flags,
          { "Flags", "eventlog6.eventlog6_EvtRpcGetChannelList.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeNull_nullVal,
-         { "Nullval", "eventlog6.eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeNull.nullVal", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcGetClassicLogDisplayName_logName,
          { "Logname", "eventlog6.eventlog6_EvtRpcGetClassicLogDisplayName.logName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcVariant_type,
@@ -5234,8 +5234,6 @@ void proto_register_dcerpc_eventlog6(void)
          { "Resultbuffersize", "eventlog6.eventlog6_EvtRpcRemoteSubscriptionNextAsync.resultBufferSize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcRemoteSubscriptionNextAsync_flags,
          { "Flags", "eventlog6.eventlog6_EvtRpcRemoteSubscriptionNextAsync.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeboolean8Array_boolean8Array,
-         { "Boolean8array", "eventlog6.eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeboolean8Array.boolean8Array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcGetPublisherListForChannel_publisherIds,
          { "Publisherids", "eventlog6.eventlog6_EvtRpcGetPublisherListForChannel.publisherIds", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcGetPublisherListForChannel_channelName,
@@ -5244,6 +5242,8 @@ void proto_register_dcerpc_eventlog6(void)
          { "Messageid", "eventlog6.eventlog6_EvtRpcMessageRender.messageId", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcRemoteSubscriptionNextAsync_resultBuffer,
          { "Resultbuffer", "eventlog6.eventlog6_EvtRpcRemoteSubscriptionNextAsync.resultBuffer", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_boolean8Val,
+         { "Boolean8val", "eventlog6.eventlog6_EvtRpcVariantUnion.boolean8Val", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcLocalizeExportLog_locale,
          { "Locale", "eventlog6.eventlog6_EvtRpcLocalizeExportLog.locale", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcRemoteSubscriptionNextAsync_numActualRecords,
@@ -5266,8 +5266,6 @@ void proto_register_dcerpc_eventlog6(void)
          { "Reservedforfilter", "eventlog6.eventlog6_EvtRpcGetEventMetadataEnum.reservedForFilter", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcGetPublisherMetadata_flags,
          { "Flags", "eventlog6.eventlog6_EvtRpcGetPublisherMetadata.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeUInt32Array_uint32Array,
-         { "Uint32array", "eventlog6.eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeUInt32Array.uint32Array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcRetractConfig_flags,
          { "Flags", "eventlog6.eventlog6_EvtRpcRetractConfig.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcRemoteSubscriptionNextAsync_handle,
@@ -5286,16 +5284,14 @@ void proto_register_dcerpc_eventlog6(void)
          { "Handle", "eventlog6.eventlog6_EvtRpcClose.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcGetClassicLogDisplayName_locale,
          { "Locale", "eventlog6.eventlog6_EvtRpcGetClassicLogDisplayName.locale", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeString_stringVal,
-         { "Stringval", "eventlog6.eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeString.stringVal", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeUInt32_uint32Val,
-         { "Uint32val", "eventlog6.eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeUInt32.uint32Val", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcMessageRenderDefault_string,
          { "String", "eventlog6.eventlog6_EvtRpcMessageRenderDefault.string", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcQuerySeek_timeOut,
          { "Timeout", "eventlog6.eventlog6_EvtRpcQuerySeek.timeOut", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcPutChannelConfig_error,
          { "Error", "eventlog6.eventlog6_EvtRpcPutChannelConfig.error", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_uint64Val,
+         { "Uint64val", "eventlog6.eventlog6_EvtRpcVariantUnion.uint64Val", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcGetPublisherList_publisherIds,
          { "Publisherids", "eventlog6.eventlog6_EvtRpcGetPublisherList.publisherIds", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcMessageRender_neededSizeString,
@@ -5310,6 +5306,8 @@ void proto_register_dcerpc_eventlog6(void)
          { "Flags", "eventlog6.eventlog6_EvtRpcGetPublisherListForChannel.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcRegisterRemoteSubscription_channelPath,
          { "Channelpath", "eventlog6.eventlog6_EvtRpcRegisterRemoteSubscription.channelPath", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_stringArray,
+         { "Stringarray", "eventlog6.eventlog6_EvtRpcVariantUnion.stringArray", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcGetClassicLogDisplayName_displayName,
          { "Displayname", "eventlog6.eventlog6_EvtRpcGetClassicLogDisplayName.displayName", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcGetNextEventMetadata_numRequested,
@@ -5338,12 +5336,12 @@ void proto_register_dcerpc_eventlog6(void)
          { "Error", "eventlog6.eventlog6_EvtRpcExportLog.error", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcGetPublisherMetadata_publisherId,
          { "Publisherid", "eventlog6.eventlog6_EvtRpcGetPublisherMetadata.publisherId", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeboolean8_boolean8Val,
-         { "Boolean8val", "eventlog6.eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeboolean8.boolean8Val", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcOpenLogHandle_flags,
          { "Flags", "eventlog6.eventlog6_EvtRpcOpenLogHandle.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_UInt32Array_ptr,
          { "Ptr", "eventlog6.eventlog6_UInt32Array.ptr", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_uint32Array,
+         { "Uint32array", "eventlog6.eventlog6_EvtRpcVariantUnion.uint32Array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcGetChannelConfig_props,
          { "Props", "eventlog6.eventlog6_EvtRpcGetChannelConfig.props", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcRegisterLogQuery_flags,
@@ -5368,10 +5366,12 @@ void proto_register_dcerpc_eventlog6(void)
          { "Handle", "eventlog6.eventlog6_EvtRpcGetPublisherResourceMetadata.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcGetChannelList_numChannelPaths,
          { "Numchannelpaths", "eventlog6.eventlog6_EvtRpcGetChannelList.numChannelPaths", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeUInt64_uint64Val,
-         { "Uint64val", "eventlog6.eventlog6_EvtRpcVariantUnion_valEvtRpcVarTypeUInt64.uint64Val", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcGetChannelConfig_channelPath,
          { "Channelpath", "eventlog6.eventlog6_EvtRpcGetChannelConfig.channelPath", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_stringVal,
+         { "Stringval", "eventlog6.eventlog6_EvtRpcVariantUnion.stringVal", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_eventlog6_eventlog6_EvtRpcVariantUnion_boolean8Array,
+         { "Boolean8array", "eventlog6.eventlog6_EvtRpcVariantUnion.boolean8Array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcQueryNext_numActualRecords,
          { "Numactualrecords", "eventlog6.eventlog6_EvtRpcQueryNext.numActualRecords", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_eventlog6_eventlog6_EvtRpcRetractConfig_path,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-frsrpc.c b/bin/default/librpc/gen_ndr/packet-dcerpc-frsrpc.c
index f687a87d21b1468ea2b50bd6ffc3f26eeac4ccc1..407af26c66bfa5f7c059d456711f8add5a081922 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-frsrpc.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-frsrpc.c
@@ -47,6 +47,7 @@ static gint ett_frsrpc_frsrpc_FrsSendCommPktReq = -1;
 
 
 /* Header field declarations */
+static gint hf_frsrpc_frsrpc_CommPktChunkData_to = -1;
 static gint hf_frsrpc_frsrpc_CommPktDataExtensionChecksum_data = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_MORPH_GEN_HEAD = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoRecordExtensionWin2k_major = -1;
@@ -54,23 +55,19 @@ static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_originator_guid = -1;
 static gint hf_frsrpc_frsrpc_FrsVerifyPromotionParent_replica_set_name = -1;
 static gint hf_frsrpc_frsrpc_CommPktDataExtensionRetryTimeout_not_used = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_spare2wcs = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_GVSN_gvsn = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_spare3guid_p2 = -1;
 static gint hf_frsrpc_frsrpc_FrsStartPromotionParent_connection_guid = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderRecordExtension_offset_last = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_status = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_COMPRESSION_GUID_compression_guid = -1;
 static gint hf_frsrpc_frsrpc_FrsVerifyPromotionParent_replica_set_type = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_new_parent_guid = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_file_guid = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdIFlags_FRSRPC_CO_IFLAG_CO_ABORT = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_COMMAND_command = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_spare1guid_p1 = -1;
 static gint hf_frsrpc_frsrpc_FrsStartPromotionParent_connection_guid_ = -1;
 static gint hf_frsrpc_frsrpc_FrsStartPromotionParent_parent_guid = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_FILE_CREATE = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_DATA_EXTEND = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_replica = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_original_replica_num = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_jrnl_first_usn = -1;
 static gint hf_frsrpc_frsrpc_FrsVerifyPromotionParent_parent_password = -1;
@@ -81,7 +78,7 @@ static gint hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_VVJOIN_TO_ORIG = -
 static gint hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_MOVEIN_GEN = -1;
 static gint hf_frsrpc_frsrpc_CommPktDataExtensionRetryTimeout_first_try_time = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_LOCALCO = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FROM_from = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_replica_version_guid_ = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_file_attributes = -1;
 static gint hf_frsrpc_frsrpc_CommPktChunk_data = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_RETRY = -1;
@@ -90,33 +87,40 @@ static gint hf_frsrpc_frsrpc_FrsStartPromotionParent_parent_guid_ = -1;
 static gint hf_frsrpc_frsrpc_FrsSendCommPkt_req = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoRecordExtensionWin2k_data_checksum = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_padding4 = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_VVECTOR_vvector_ = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_padding2 = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_ack_version = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_COMPRESSED_STAGE = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_DATA_TRUNCATION = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_co_ext_win2k = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_file_size = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_file_name_length = -1;
 static gint hf_frsrpc_frsrpc_CommPktChunkGuidName_guid_ = -1;
 static gint hf_frsrpc_frsrpc_FrsSendCommPktReq_pkt_len = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_join_guid_ = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderRecordExtension_major = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoRecordExtensionWin2k_offset = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_ABORT_CO = -1;
 static gint hf_frsrpc_frsrpc_CommPktChunkCtr_chunks = -1;
 static gint hf_frsrpc_frsrpc_CommPktDataExtensionRetryTimeout_prefix_type = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_iflags = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_command = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_co_guid = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_FILE_DELETE = -1;
 static gint hf_frsrpc_frsrpc_FrsSendCommPktReq_major = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoRecordExtensionWin2k_offset_last = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderRecordExtension_offset1 = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_vvector = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_file_size = -1;
 static gint hf_frsrpc_frsrpc_FrsStartPromotionParent_connection_name = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_co_sequnence_number = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_from = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_SKIP_ORIG_REC_C = -1;
 static gint hf_frsrpc_frsrpc_CommPktChunkCtr_num_chunks = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_change_order_guid = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_compression_guid = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_old_parent_guid = -1;
 static gint hf_frsrpc_frsrpc_FrsStartPromotionParent_parent_account = -1;
 static gint hf_frsrpc_frsrpc_CommPktGSVN_vsn = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_VERSION_GUID_replica_version_guid = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderRecordExtension_field_size = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_partern_ack_sequence_number = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_OUT_OF_ORDER = -1;
@@ -125,8 +129,8 @@ static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_extension = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_NEW_NAME = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_file_offset = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_spare1guid_p2 = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_SEQUENCE_NUMBER_co_sequnence_number = -1;
 static gint hf_frsrpc_frsrpc_FrsSendCommPktReq_upk_len = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_blob = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_SECURITY_CHANGE = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_file_version_number = -1;
 static gint hf_frsrpc_frsrpc_CommPktDataExtensionRetryTimeout_prefix_size = -1;
@@ -136,69 +140,66 @@ static gint hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_BASIC_
 static gint hf_frsrpc_frsrpc_CommPktChunk_data_ = -1;
 static gint hf_frsrpc_werror = -1;
 static gint hf_frsrpc_frsrpc_FrsStartPromotionParent_partner_guid_ = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_join_guid = -1;
 static gint hf_frsrpc_frsrpc_FrsVerifyPromotionParent___ndr_guid_size = -1;
 static gint hf_frsrpc_frsrpc_FrsSendCommPktReq_data_handle = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_GUID_co_guid_ = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BLOCK_SIZE_block_size = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_content_cmd = -1;
 static gint hf_frsrpc_frsrpc_FrsStartPromotionParent_partner_name = -1;
 static gint hf_frsrpc_frsrpc_FrsSendCommPktReq_cs_id = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_TIME_join_time = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderRecordExtension_data_checksum = -1;
 static gint hf_frsrpc_frsrpc_CommPktChunkGuidName_name_ = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_remote_co = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_co_extension2 = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_spare2guid_p1 = -1;
 static gint hf_frsrpc_frsrpc_FrsStartPromotionParent___ndr_guid_size = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_LAST_JOIN_TIME_last_join_time = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_gvsn_ = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_replica_version_guid = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_block_size = -1;
 static gint hf_frsrpc_frsrpc_CommPktChunkGuidName_name = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_not_used = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FILE_OFFSET_file_offset = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_vvector_ = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_bop = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderRecordExtension_offset0 = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_file_offset = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_padding1 = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_co_ext_win2k_ = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_bopend = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_LOCATION_CMD = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_NAMED_DATA_EXTEND = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_VVECTOR_vvector = -1;
 static gint hf_frsrpc_frsrpc_CommPktDataExtensionRetryTimeout_count = -1;
 static gint hf_frsrpc_frsrpc_CommPktChunkGuidName_guid = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_last_join_time = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_co_guid_ = -1;
 static gint hf_frsrpc_frsrpc_CommPktChunk_type = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_connection_guid = -1;
 static gint hf_frsrpc_frsrpc_FrsSendCommPktReq_data_name = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REMOTE_CO_remote_co_ = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_GUID_join_guid = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXTENTION_2_co_extension2 = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_gvsn = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_replica = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoRecordExtensionWin2k_offset_count = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_jrnl_usn = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_padding3 = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K_co_ext_win2k_ = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_TIME_join_time_ = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FILE_SIZE_file_size = -1;
 static gint hf_frsrpc_frsrpc_FrsStartPromotionParent_partner_princ_name = -1;
 static gint hf_frsrpc_frsrpc_FrsVerifyPromotionParent_partner_auth_level = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_EOP_bopend = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REMOTE_CO_remote_co = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_JUST_OID_RESET = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_EA_CHANGE = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_block = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdIFlags_FRSRPC_CO_IFLAG_VVRETIRE_EXEC = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_TO_to = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_remote_co_ = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_location_cmd = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdIFlags_FRSRPC_CO_IFLAG_DIR_ENUM_PENDING = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderRecordExtension_not_used = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_spare2ul1 = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CONNECTION_connection = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_NAMED_DATA_OVERWRITE = -1;
 static gint hf_frsrpc_opnum = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K_co_ext_win2k = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_join_time_ = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_NEW_FILE = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valdefault_blob = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_GUID_co_guid = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_spare2bin = -1;
 static gint hf_frsrpc_frsrpc_CommPktCoRecordExtensionWin2k_field_size = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_frs_vsn = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_GUID_join_guid_ = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BLOCK_block = -1;
 static gint hf_frsrpc_frsrpc_FrsSendCommPktReq_ctr = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_connection = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderRecordExtension_offset_count = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderRecordExtension_data_retry_timeout = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_GVSN_gvsn_ = -1;
 static gint hf_frsrpc_frsrpc_FrsStartPromotionParent_replica_set_name = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_event_time = -1;
 static gint hf_frsrpc_frsrpc_FrsSendCommPktReq_memory_len = -1;
@@ -216,8 +217,7 @@ static gint hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_COMPRE
 static gint hf_frsrpc_frsrpc_FrsStartPromotionParent_partner_guid = -1;
 static gint hf_frsrpc_frsrpc_FrsStartPromotionParent_replica_set_type = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_flags = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BOP_bop = -1;
-static gint hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_VERSION_GUID_replica_version_guid_ = -1;
+static gint hf_frsrpc_frsrpc_CommPktChunkData_join_time = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_spare1wcs = -1;
 static gint hf_frsrpc_frsrpc_CommPktChangeOrderCommand_new_replica_num = -1;
 static gint hf_frsrpc_frsrpc_FrsStartPromotionParent_parent_password = -1;
@@ -542,38 +542,38 @@ const value_string frsrpc_frsrpc_CommPktChunkType_vals[] = {
        { FRSRPC_COMM_PKT_CHUNK_EOP, "FRSRPC_COMM_PKT_CHUNK_EOP" },
 { 0, NULL }
 };
-static int frsrpc_dissect_element_CommPktChunkData_valdefault_blob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BOP_bop(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_COMMAND_command(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_TO_to(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FROM_from(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_replica(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CONNECTION_connection(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_GUID_join_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_GUID_join_guid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_LAST_JOIN_TIME_last_join_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_VVECTOR_vvector(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_VVECTOR_vvector_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_TIME_join_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_TIME_join_time_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_VERSION_GUID_replica_version_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_VERSION_GUID_replica_version_guid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_COMPRESSION_GUID_compression_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BLOCK_block(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BLOCK_SIZE_block_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FILE_SIZE_file_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FILE_OFFSET_file_offset(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_GVSN_gvsn(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_GVSN_gvsn_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_GUID_co_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_GUID_co_guid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_SEQUENCE_NUMBER_co_sequnence_number(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REMOTE_CO_remote_co(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REMOTE_CO_remote_co_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K_co_ext_win2k(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K_co_ext_win2k_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXTENTION_2_co_extension2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_EOP_bopend(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_blob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_bop(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_command(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_to(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_from(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_replica(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_connection(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_join_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_join_guid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_last_join_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_vvector(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_vvector_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_join_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_join_time_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_replica_version_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_replica_version_guid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_compression_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_block(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_block_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_file_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_file_offset(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_gvsn(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_gvsn_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_co_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_co_guid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_co_sequnence_number(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_remote_co(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_remote_co_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_co_ext_win2k(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_co_ext_win2k_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_co_extension2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frsrpc_dissect_element_CommPktChunkData_bopend(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int frsrpc_dissect_element_CommPktChunk_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *type);
 static int frsrpc_dissect_element_CommPktChunk_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *type);
 static int frsrpc_dissect_element_CommPktChunk_data_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *type);
@@ -2300,63 +2300,63 @@ frsrpc_dissect_enum_CommPktChunkType(tvbuff_t *tvb _U_, int offset _U_, packet_i
 /* IDL: } */
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valdefault_blob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_blob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valdefault_blob, 1);
+       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_blob, 1);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BOP_bop(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_bop(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_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BOP_bop, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_bop, 0);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_COMMAND_command(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_command(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = frsrpc_dissect_enum_CommPktCommand(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_COMMAND_command, 0);
+       offset = frsrpc_dissect_enum_CommPktCommand(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_command, 0);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_TO_to(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_to(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = frsrpc_dissect_struct_CommPktChunkGuidName(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_TO_to,0);
+       offset = frsrpc_dissect_struct_CommPktChunkGuidName(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_to,0);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FROM_from(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_from(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = frsrpc_dissect_struct_CommPktChunkGuidName(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FROM_from,0);
+       offset = frsrpc_dissect_struct_CommPktChunkGuidName(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_from,0);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_replica(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_replica(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = frsrpc_dissect_struct_CommPktChunkGuidName(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_replica,0);
+       offset = frsrpc_dissect_struct_CommPktChunkGuidName(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_replica,0);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CONNECTION_connection(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_connection(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = frsrpc_dissect_struct_CommPktChunkGuidName(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CONNECTION_connection,0);
+       offset = frsrpc_dissect_struct_CommPktChunkGuidName(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_connection,0);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_GUID_join_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_join_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint3264 size;
@@ -2365,10 +2365,10 @@ frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_GUID_join_
 
        if (!conformant) {
                guint32 saved_flags = di->call_data->flags;
-               offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_GUID_join_guid_, &size);
+               offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_join_guid_, &size);
                di->call_data->flags &= ~DCERPC_IS_NDR64;
                subtvb = tvb_new_subset(tvb, offset, size, -1);
-               frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_GUID_join_guid_(subtvb, 0, pinfo, tree, drep);
+               frsrpc_dissect_element_CommPktChunkData_join_guid_(subtvb, 0, pinfo, tree, drep);
                offset += size;
                di->call_data->flags = saved_flags;
        }
@@ -2377,23 +2377,23 @@ frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_GUID_join_
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_GUID_join_guid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_join_guid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_GUID_join_guid, NULL);
+       offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_join_guid, NULL);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_LAST_JOIN_TIME_last_join_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_last_join_time(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_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_LAST_JOIN_TIME_last_join_time);
+       offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_last_join_time);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_VVECTOR_vvector(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_vvector(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint3264 size;
@@ -2402,10 +2402,10 @@ frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_VVECTOR_vvector
 
        if (!conformant) {
                guint32 saved_flags = di->call_data->flags;
-               offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_VVECTOR_vvector_, &size);
+               offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_vvector_, &size);
                di->call_data->flags &= ~DCERPC_IS_NDR64;
                subtvb = tvb_new_subset(tvb, offset, size, -1);
-               frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_VVECTOR_vvector_(subtvb, 0, pinfo, tree, drep);
+               frsrpc_dissect_element_CommPktChunkData_vvector_(subtvb, 0, pinfo, tree, drep);
                offset += size;
                di->call_data->flags = saved_flags;
        }
@@ -2414,15 +2414,15 @@ frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_VVECTOR_vvector
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_VVECTOR_vvector_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_vvector_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = frsrpc_dissect_struct_CommPktGSVN(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_VVECTOR_vvector,0);
+       offset = frsrpc_dissect_struct_CommPktGSVN(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_vvector,0);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_TIME_join_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_join_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint3264 size;
@@ -2431,10 +2431,10 @@ frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_TIME_join_
 
        if (!conformant) {
                guint32 saved_flags = di->call_data->flags;
-               offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_TIME_join_time_, &size);
+               offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_join_time_, &size);
                di->call_data->flags &= ~DCERPC_IS_NDR64;
                subtvb = tvb_new_subset(tvb, offset, size, -1);
-               frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_TIME_join_time_(subtvb, 0, pinfo, tree, drep);
+               frsrpc_dissect_element_CommPktChunkData_join_time_(subtvb, 0, pinfo, tree, drep);
                offset += size;
                di->call_data->flags = saved_flags;
        }
@@ -2443,15 +2443,15 @@ frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_TIME_join_
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_TIME_join_time_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_join_time_(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_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_TIME_join_time);
+       offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_join_time);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_VERSION_GUID_replica_version_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_replica_version_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint3264 size;
@@ -2460,10 +2460,10 @@ frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_VERSION
 
        if (!conformant) {
                guint32 saved_flags = di->call_data->flags;
-               offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_VERSION_GUID_replica_version_guid_, &size);
+               offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_replica_version_guid_, &size);
                di->call_data->flags &= ~DCERPC_IS_NDR64;
                subtvb = tvb_new_subset(tvb, offset, size, -1);
-               frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_VERSION_GUID_replica_version_guid_(subtvb, 0, pinfo, tree, drep);
+               frsrpc_dissect_element_CommPktChunkData_replica_version_guid_(subtvb, 0, pinfo, tree, drep);
                offset += size;
                di->call_data->flags = saved_flags;
        }
@@ -2472,55 +2472,55 @@ frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_VERSION
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_VERSION_GUID_replica_version_guid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_replica_version_guid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_VERSION_GUID_replica_version_guid, NULL);
+       offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_replica_version_guid, NULL);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_COMPRESSION_GUID_compression_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_compression_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_COMPRESSION_GUID_compression_guid, NULL);
+       offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_compression_guid, NULL);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BLOCK_block(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_block(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BLOCK_block, 1);
+       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_block, 1);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BLOCK_SIZE_block_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_block_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BLOCK_SIZE_block_size, NULL);
+       offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_block_size, NULL);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FILE_SIZE_file_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_file_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FILE_SIZE_file_size, NULL);
+       offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_file_size, NULL);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FILE_OFFSET_file_offset(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_file_offset(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FILE_OFFSET_file_offset, NULL);
+       offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_file_offset, NULL);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_GVSN_gvsn(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_gvsn(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint3264 size;
@@ -2529,10 +2529,10 @@ frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_GVSN_gvsn(tvbuf
 
        if (!conformant) {
                guint32 saved_flags = di->call_data->flags;
-               offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_GVSN_gvsn_, &size);
+               offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_gvsn_, &size);
                di->call_data->flags &= ~DCERPC_IS_NDR64;
                subtvb = tvb_new_subset(tvb, offset, size, -1);
-               frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_GVSN_gvsn_(subtvb, 0, pinfo, tree, drep);
+               frsrpc_dissect_element_CommPktChunkData_gvsn_(subtvb, 0, pinfo, tree, drep);
                offset += size;
                di->call_data->flags = saved_flags;
        }
@@ -2541,15 +2541,15 @@ frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_GVSN_gvsn(tvbuf
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_GVSN_gvsn_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_gvsn_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = frsrpc_dissect_struct_CommPktGSVN(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_GVSN_gvsn,0);
+       offset = frsrpc_dissect_struct_CommPktGSVN(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_gvsn,0);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_GUID_co_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_co_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint3264 size;
@@ -2558,10 +2558,10 @@ frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_GUID_co_guid
 
        if (!conformant) {
                guint32 saved_flags = di->call_data->flags;
-               offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_GUID_co_guid_, &size);
+               offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_co_guid_, &size);
                di->call_data->flags &= ~DCERPC_IS_NDR64;
                subtvb = tvb_new_subset(tvb, offset, size, -1);
-               frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_GUID_co_guid_(subtvb, 0, pinfo, tree, drep);
+               frsrpc_dissect_element_CommPktChunkData_co_guid_(subtvb, 0, pinfo, tree, drep);
                offset += size;
                di->call_data->flags = saved_flags;
        }
@@ -2570,23 +2570,23 @@ frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_GUID_co_guid
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_GUID_co_guid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_co_guid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_GUID_co_guid, NULL);
+       offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_co_guid, NULL);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_SEQUENCE_NUMBER_co_sequnence_number(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_co_sequnence_number(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_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_SEQUENCE_NUMBER_co_sequnence_number, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_co_sequnence_number, 0);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REMOTE_CO_remote_co(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_remote_co(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint3264 size;
@@ -2595,10 +2595,10 @@ frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REMOTE_CO_remot
 
        if (!conformant) {
                guint32 saved_flags = di->call_data->flags;
-               offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REMOTE_CO_remote_co_, &size);
+               offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_remote_co_, &size);
                di->call_data->flags &= ~DCERPC_IS_NDR64;
                subtvb = tvb_new_subset(tvb, offset, size, -1);
-               frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REMOTE_CO_remote_co_(subtvb, 0, pinfo, tree, drep);
+               frsrpc_dissect_element_CommPktChunkData_remote_co_(subtvb, 0, pinfo, tree, drep);
                offset += size;
                di->call_data->flags = saved_flags;
        }
@@ -2607,15 +2607,15 @@ frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REMOTE_CO_remot
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REMOTE_CO_remote_co_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_remote_co_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = frsrpc_dissect_struct_CommPktChangeOrderCommand(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REMOTE_CO_remote_co,0);
+       offset = frsrpc_dissect_struct_CommPktChangeOrderCommand(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_remote_co,0);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K_co_ext_win2k(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_co_ext_win2k(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint3264 size;
@@ -2624,10 +2624,10 @@ frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K_co
 
        if (!conformant) {
                guint32 saved_flags = di->call_data->flags;
-               offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K_co_ext_win2k_, &size);
+               offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_co_ext_win2k_, &size);
                di->call_data->flags &= ~DCERPC_IS_NDR64;
                subtvb = tvb_new_subset(tvb, offset, size, -1);
-               frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K_co_ext_win2k_(subtvb, 0, pinfo, tree, drep);
+               frsrpc_dissect_element_CommPktChunkData_co_ext_win2k_(subtvb, 0, pinfo, tree, drep);
                offset += size;
                di->call_data->flags = saved_flags;
        }
@@ -2636,25 +2636,25 @@ frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K_co
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K_co_ext_win2k_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_co_ext_win2k_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = frsrpc_dissect_struct_CommPktCoRecordExtensionWin2k(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K_co_ext_win2k,0);
+       offset = frsrpc_dissect_struct_CommPktCoRecordExtensionWin2k(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_co_ext_win2k,0);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXTENTION_2_co_extension2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_co_extension2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = frsrpc_dissect_struct_CommPktChangeOrderRecordExtension(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXTENTION_2_co_extension2,0);
+       offset = frsrpc_dissect_struct_CommPktChangeOrderRecordExtension(tvb,offset,pinfo,tree,drep,hf_frsrpc_frsrpc_CommPktChunkData_co_extension2,0);
 
        return offset;
 }
 
 static int
-frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_EOP_bopend(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frsrpc_dissect_element_CommPktChunkData_bopend(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_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_EOP_bopend, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_frsrpc_frsrpc_CommPktChunkData_bopend, 0);
 
        return offset;
 }
@@ -2675,99 +2675,99 @@ frsrpc_dissect_CommPktChunkData(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 
        switch(level) {
                default:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valdefault_blob(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_blob(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_BOP:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BOP_bop(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_bop(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_COMMAND:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_COMMAND_command(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_command(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_TO:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_TO_to(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_to(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_FROM:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FROM_from(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_from(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_REPLICA:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_replica(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_replica(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_CONNECTION:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CONNECTION_connection(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_connection(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_JOIN_GUID:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_GUID_join_guid(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_join_guid(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_LAST_JOIN_TIME:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_LAST_JOIN_TIME_last_join_time(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_last_join_time(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_VVECTOR:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_VVECTOR_vvector(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_vvector(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_JOIN_TIME:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_TIME_join_time(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_join_time(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_REPLICA_VERSION_GUID:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_VERSION_GUID_replica_version_guid(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_replica_version_guid(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_COMPRESSION_GUID:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_COMPRESSION_GUID_compression_guid(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_compression_guid(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_BLOCK:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BLOCK_block(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_block(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_BLOCK_SIZE:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BLOCK_SIZE_block_size(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_block_size(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_FILE_SIZE:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FILE_SIZE_file_size(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_file_size(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_FILE_OFFSET:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FILE_OFFSET_file_offset(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_file_offset(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_GVSN:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_GVSN_gvsn(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_gvsn(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_CO_GUID:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_GUID_co_guid(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_co_guid(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_CO_SEQUENCE_NUMBER:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_SEQUENCE_NUMBER_co_sequnence_number(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_co_sequnence_number(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_REMOTE_CO:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REMOTE_CO_remote_co(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_remote_co(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K_co_ext_win2k(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_co_ext_win2k(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_CO_EXTENTION_2:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXTENTION_2_co_extension2(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_co_extension2(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSRPC_COMM_PKT_CHUNK_EOP:
-                       offset = frsrpc_dissect_element_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_EOP_bopend(tvb, offset, pinfo, tree, drep);
+                       offset = frsrpc_dissect_element_CommPktChunkData_bopend(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -3810,6 +3810,8 @@ static dcerpc_sub_dissector frsrpc_dissectors[] = {
 void proto_register_dcerpc_frsrpc(void)
 {
        static hf_register_info hf[] = {
+       { &hf_frsrpc_frsrpc_CommPktChunkData_to,
+         { "To", "frsrpc.frsrpc_CommPktChunkData.to", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktDataExtensionChecksum_data,
          { "Data", "frsrpc.frsrpc_CommPktDataExtensionChecksum.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_MORPH_GEN_HEAD,
@@ -3824,8 +3826,6 @@ void proto_register_dcerpc_frsrpc(void)
          { "Not Used", "frsrpc.frsrpc_CommPktDataExtensionRetryTimeout.not_used", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_spare2wcs,
          { "Spare2wcs", "frsrpc.frsrpc_CommPktChangeOrderCommand.spare2wcs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_GVSN_gvsn,
-         { "Gvsn", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_GVSN.gvsn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_spare3guid_p2,
          { "Spare3guid P2", "frsrpc.frsrpc_CommPktChangeOrderCommand.spare3guid_p2", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsStartPromotionParent_connection_guid,
@@ -3834,8 +3834,6 @@ void proto_register_dcerpc_frsrpc(void)
          { "Offset Last", "frsrpc.frsrpc_CommPktChangeOrderRecordExtension.offset_last", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_status,
          { "Status", "frsrpc.frsrpc_CommPktChangeOrderCommand.status", FT_UINT32, BASE_DEC, VALS(frsrpc_frsrpc_CommPktCoCmdStatus_vals), 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_COMPRESSION_GUID_compression_guid,
-         { "Compression Guid", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_COMPRESSION_GUID.compression_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsVerifyPromotionParent_replica_set_type,
          { "Replica Set Type", "frsrpc.frsrpc_FrsVerifyPromotionParent.replica_set_type", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_new_parent_guid,
@@ -3844,8 +3842,6 @@ void proto_register_dcerpc_frsrpc(void)
          { "File Guid", "frsrpc.frsrpc_CommPktChangeOrderCommand.file_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoCmdIFlags_FRSRPC_CO_IFLAG_CO_ABORT,
          { "Frsrpc Co Iflag Co Abort", "frsrpc.frsrpc_CommPktCoCmdIFlags.FRSRPC_CO_IFLAG_CO_ABORT", FT_BOOLEAN, 32, TFS(&frsrpc_CommPktCoCmdIFlags_FRSRPC_CO_IFLAG_CO_ABORT_tfs), ( 0x00000002 ), NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_COMMAND_command,
-         { "Command", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_COMMAND.command", FT_UINT32, BASE_DEC, VALS(frsrpc_frsrpc_CommPktCommand_vals), 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_spare1guid_p1,
          { "Spare1guid P1", "frsrpc.frsrpc_CommPktChangeOrderCommand.spare1guid_p1", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsStartPromotionParent_connection_guid_,
@@ -3856,8 +3852,6 @@ void proto_register_dcerpc_frsrpc(void)
          { "Frsrpc Content Reason File Create", "frsrpc.frsrpc_CommPktCoCmdContentCmd.FRSRPC_CONTENT_REASON_FILE_CREATE", FT_BOOLEAN, 32, TFS(&frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_FILE_CREATE_tfs), ( 0x00000100 ), NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_DATA_EXTEND,
          { "Frsrpc Content Reason Data Extend", "frsrpc.frsrpc_CommPktCoCmdContentCmd.FRSRPC_CONTENT_REASON_DATA_EXTEND", FT_BOOLEAN, 32, TFS(&frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_DATA_EXTEND_tfs), ( 0x00000002 ), NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_replica,
-         { "Replica", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA.replica", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_original_replica_num,
          { "Original Replica Num", "frsrpc.frsrpc_CommPktChangeOrderCommand.original_replica_num", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_jrnl_first_usn,
@@ -3878,8 +3872,8 @@ void proto_register_dcerpc_frsrpc(void)
          { "First Try Time", "frsrpc.frsrpc_CommPktDataExtensionRetryTimeout.first_try_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_LOCALCO,
          { "Frsrpc Co Flag Localco", "frsrpc.frsrpc_CommPktCoCmdFlags.FRSRPC_CO_FLAG_LOCALCO", FT_BOOLEAN, 32, TFS(&frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_LOCALCO_tfs), ( 0x00000020 ), NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FROM_from,
-         { "From", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FROM.from", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_replica_version_guid_,
+         { "Subcontext length", "frsrpc.frsrpc_CommPktChunkData.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_file_attributes,
          { "File Attributes", "frsrpc.frsrpc_CommPktChangeOrderCommand.file_attributes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChunk_data,
@@ -3896,8 +3890,6 @@ void proto_register_dcerpc_frsrpc(void)
          { "Data Checksum", "frsrpc.frsrpc_CommPktCoRecordExtensionWin2k.data_checksum", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_padding4,
          { "Padding4", "frsrpc.frsrpc_CommPktChangeOrderCommand.padding4", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_VVECTOR_vvector_,
-         { "Subcontext length", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_VVECTOR.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_padding2,
          { "Padding2", "frsrpc.frsrpc_CommPktChangeOrderCommand.padding2", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_ack_version,
@@ -3906,12 +3898,18 @@ void proto_register_dcerpc_frsrpc(void)
          { "Frsrpc Co Flag Compressed Stage", "frsrpc.frsrpc_CommPktCoCmdFlags.FRSRPC_CO_FLAG_COMPRESSED_STAGE", FT_BOOLEAN, 32, TFS(&frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_COMPRESSED_STAGE_tfs), ( 0x01000000 ), NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_DATA_TRUNCATION,
          { "Frsrpc Content Reason Data Truncation", "frsrpc.frsrpc_CommPktCoCmdContentCmd.FRSRPC_CONTENT_REASON_DATA_TRUNCATION", FT_BOOLEAN, 32, TFS(&frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_DATA_TRUNCATION_tfs), ( 0x00000004 ), NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_co_ext_win2k,
+         { "Co Ext Win2k", "frsrpc.frsrpc_CommPktChunkData.co_ext_win2k", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_file_size,
+         { "File Size", "frsrpc.frsrpc_CommPktChunkData.file_size", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_file_name_length,
          { "File Name Length", "frsrpc.frsrpc_CommPktChangeOrderCommand.file_name_length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChunkGuidName_guid_,
          { "Subcontext length", "frsrpc.frsrpc_CommPktChunkGuidName.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsSendCommPktReq_pkt_len,
          { "Pkt Len", "frsrpc.frsrpc_FrsSendCommPktReq.pkt_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_join_guid_,
+         { "Subcontext length", "frsrpc.frsrpc_CommPktChunkData.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderRecordExtension_major,
          { "Major", "frsrpc.frsrpc_CommPktChangeOrderRecordExtension.major", FT_UINT1632, BASE_DEC, VALS(frsrpc_frsrpc_CommPktCoRecordExtensionMajor_vals), 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoRecordExtensionWin2k_offset,
@@ -3924,6 +3922,10 @@ void proto_register_dcerpc_frsrpc(void)
          { "Prefix Type", "frsrpc.frsrpc_CommPktDataExtensionRetryTimeout.prefix_type", FT_UINT32, BASE_DEC, VALS(frsrpc_frsrpc_CommPktDataExtensionType_vals), 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_iflags,
          { "Iflags", "frsrpc.frsrpc_CommPktChangeOrderCommand.iflags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_command,
+         { "Command", "frsrpc.frsrpc_CommPktChunkData.command", FT_UINT32, BASE_DEC, VALS(frsrpc_frsrpc_CommPktCommand_vals), 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_co_guid,
+         { "Co Guid", "frsrpc.frsrpc_CommPktChunkData.co_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_FILE_DELETE,
          { "Frsrpc Content Reason File Delete", "frsrpc.frsrpc_CommPktCoCmdContentCmd.FRSRPC_CONTENT_REASON_FILE_DELETE", FT_BOOLEAN, 32, TFS(&frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_FILE_DELETE_tfs), ( 0x00000200 ), NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsSendCommPktReq_major,
@@ -3932,24 +3934,30 @@ void proto_register_dcerpc_frsrpc(void)
          { "Offset Last", "frsrpc.frsrpc_CommPktCoRecordExtensionWin2k.offset_last", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderRecordExtension_offset1,
          { "Offset1", "frsrpc.frsrpc_CommPktChangeOrderRecordExtension.offset1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_vvector,
+         { "Vvector", "frsrpc.frsrpc_CommPktChunkData.vvector", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_file_size,
          { "File Size", "frsrpc.frsrpc_CommPktChangeOrderCommand.file_size", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsStartPromotionParent_connection_name,
          { "Connection Name", "frsrpc.frsrpc_FrsStartPromotionParent.connection_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_co_sequnence_number,
+         { "Co Sequnence Number", "frsrpc.frsrpc_CommPktChunkData.co_sequnence_number", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_from,
+         { "From", "frsrpc.frsrpc_CommPktChunkData.from", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_SKIP_ORIG_REC_C,
          { "Frsrpc Co Flag Skip Orig Rec C", "frsrpc.frsrpc_CommPktCoCmdFlags.FRSRPC_CO_FLAG_SKIP_ORIG_REC_C", FT_BOOLEAN, 32, TFS(&frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_SKIP_ORIG_REC_C_tfs), ( 0x00100000 ), NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChunkCtr_num_chunks,
          { "Num Chunks", "frsrpc.frsrpc_CommPktChunkCtr.num_chunks", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_change_order_guid,
          { "Change Order Guid", "frsrpc.frsrpc_CommPktChangeOrderCommand.change_order_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_compression_guid,
+         { "Compression Guid", "frsrpc.frsrpc_CommPktChunkData.compression_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_old_parent_guid,
          { "Old Parent Guid", "frsrpc.frsrpc_CommPktChangeOrderCommand.old_parent_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsStartPromotionParent_parent_account,
          { "Parent Account", "frsrpc.frsrpc_FrsStartPromotionParent.parent_account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktGSVN_vsn,
          { "Vsn", "frsrpc.frsrpc_CommPktGSVN.vsn", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_VERSION_GUID_replica_version_guid,
-         { "Replica Version Guid", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_VERSION_GUID.replica_version_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderRecordExtension_field_size,
          { "Field Size", "frsrpc.frsrpc_CommPktChangeOrderRecordExtension.field_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_partern_ack_sequence_number,
@@ -3966,10 +3974,10 @@ void proto_register_dcerpc_frsrpc(void)
          { "File Offset", "frsrpc.frsrpc_CommPktChangeOrderCommand.file_offset", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_spare1guid_p2,
          { "Spare1guid P2", "frsrpc.frsrpc_CommPktChangeOrderCommand.spare1guid_p2", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_SEQUENCE_NUMBER_co_sequnence_number,
-         { "Co Sequnence Number", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_SEQUENCE_NUMBER.co_sequnence_number", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsSendCommPktReq_upk_len,
          { "Upk Len", "frsrpc.frsrpc_FrsSendCommPktReq.upk_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_blob,
+         { "Blob", "frsrpc.frsrpc_CommPktChunkData.blob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_SECURITY_CHANGE,
          { "Frsrpc Content Reason Security Change", "frsrpc.frsrpc_CommPktCoCmdContentCmd.FRSRPC_CONTENT_REASON_SECURITY_CHANGE", FT_BOOLEAN, 32, TFS(&frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_SECURITY_CHANGE_tfs), ( 0x00000800 ), NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_file_version_number,
@@ -3988,92 +3996,96 @@ void proto_register_dcerpc_frsrpc(void)
          { "Windows Error", "frsrpc.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsStartPromotionParent_partner_guid_,
          { "Subcontext length", "frsrpc.frsrpc_FrsStartPromotionParent.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_join_guid,
+         { "Join Guid", "frsrpc.frsrpc_CommPktChunkData.join_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsVerifyPromotionParent___ndr_guid_size,
          { "  Ndr Guid Size", "frsrpc.frsrpc_FrsVerifyPromotionParent.__ndr_guid_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsSendCommPktReq_data_handle,
          { "Data Handle", "frsrpc.frsrpc_FrsSendCommPktReq.data_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_GUID_co_guid_,
-         { "Subcontext length", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_GUID.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BLOCK_SIZE_block_size,
-         { "Block Size", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BLOCK_SIZE.block_size", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_content_cmd,
          { "Content Cmd", "frsrpc.frsrpc_CommPktChangeOrderCommand.content_cmd", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsStartPromotionParent_partner_name,
          { "Partner Name", "frsrpc.frsrpc_FrsStartPromotionParent.partner_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsSendCommPktReq_cs_id,
          { "Cs Id", "frsrpc.frsrpc_FrsSendCommPktReq.cs_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_TIME_join_time,
-         { "Join Time", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_TIME.join_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderRecordExtension_data_checksum,
          { "Data Checksum", "frsrpc.frsrpc_CommPktChangeOrderRecordExtension.data_checksum", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChunkGuidName_name_,
          { "Subcontext length", "frsrpc.frsrpc_CommPktChunkGuidName.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_remote_co,
+         { "Remote Co", "frsrpc.frsrpc_CommPktChunkData.remote_co", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_co_extension2,
+         { "Co Extension2", "frsrpc.frsrpc_CommPktChunkData.co_extension2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_spare2guid_p1,
          { "Spare2guid P1", "frsrpc.frsrpc_CommPktChangeOrderCommand.spare2guid_p1", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsStartPromotionParent___ndr_guid_size,
          { "  Ndr Guid Size", "frsrpc.frsrpc_FrsStartPromotionParent.__ndr_guid_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_LAST_JOIN_TIME_last_join_time,
-         { "Last Join Time", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_LAST_JOIN_TIME.last_join_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_gvsn_,
+         { "Subcontext length", "frsrpc.frsrpc_CommPktChunkData.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_replica_version_guid,
+         { "Replica Version Guid", "frsrpc.frsrpc_CommPktChunkData.replica_version_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_block_size,
+         { "Block Size", "frsrpc.frsrpc_CommPktChunkData.block_size", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChunkGuidName_name,
          { "Name", "frsrpc.frsrpc_CommPktChunkGuidName.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_not_used,
          { "Not Used", "frsrpc.frsrpc_CommPktChangeOrderCommand.not_used", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FILE_OFFSET_file_offset,
-         { "File Offset", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FILE_OFFSET.file_offset", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_vvector_,
+         { "Subcontext length", "frsrpc.frsrpc_CommPktChunkData.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_bop,
+         { "Bop", "frsrpc.frsrpc_CommPktChunkData.bop", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderRecordExtension_offset0,
          { "Offset0", "frsrpc.frsrpc_CommPktChangeOrderRecordExtension.offset0", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_file_offset,
+         { "File Offset", "frsrpc.frsrpc_CommPktChunkData.file_offset", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_padding1,
          { "Padding1", "frsrpc.frsrpc_CommPktChangeOrderCommand.padding1", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_co_ext_win2k_,
+         { "Subcontext length", "frsrpc.frsrpc_CommPktChunkData.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_bopend,
+         { "Bopend", "frsrpc.frsrpc_CommPktChunkData.bopend", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_LOCATION_CMD,
          { "Frsrpc Co Flag Location Cmd", "frsrpc.frsrpc_CommPktCoCmdFlags.FRSRPC_CO_FLAG_LOCATION_CMD", FT_BOOLEAN, 32, TFS(&frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_LOCATION_CMD_tfs), ( 0x00000008 ), NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_NAMED_DATA_EXTEND,
          { "Frsrpc Content Reason Named Data Extend", "frsrpc.frsrpc_CommPktCoCmdContentCmd.FRSRPC_CONTENT_REASON_NAMED_DATA_EXTEND", FT_BOOLEAN, 32, TFS(&frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_NAMED_DATA_EXTEND_tfs), ( 0x00000020 ), NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_VVECTOR_vvector,
-         { "Vvector", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_VVECTOR.vvector", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktDataExtensionRetryTimeout_count,
          { "Count", "frsrpc.frsrpc_CommPktDataExtensionRetryTimeout.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChunkGuidName_guid,
          { "Guid", "frsrpc.frsrpc_CommPktChunkGuidName.guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_last_join_time,
+         { "Last Join Time", "frsrpc.frsrpc_CommPktChunkData.last_join_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_co_guid_,
+         { "Subcontext length", "frsrpc.frsrpc_CommPktChunkData.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChunk_type,
          { "Type", "frsrpc.frsrpc_CommPktChunk.type", FT_UINT1632, BASE_DEC, VALS(frsrpc_frsrpc_CommPktChunkType_vals), 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_connection_guid,
          { "Connection Guid", "frsrpc.frsrpc_CommPktChangeOrderCommand.connection_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsSendCommPktReq_data_name,
          { "Data Name", "frsrpc.frsrpc_FrsSendCommPktReq.data_name", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REMOTE_CO_remote_co_,
-         { "Subcontext length", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REMOTE_CO.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_GUID_join_guid,
-         { "Join Guid", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_GUID.join_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXTENTION_2_co_extension2,
-         { "Co Extension2", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXTENTION_2.co_extension2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_gvsn,
+         { "Gvsn", "frsrpc.frsrpc_CommPktChunkData.gvsn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_replica,
+         { "Replica", "frsrpc.frsrpc_CommPktChunkData.replica", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoRecordExtensionWin2k_offset_count,
          { "Offset Count", "frsrpc.frsrpc_CommPktCoRecordExtensionWin2k.offset_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_jrnl_usn,
          { "Jrnl Usn", "frsrpc.frsrpc_CommPktChangeOrderCommand.jrnl_usn", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_padding3,
          { "Padding3", "frsrpc.frsrpc_CommPktChangeOrderCommand.padding3", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K_co_ext_win2k_,
-         { "Subcontext length", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_TIME_join_time_,
-         { "Subcontext length", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_TIME.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FILE_SIZE_file_size,
-         { "File Size", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_FILE_SIZE.file_size", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsStartPromotionParent_partner_princ_name,
          { "Partner Princ Name", "frsrpc.frsrpc_FrsStartPromotionParent.partner_princ_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsVerifyPromotionParent_partner_auth_level,
          { "Partner Auth Level", "frsrpc.frsrpc_FrsVerifyPromotionParent.partner_auth_level", FT_UINT32, BASE_DEC, VALS(frsrpc_frsrpc_PartnerAuthLevel_vals), 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_EOP_bopend,
-         { "Bopend", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_EOP.bopend", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REMOTE_CO_remote_co,
-         { "Remote Co", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REMOTE_CO.remote_co", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_JUST_OID_RESET,
          { "Frsrpc Co Flag Just Oid Reset", "frsrpc.frsrpc_CommPktCoCmdFlags.FRSRPC_CO_FLAG_JUST_OID_RESET", FT_BOOLEAN, 32, TFS(&frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_JUST_OID_RESET_tfs), ( 0x00800000 ), NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_EA_CHANGE,
          { "Frsrpc Content Reason Ea Change", "frsrpc.frsrpc_CommPktCoCmdContentCmd.FRSRPC_CONTENT_REASON_EA_CHANGE", FT_BOOLEAN, 32, TFS(&frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_EA_CHANGE_tfs), ( 0x00000400 ), NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_block,
+         { "Block", "frsrpc.frsrpc_CommPktChunkData.block", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoCmdIFlags_FRSRPC_CO_IFLAG_VVRETIRE_EXEC,
          { "Frsrpc Co Iflag Vvretire Exec", "frsrpc.frsrpc_CommPktCoCmdIFlags.FRSRPC_CO_IFLAG_VVRETIRE_EXEC", FT_BOOLEAN, 32, TFS(&frsrpc_CommPktCoCmdIFlags_FRSRPC_CO_IFLAG_VVRETIRE_EXEC_tfs), ( 0x00000001 ), NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_TO_to,
-         { "To", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_TO.to", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_remote_co_,
+         { "Subcontext length", "frsrpc.frsrpc_CommPktChunkData.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_location_cmd,
          { "Location Cmd", "frsrpc.frsrpc_CommPktChangeOrderCommand.location_cmd", FT_UINT32, BASE_DEC, VALS(frsrpc_frsrpc_CommPktCoCmdLocationCmd_vals), 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoCmdIFlags_FRSRPC_CO_IFLAG_DIR_ENUM_PENDING,
@@ -4082,38 +4094,28 @@ void proto_register_dcerpc_frsrpc(void)
          { "Not Used", "frsrpc.frsrpc_CommPktChangeOrderRecordExtension.not_used", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_spare2ul1,
          { "Spare2ul1", "frsrpc.frsrpc_CommPktChangeOrderCommand.spare2ul1", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CONNECTION_connection,
-         { "Connection", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CONNECTION.connection", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_NAMED_DATA_OVERWRITE,
          { "Frsrpc Content Reason Named Data Overwrite", "frsrpc.frsrpc_CommPktCoCmdContentCmd.FRSRPC_CONTENT_REASON_NAMED_DATA_OVERWRITE", FT_BOOLEAN, 32, TFS(&frsrpc_CommPktCoCmdContentCmd_FRSRPC_CONTENT_REASON_NAMED_DATA_OVERWRITE_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_frsrpc_opnum,
          { "Operation", "frsrpc.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K_co_ext_win2k,
-         { "Co Ext Win2k", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K.co_ext_win2k", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_join_time_,
+         { "Subcontext length", "frsrpc.frsrpc_CommPktChunkData.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_NEW_FILE,
          { "Frsrpc Co Flag New File", "frsrpc.frsrpc_CommPktCoCmdFlags.FRSRPC_CO_FLAG_NEW_FILE", FT_BOOLEAN, 32, TFS(&frsrpc_CommPktCoCmdFlags_FRSRPC_CO_FLAG_NEW_FILE_tfs), ( 0x00000400 ), NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valdefault_blob,
-         { "Blob", "frsrpc.frsrpc_CommPktChunkData_valdefault.blob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_GUID_co_guid,
-         { "Co Guid", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_CO_GUID.co_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_spare2bin,
          { "Spare2bin", "frsrpc.frsrpc_CommPktChangeOrderCommand.spare2bin", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktCoRecordExtensionWin2k_field_size,
          { "Field Size", "frsrpc.frsrpc_CommPktCoRecordExtensionWin2k.field_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_frs_vsn,
          { "Frs Vsn", "frsrpc.frsrpc_CommPktChangeOrderCommand.frs_vsn", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_GUID_join_guid_,
-         { "Subcontext length", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_JOIN_GUID.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BLOCK_block,
-         { "Block", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BLOCK.block", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsSendCommPktReq_ctr,
          { "Ctr", "frsrpc.frsrpc_FrsSendCommPktReq.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_connection,
+         { "Connection", "frsrpc.frsrpc_CommPktChunkData.connection", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderRecordExtension_offset_count,
          { "Offset Count", "frsrpc.frsrpc_CommPktChangeOrderRecordExtension.offset_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderRecordExtension_data_retry_timeout,
          { "Data Retry Timeout", "frsrpc.frsrpc_CommPktChangeOrderRecordExtension.data_retry_timeout", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_GVSN_gvsn_,
-         { "Subcontext length", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_GVSN.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_FrsStartPromotionParent_replica_set_name,
          { "Replica Set Name", "frsrpc.frsrpc_FrsStartPromotionParent.replica_set_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_event_time,
@@ -4148,10 +4150,8 @@ void proto_register_dcerpc_frsrpc(void)
          { "Replica Set Type", "frsrpc.frsrpc_FrsStartPromotionParent.replica_set_type", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_flags,
          { "Flags", "frsrpc.frsrpc_CommPktChangeOrderCommand.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BOP_bop,
-         { "Bop", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_BOP.bop", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_frsrpc_frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_VERSION_GUID_replica_version_guid_,
-         { "Subcontext length", "frsrpc.frsrpc_CommPktChunkData_valFRSRPC_COMM_PKT_CHUNK_REPLICA_VERSION_GUID.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_frsrpc_frsrpc_CommPktChunkData_join_time,
+         { "Join Time", "frsrpc.frsrpc_CommPktChunkData.join_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_spare1wcs,
          { "Spare1wcs", "frsrpc.frsrpc_CommPktChangeOrderCommand.spare1wcs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frsrpc_frsrpc_CommPktChangeOrderCommand_new_replica_num,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-frstrans.c b/bin/default/librpc/gen_ndr/packet-dcerpc-frstrans.c
index 7e77c871c45c309d5a613010f8c87a82d599d06a..365d081031f46e09fc0a00f43464eebb18426feb 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-frstrans.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-frstrans.c
@@ -67,15 +67,15 @@ static gint hf_frstrans_frstrans_RawGetFileDataAsync_server_context = -1;
 static gint hf_frstrans_frstrans_Update_name = -1;
 static gint hf_frstrans_frstrans_VersionVector_low = -1;
 static gint hf_frstrans_frstrans_AsyncVersionVectorResponse_version_vector_count = -1;
-static gint hf_frstrans_frstrans_RdcParameterUnion_valFRSTRANS_RDC_FILTER_POINT_filter_point = -1;
-static gint hf_frstrans_frstrans_RdcParameterUnion_valFRSTRANS_RDC_FILTER_GENERIC_filter_generic = -1;
 static gint hf_frstrans_frstrans_EstablishConnection_downstream_flags = -1;
 static gint hf_frstrans_frstrans_RdcParameterGeneric_chunker_parameters = -1;
 static gint hf_frstrans_frstrans_RdcFileInfo_compression_algorithm = -1;
 static gint hf_frstrans_frstrans_Update_flags = -1;
 static gint hf_frstrans_frstrans_EpoqueVector_machine_guid = -1;
 static gint hf_frstrans_frstrans_InitializeFileTransferAsync_connection_guid = -1;
+static gint hf_frstrans_frstrans_RdcParameterUnion_filter_point = -1;
 static gint hf_frstrans_frstrans_RdcParameterFilterMax_min_horizon_size = -1;
+static gint hf_frstrans_frstrans_RdcParameterUnion_filter_generic = -1;
 static gint hf_frstrans_frstrans_EpoqueVector_second = -1;
 static gint hf_frstrans_frstrans_RdcGetFileDataAsync_byte_pipe = -1;
 static gint hf_frstrans_frstrans_RdcFileInfo_rdc_filter_parameters = -1;
@@ -124,8 +124,8 @@ static gint hf_frstrans_frstrans_Update_attributes = -1;
 static gint hf_frstrans_frstrans_InitializeFileTransferAsync_buffer_size = -1;
 static gint hf_frstrans_frstrans_RequestVersionVector_vv_generation = -1;
 static gint hf_frstrans_frstrans_RequestUpdates_gvsn_version = -1;
+static gint hf_frstrans_frstrans_RdcParameterUnion_filter_max = -1;
 static gint hf_frstrans_frstrans_AsyncVersionVectorResponse_vv_generation = -1;
-static gint hf_frstrans_frstrans_RdcParameterUnion_valFRSTRANS_RDC_FILTER_MAX_filter_max = -1;
 static gint hf_frstrans_frstrans_InitializeFileTransferAsync_staging_policy = -1;
 static gint hf_frstrans_frstrans_RequestUpdates_gvsn_db_guid = -1;
 static gint hf_frstrans_frstrans_RequestUpdates_hash_requested = -1;
@@ -252,9 +252,9 @@ static int frstrans_dissect_element_RdcParameterFilterMax_min_horizon_size(tvbuf
 static int frstrans_dissect_element_RdcParameterFilterMax_max_window_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int frstrans_dissect_element_RdcParameterFilterPoint_min_chunk_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int frstrans_dissect_element_RdcParameterFilterPoint_max_chunk_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frstrans_dissect_element_RdcParameterUnion_valFRSTRANS_RDC_FILTER_GENERIC_filter_generic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frstrans_dissect_element_RdcParameterUnion_valFRSTRANS_RDC_FILTER_MAX_filter_max(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int frstrans_dissect_element_RdcParameterUnion_valFRSTRANS_RDC_FILTER_POINT_filter_point(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frstrans_dissect_element_RdcParameterUnion_filter_generic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frstrans_dissect_element_RdcParameterUnion_filter_max(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int frstrans_dissect_element_RdcParameterUnion_filter_point(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int frstrans_dissect_element_RdcParameters_rdc_chunker_algorithm(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *rdc_chunker_algorithm);
 static int frstrans_dissect_element_RdcParameters_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *rdc_chunker_algorithm);
 const value_string frstrans_frstrans_RdcVersion_vals[] = {
@@ -1340,25 +1340,25 @@ frstrans_dissect_struct_RdcParameterFilterPoint(tvbuff_t *tvb _U_, int offset _U
 /* IDL: } */
 
 static int
-frstrans_dissect_element_RdcParameterUnion_valFRSTRANS_RDC_FILTER_GENERIC_filter_generic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frstrans_dissect_element_RdcParameterUnion_filter_generic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = frstrans_dissect_struct_RdcParameterGeneric(tvb,offset,pinfo,tree,drep,hf_frstrans_frstrans_RdcParameterUnion_valFRSTRANS_RDC_FILTER_GENERIC_filter_generic,0);
+       offset = frstrans_dissect_struct_RdcParameterGeneric(tvb,offset,pinfo,tree,drep,hf_frstrans_frstrans_RdcParameterUnion_filter_generic,0);
 
        return offset;
 }
 
 static int
-frstrans_dissect_element_RdcParameterUnion_valFRSTRANS_RDC_FILTER_MAX_filter_max(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frstrans_dissect_element_RdcParameterUnion_filter_max(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = frstrans_dissect_struct_RdcParameterFilterMax(tvb,offset,pinfo,tree,drep,hf_frstrans_frstrans_RdcParameterUnion_valFRSTRANS_RDC_FILTER_MAX_filter_max,0);
+       offset = frstrans_dissect_struct_RdcParameterFilterMax(tvb,offset,pinfo,tree,drep,hf_frstrans_frstrans_RdcParameterUnion_filter_max,0);
 
        return offset;
 }
 
 static int
-frstrans_dissect_element_RdcParameterUnion_valFRSTRANS_RDC_FILTER_POINT_filter_point(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+frstrans_dissect_element_RdcParameterUnion_filter_point(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = frstrans_dissect_struct_RdcParameterFilterPoint(tvb,offset,pinfo,tree,drep,hf_frstrans_frstrans_RdcParameterUnion_valFRSTRANS_RDC_FILTER_POINT_filter_point,0);
+       offset = frstrans_dissect_struct_RdcParameterFilterPoint(tvb,offset,pinfo,tree,drep,hf_frstrans_frstrans_RdcParameterUnion_filter_point,0);
 
        return offset;
 }
@@ -1382,15 +1382,15 @@ frstrans_dissect_RdcParameterUnion(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 
        switch(level) {
                case FRSTRANS_RDC_FILTER_GENERIC:
-                       offset = frstrans_dissect_element_RdcParameterUnion_valFRSTRANS_RDC_FILTER_GENERIC_filter_generic(tvb, offset, pinfo, tree, drep);
+                       offset = frstrans_dissect_element_RdcParameterUnion_filter_generic(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSTRANS_RDC_FILTER_MAX:
-                       offset = frstrans_dissect_element_RdcParameterUnion_valFRSTRANS_RDC_FILTER_MAX_filter_max(tvb, offset, pinfo, tree, drep);
+                       offset = frstrans_dissect_element_RdcParameterUnion_filter_max(tvb, offset, pinfo, tree, drep);
                break;
 
                case FRSTRANS_RDC_FILTER_POINT:
-                       offset = frstrans_dissect_element_RdcParameterUnion_valFRSTRANS_RDC_FILTER_POINT_filter_point(tvb, offset, pinfo, tree, drep);
+                       offset = frstrans_dissect_element_RdcParameterUnion_filter_point(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -2772,10 +2772,6 @@ void proto_register_dcerpc_frstrans(void)
          { "Low", "frstrans.frstrans_VersionVector.low", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frstrans_frstrans_AsyncVersionVectorResponse_version_vector_count,
          { "Version Vector Count", "frstrans.frstrans_AsyncVersionVectorResponse.version_vector_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_frstrans_frstrans_RdcParameterUnion_valFRSTRANS_RDC_FILTER_POINT_filter_point,
-         { "Filter Point", "frstrans.frstrans_RdcParameterUnion_valFRSTRANS_RDC_FILTER_POINT.filter_point", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_frstrans_frstrans_RdcParameterUnion_valFRSTRANS_RDC_FILTER_GENERIC_filter_generic,
-         { "Filter Generic", "frstrans.frstrans_RdcParameterUnion_valFRSTRANS_RDC_FILTER_GENERIC.filter_generic", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frstrans_frstrans_EstablishConnection_downstream_flags,
          { "Downstream Flags", "frstrans.frstrans_EstablishConnection.downstream_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_frstrans_frstrans_RdcParameterGeneric_chunker_parameters,
@@ -2788,8 +2784,12 @@ void proto_register_dcerpc_frstrans(void)
          { "Machine Guid", "frstrans.frstrans_EpoqueVector.machine_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frstrans_frstrans_InitializeFileTransferAsync_connection_guid,
          { "Connection Guid", "frstrans.frstrans_InitializeFileTransferAsync.connection_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_frstrans_frstrans_RdcParameterUnion_filter_point,
+         { "Filter Point", "frstrans.frstrans_RdcParameterUnion.filter_point", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frstrans_frstrans_RdcParameterFilterMax_min_horizon_size,
          { "Min Horizon Size", "frstrans.frstrans_RdcParameterFilterMax.min_horizon_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_frstrans_frstrans_RdcParameterUnion_filter_generic,
+         { "Filter Generic", "frstrans.frstrans_RdcParameterUnion.filter_generic", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frstrans_frstrans_EpoqueVector_second,
          { "Second", "frstrans.frstrans_EpoqueVector.second", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frstrans_frstrans_RdcGetFileDataAsync_byte_pipe,
@@ -2886,10 +2886,10 @@ void proto_register_dcerpc_frstrans(void)
          { "Vv Generation", "frstrans.frstrans_RequestVersionVector.vv_generation", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_frstrans_frstrans_RequestUpdates_gvsn_version,
          { "Gvsn Version", "frstrans.frstrans_RequestUpdates.gvsn_version", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_frstrans_frstrans_RdcParameterUnion_filter_max,
+         { "Filter Max", "frstrans.frstrans_RdcParameterUnion.filter_max", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frstrans_frstrans_AsyncVersionVectorResponse_vv_generation,
          { "Vv Generation", "frstrans.frstrans_AsyncVersionVectorResponse.vv_generation", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_frstrans_frstrans_RdcParameterUnion_valFRSTRANS_RDC_FILTER_MAX_filter_max,
-         { "Filter Max", "frstrans.frstrans_RdcParameterUnion_valFRSTRANS_RDC_FILTER_MAX.filter_max", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_frstrans_frstrans_InitializeFileTransferAsync_staging_policy,
          { "Staging Policy", "frstrans.frstrans_InitializeFileTransferAsync.staging_policy", FT_UINT1632, BASE_DEC, VALS(frstrans_frstrans_RequestedStagingPolicy_vals), 0, NULL, HFILL }},
        { &hf_frstrans_frstrans_RequestUpdates_gvsn_db_guid,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-fsrvp.c b/bin/default/librpc/gen_ndr/packet-dcerpc-fsrvp.c
index 54ac0fbb6503ecf563285ecc91b39275807e5378..103c4cb1f8e6c7240f2410c850a044057b547725 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-fsrvp.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-fsrvp.c
@@ -40,7 +40,6 @@ static gint hf_FileServerVssAgent_fss_ExposeShadowCopySet_ShadowCopySetId = -1;
 static gint hf_FileServerVssAgent_fss_IsPathShadowCopied_ShadowCopyPresent = -1;
 static gint hf_FileServerVssAgent_fss_AddToShadowCopySet_ClientShadowCopyId = -1;
 static gint hf_FileServerVssAgent_fss_GetSupportedVersion_magic = -1;
-static gint hf_FileServerVssAgent_fssagent_share_mapping_val1_ShareMapping1 = -1;
 static gint hf_FileServerVssAgent_fssagent_share_mapping_1_ShadowCopyId = -1;
 static gint hf_FileServerVssAgent_fssagent_share_mapping_1_ShadowCopyShareName = -1;
 static gint hf_FileServerVssAgent_fss_AddToShadowCopySet_ShadowCopySetId = -1;
@@ -52,6 +51,7 @@ static gint hf_FileServerVssAgent_fss_IsPathSupported_ShareName = -1;
 static gint hf_FileServerVssAgent_fss_SetContext_Context = -1;
 static gint hf_FileServerVssAgent_fss_CommitShadowCopySet_TimeOutInMilliseconds = -1;
 static gint hf_FileServerVssAgent_fssagent_share_mapping_1_ShareNameUNC = -1;
+static gint hf_FileServerVssAgent_fssagent_share_mapping_ShareMapping1 = -1;
 static gint hf_FileServerVssAgent_fss_GetShareMapping_ShareMapping = -1;
 static gint hf_FileServerVssAgent_fss_RecoveryCompleteShadowCopySet_ShadowCopySetId = -1;
 static gint hf_FileServerVssAgent_fss_AddToShadowCopySet_pShadowCopyId = -1;
@@ -94,8 +94,8 @@ static int FileServerVssAgent_dissect_element_fssagent_share_mapping_1_ShareName
 static int FileServerVssAgent_dissect_element_fssagent_share_mapping_1_ShadowCopyShareName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int FileServerVssAgent_dissect_element_fssagent_share_mapping_1_ShadowCopyShareName_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int FileServerVssAgent_dissect_element_fssagent_share_mapping_1_tstamp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int FileServerVssAgent_dissect_element_fssagent_share_mapping_val1_ShareMapping1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int FileServerVssAgent_dissect_element_fssagent_share_mapping_val1_ShareMapping1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int FileServerVssAgent_dissect_element_fssagent_share_mapping_ShareMapping1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int FileServerVssAgent_dissect_element_fssagent_share_mapping_ShareMapping1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int FileServerVssAgent_dissect_element_fss_GetSupportedVersion_magic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int FileServerVssAgent_dissect_element_fss_GetSupportedVersion_magic_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int FileServerVssAgent_dissect_element_fss_GetSupportedVersion_MinVersion(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -263,17 +263,17 @@ FileServerVssAgent_dissect_struct_fssagent_share_mapping_1(tvbuff_t *tvb _U_, in
 /* IDL: } */
 
 static int
-FileServerVssAgent_dissect_element_fssagent_share_mapping_val1_ShareMapping1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+FileServerVssAgent_dissect_element_fssagent_share_mapping_ShareMapping1(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, FileServerVssAgent_dissect_element_fssagent_share_mapping_val1_ShareMapping1_, NDR_POINTER_UNIQUE, "Pointer to Sharemapping1 (fssagent_share_mapping_1)",hf_FileServerVssAgent_fssagent_share_mapping_val1_ShareMapping1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, FileServerVssAgent_dissect_element_fssagent_share_mapping_ShareMapping1_, NDR_POINTER_UNIQUE, "Pointer to Sharemapping1 (fssagent_share_mapping_1)",hf_FileServerVssAgent_fssagent_share_mapping_ShareMapping1);
 
        return offset;
 }
 
 static int
-FileServerVssAgent_dissect_element_fssagent_share_mapping_val1_ShareMapping1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+FileServerVssAgent_dissect_element_fssagent_share_mapping_ShareMapping1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = FileServerVssAgent_dissect_struct_fssagent_share_mapping_1(tvb,offset,pinfo,tree,drep,hf_FileServerVssAgent_fssagent_share_mapping_val1_ShareMapping1,0);
+       offset = FileServerVssAgent_dissect_struct_fssagent_share_mapping_1(tvb,offset,pinfo,tree,drep,hf_FileServerVssAgent_fssagent_share_mapping_ShareMapping1,0);
 
        return offset;
 }
@@ -297,7 +297,7 @@ FileServerVssAgent_dissect_fssagent_share_mapping(tvbuff_t *tvb _U_, int offset
 
        switch(level) {
                case 1:
-                       offset = FileServerVssAgent_dissect_element_fssagent_share_mapping_val1_ShareMapping1(tvb, offset, pinfo, tree, drep);
+                       offset = FileServerVssAgent_dissect_element_fssagent_share_mapping_ShareMapping1(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -1185,8 +1185,6 @@ void proto_register_dcerpc_FileServerVssAgent(void)
          { "Clientshadowcopyid", "FileServerVssAgent.fss_AddToShadowCopySet.ClientShadowCopyId", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_FileServerVssAgent_fss_GetSupportedVersion_magic,
          { "Magic", "FileServerVssAgent.fss_GetSupportedVersion.magic", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_FileServerVssAgent_fssagent_share_mapping_val1_ShareMapping1,
-         { "Sharemapping1", "FileServerVssAgent.fssagent_share_mapping_val1.ShareMapping1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_FileServerVssAgent_fssagent_share_mapping_1_ShadowCopyId,
          { "Shadowcopyid", "FileServerVssAgent.fssagent_share_mapping_1.ShadowCopyId", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_FileServerVssAgent_fssagent_share_mapping_1_ShadowCopyShareName,
@@ -1209,6 +1207,8 @@ void proto_register_dcerpc_FileServerVssAgent(void)
          { "Timeoutinmilliseconds", "FileServerVssAgent.fss_CommitShadowCopySet.TimeOutInMilliseconds", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_FileServerVssAgent_fssagent_share_mapping_1_ShareNameUNC,
          { "Sharenameunc", "FileServerVssAgent.fssagent_share_mapping_1.ShareNameUNC", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_FileServerVssAgent_fssagent_share_mapping_ShareMapping1,
+         { "Sharemapping1", "FileServerVssAgent.fssagent_share_mapping.ShareMapping1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_FileServerVssAgent_fss_GetShareMapping_ShareMapping,
          { "Sharemapping", "FileServerVssAgent.fss_GetShareMapping.ShareMapping", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_FileServerVssAgent_fss_RecoveryCompleteShadowCopySet_ShadowCopySetId,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-krb5pac.c b/bin/default/librpc/gen_ndr/packet-dcerpc-krb5pac.c
index 2b9ce6a3f2419684774e8886366baf1db5aabc28..93f8f397fc7018c86b60a162fe8e5ba925049c0a 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-krb5pac.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-krb5pac.c
@@ -49,18 +49,18 @@ static gint ett_krb5pac_netsamlogoncache_entry = -1;
 
 /* Header field declarations */
 static gint hf_krb5pac_PAC_LOGON_INFO_res_group_dom_sid = -1;
-static gint hf_krb5pac_PAC_INFO_valPAC_TYPE_CONSTRAINED_DELEGATION_constrained_delegation_ = -1;
 static gint hf_krb5pac_PAC_LOGON_INFO_info3 = -1;
 static gint hf_krb5pac_PAC_Validate_MessageType = -1;
+static gint hf_krb5pac_PAC_INFO_logon_info_ = -1;
 static gint hf_krb5pac_PAC_UNKNOWN_12_upn_name = -1;
-static gint hf_krb5pac_PAC_INFO_valPAC_TYPE_KDC_CHECKSUM_kdc_cksum = -1;
 static gint hf_krb5pac_PAC_UNKNOWN_12_domain_size = -1;
+static gint hf_krb5pac_PAC_INFO_unknown_ = -1;
 static gint hf_krb5pac_PAC_BUFFER__pad = -1;
+static gint hf_krb5pac_PAC_INFO_kdc_cksum = -1;
 static gint hf_krb5pac_PAC_UNKNOWN_12_domain_name = -1;
 static gint hf_krb5pac_PAC_UNKNOWN_12_domain_offset = -1;
 static gint hf_krb5pac_PAC_SIGNATURE_DATA_signature = -1;
 static gint hf_krb5pac_PAC_UNKNOWN_12_upn_size = -1;
-static gint hf_krb5pac_PAC_INFO_valPAC_TYPE_CONSTRAINED_DELEGATION_constrained_delegation = -1;
 static gint hf_krb5pac_opnum = -1;
 static gint hf_krb5pac_PAC_LOGON_NAME_size = -1;
 static gint hf_krb5pac_decode_login_info_logon_info = -1;
@@ -72,36 +72,36 @@ static gint hf_krb5pac_PAC_BUFFER_RAW_ndr_size = -1;
 static gint hf_krb5pac_PAC_CONSTRAINED_DELEGATION_num_transited_services = -1;
 static gint hf_krb5pac_PAC_CONSTRAINED_DELEGATION_transited_services = -1;
 static gint hf_krb5pac_PAC_BUFFER_type = -1;
+static gint hf_krb5pac_PAC_INFO_logon_info = -1;
 static gint hf_krb5pac_PAC_CONSTRAINED_DELEGATION_proxy_target = -1;
+static gint hf_krb5pac_PAC_INFO_logon_name = -1;
 static gint hf_krb5pac_PAC_UNKNOWN_12_unknown6 = -1;
 static gint hf_krb5pac_PAC_UNKNOWN_12_unknown5 = -1;
-static gint hf_krb5pac_PAC_INFO_valdefault_unknown_ = -1;
 static gint hf_krb5pac_PAC_LOGON_NAME_logon_time = -1;
 static gint hf_krb5pac_decode_pac_raw_pac = -1;
+static gint hf_krb5pac_PAC_INFO_unknown = -1;
 static gint hf_krb5pac_PAC_BUFFER__ndr_size = -1;
 static gint hf_krb5pac_PAC_LOGON_INFO_res_groups = -1;
 static gint hf_krb5pac_PAC_UNKNOWN_12_unknown3 = -1;
 static gint hf_krb5pac_PAC_UNKNOWN_12_upn_offset = -1;
 static gint hf_krb5pac_PAC_Validate_ChecksumAndSignature = -1;
 static gint hf_krb5pac_decode_login_info_ctr_logon_info_ctr = -1;
-static gint hf_krb5pac_PAC_INFO_valdefault_unknown = -1;
+static gint hf_krb5pac_PAC_INFO_constrained_delegation = -1;
+static gint hf_krb5pac_PAC_INFO_constrained_delegation_ = -1;
 static gint hf_krb5pac_PAC_CONSTRAINED_DELEGATION_CTR_info = -1;
-static gint hf_krb5pac_PAC_INFO_valPAC_TYPE_LOGON_INFO_logon_info_ = -1;
 static gint hf_krb5pac_PAC_BUFFER_info = -1;
 static gint hf_krb5pac_netsamlogoncache_entry_info3 = -1;
 static gint hf_krb5pac_PAC_Validate_SignatureType = -1;
 static gint hf_krb5pac_PAC_DATA_num_buffers = -1;
 static gint hf_krb5pac_PAC_BUFFER_RAW__pad = -1;
 static gint hf_krb5pac_PAC_BUFFER_RAW_info = -1;
-static gint hf_krb5pac_PAC_INFO_valPAC_TYPE_SRV_CHECKSUM_srv_cksum = -1;
-static gint hf_krb5pac_PAC_INFO_valPAC_TYPE_LOGON_NAME_logon_name = -1;
 static gint hf_krb5pac_PAC_LOGON_NAME_account_name = -1;
 static gint hf_krb5pac_PAC_Validate_ChecksumLength = -1;
 static gint hf_krb5pac_PAC_UNKNOWN_12_unknown4 = -1;
+static gint hf_krb5pac_PAC_INFO_srv_cksum = -1;
 static gint hf_krb5pac_netsamlogoncache_entry_timestamp = -1;
 static gint hf_krb5pac_PAC_DATA_RAW_buffers = -1;
 static gint hf_krb5pac_PAC_SIGNATURE_DATA_type = -1;
-static gint hf_krb5pac_PAC_INFO_valPAC_TYPE_LOGON_INFO_logon_info = -1;
 static gint hf_krb5pac_decode_pac_pac = -1;
 static gint hf_krb5pac_PAC_Validate_SignatureLength = -1;
 static gint hf_krb5pac_PAC_DATA_RAW_num_buffers = -1;
@@ -162,15 +162,15 @@ const value_string krb5pac_PAC_TYPE_vals[] = {
 { 0, NULL }
 };
 static int krb5pac_dissect_element_DATA_BLOB_REM_remaining(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_LOGON_INFO_logon_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_LOGON_INFO_logon_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_SRV_CHECKSUM_srv_cksum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_KDC_CHECKSUM_kdc_cksum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_LOGON_NAME_logon_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_CONSTRAINED_DELEGATION_constrained_delegation(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_CONSTRAINED_DELEGATION_constrained_delegation_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int krb5pac_dissect_element_PAC_INFO_valdefault_unknown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int krb5pac_dissect_element_PAC_INFO_valdefault_unknown_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int krb5pac_dissect_element_PAC_INFO_logon_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int krb5pac_dissect_element_PAC_INFO_logon_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int krb5pac_dissect_element_PAC_INFO_srv_cksum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int krb5pac_dissect_element_PAC_INFO_kdc_cksum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int krb5pac_dissect_element_PAC_INFO_logon_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int krb5pac_dissect_element_PAC_INFO_constrained_delegation(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int krb5pac_dissect_element_PAC_INFO_constrained_delegation_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int krb5pac_dissect_element_PAC_INFO_unknown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int krb5pac_dissect_element_PAC_INFO_unknown_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int krb5pac_dissect_element_PAC_BUFFER_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *type);
 static int krb5pac_dissect_element_PAC_BUFFER__ndr_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int krb5pac_dissect_element_PAC_BUFFER_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *type);
@@ -820,7 +820,7 @@ krb5pac_dissect_struct_DATA_BLOB_REM(tvbuff_t *tvb _U_, int offset _U_, packet_i
 /* IDL: } */
 
 static int
-krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_LOGON_INFO_logon_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+krb5pac_dissect_element_PAC_INFO_logon_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint0 size;
@@ -829,10 +829,10 @@ krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_LOGON_INFO_logon_info(tvbuff_t *tvb
 
        if (!conformant) {
                guint32 saved_flags = di->call_data->flags;
-               offset = dissect_ndr_uint0(tvb, offset, pinfo, tree, drep, hf_krb5pac_PAC_INFO_valPAC_TYPE_LOGON_INFO_logon_info_, &size);
+               offset = dissect_ndr_uint0(tvb, offset, pinfo, tree, drep, hf_krb5pac_PAC_INFO_logon_info_, &size);
                di->call_data->flags &= ~DCERPC_IS_NDR64;
                subtvb = tvb_new_subset(tvb, offset, size, -1);
-               krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_LOGON_INFO_logon_info_(subtvb, 0, pinfo, tree, drep);
+               krb5pac_dissect_element_PAC_INFO_logon_info_(subtvb, 0, pinfo, tree, drep);
                offset += size;
                di->call_data->flags = saved_flags;
        }
@@ -841,39 +841,39 @@ krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_LOGON_INFO_logon_info(tvbuff_t *tvb
 }
 
 static int
-krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_LOGON_INFO_logon_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+krb5pac_dissect_element_PAC_INFO_logon_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = krb5pac_dissect_struct_PAC_LOGON_INFO_CTR(tvb,offset,pinfo,tree,drep,hf_krb5pac_PAC_INFO_valPAC_TYPE_LOGON_INFO_logon_info,0);
+       offset = krb5pac_dissect_struct_PAC_LOGON_INFO_CTR(tvb,offset,pinfo,tree,drep,hf_krb5pac_PAC_INFO_logon_info,0);
 
        return offset;
 }
 
 static int
-krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_SRV_CHECKSUM_srv_cksum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+krb5pac_dissect_element_PAC_INFO_srv_cksum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = krb5pac_dissect_struct_PAC_SIGNATURE_DATA(tvb,offset,pinfo,tree,drep,hf_krb5pac_PAC_INFO_valPAC_TYPE_SRV_CHECKSUM_srv_cksum,0);
+       offset = krb5pac_dissect_struct_PAC_SIGNATURE_DATA(tvb,offset,pinfo,tree,drep,hf_krb5pac_PAC_INFO_srv_cksum,0);
 
        return offset;
 }
 
 static int
-krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_KDC_CHECKSUM_kdc_cksum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+krb5pac_dissect_element_PAC_INFO_kdc_cksum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = krb5pac_dissect_struct_PAC_SIGNATURE_DATA(tvb,offset,pinfo,tree,drep,hf_krb5pac_PAC_INFO_valPAC_TYPE_KDC_CHECKSUM_kdc_cksum,0);
+       offset = krb5pac_dissect_struct_PAC_SIGNATURE_DATA(tvb,offset,pinfo,tree,drep,hf_krb5pac_PAC_INFO_kdc_cksum,0);
 
        return offset;
 }
 
 static int
-krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_LOGON_NAME_logon_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+krb5pac_dissect_element_PAC_INFO_logon_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = krb5pac_dissect_struct_PAC_LOGON_NAME(tvb,offset,pinfo,tree,drep,hf_krb5pac_PAC_INFO_valPAC_TYPE_LOGON_NAME_logon_name,0);
+       offset = krb5pac_dissect_struct_PAC_LOGON_NAME(tvb,offset,pinfo,tree,drep,hf_krb5pac_PAC_INFO_logon_name,0);
 
        return offset;
 }
 
 static int
-krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_CONSTRAINED_DELEGATION_constrained_delegation(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+krb5pac_dissect_element_PAC_INFO_constrained_delegation(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint0 size;
@@ -882,10 +882,10 @@ krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_CONSTRAINED_DELEGATION_constrained_
 
        if (!conformant) {
                guint32 saved_flags = di->call_data->flags;
-               offset = dissect_ndr_uint0(tvb, offset, pinfo, tree, drep, hf_krb5pac_PAC_INFO_valPAC_TYPE_CONSTRAINED_DELEGATION_constrained_delegation_, &size);
+               offset = dissect_ndr_uint0(tvb, offset, pinfo, tree, drep, hf_krb5pac_PAC_INFO_constrained_delegation_, &size);
                di->call_data->flags &= ~DCERPC_IS_NDR64;
                subtvb = tvb_new_subset(tvb, offset, size, -1);
-               krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_CONSTRAINED_DELEGATION_constrained_delegation_(subtvb, 0, pinfo, tree, drep);
+               krb5pac_dissect_element_PAC_INFO_constrained_delegation_(subtvb, 0, pinfo, tree, drep);
                offset += size;
                di->call_data->flags = saved_flags;
        }
@@ -894,15 +894,15 @@ krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_CONSTRAINED_DELEGATION_constrained_
 }
 
 static int
-krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_CONSTRAINED_DELEGATION_constrained_delegation_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+krb5pac_dissect_element_PAC_INFO_constrained_delegation_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = krb5pac_dissect_struct_PAC_CONSTRAINED_DELEGATION_CTR(tvb,offset,pinfo,tree,drep,hf_krb5pac_PAC_INFO_valPAC_TYPE_CONSTRAINED_DELEGATION_constrained_delegation,0);
+       offset = krb5pac_dissect_struct_PAC_CONSTRAINED_DELEGATION_CTR(tvb,offset,pinfo,tree,drep,hf_krb5pac_PAC_INFO_constrained_delegation,0);
 
        return offset;
 }
 
 static int
-krb5pac_dissect_element_PAC_INFO_valdefault_unknown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+krb5pac_dissect_element_PAC_INFO_unknown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint0 size;
@@ -911,10 +911,10 @@ krb5pac_dissect_element_PAC_INFO_valdefault_unknown(tvbuff_t *tvb _U_, int offse
 
        if (!conformant) {
                guint32 saved_flags = di->call_data->flags;
-               offset = dissect_ndr_uint0(tvb, offset, pinfo, tree, drep, hf_krb5pac_PAC_INFO_valdefault_unknown_, &size);
+               offset = dissect_ndr_uint0(tvb, offset, pinfo, tree, drep, hf_krb5pac_PAC_INFO_unknown_, &size);
                di->call_data->flags &= ~DCERPC_IS_NDR64;
                subtvb = tvb_new_subset(tvb, offset, size, -1);
-               krb5pac_dissect_element_PAC_INFO_valdefault_unknown_(subtvb, 0, pinfo, tree, drep);
+               krb5pac_dissect_element_PAC_INFO_unknown_(subtvb, 0, pinfo, tree, drep);
                offset += size;
                di->call_data->flags = saved_flags;
        }
@@ -923,9 +923,9 @@ krb5pac_dissect_element_PAC_INFO_valdefault_unknown(tvbuff_t *tvb _U_, int offse
 }
 
 static int
-krb5pac_dissect_element_PAC_INFO_valdefault_unknown_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+krb5pac_dissect_element_PAC_INFO_unknown_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = krb5pac_dissect_struct_DATA_BLOB_REM(tvb,offset,pinfo,tree,drep,hf_krb5pac_PAC_INFO_valdefault_unknown,0);
+       offset = krb5pac_dissect_struct_DATA_BLOB_REM(tvb,offset,pinfo,tree,drep,hf_krb5pac_PAC_INFO_unknown,0);
 
        return offset;
 }
@@ -946,27 +946,27 @@ krb5pac_dissect_PAC_INFO(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _
 
        switch(level) {
                case PAC_TYPE_LOGON_INFO:
-                       offset = krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_LOGON_INFO_logon_info(tvb, offset, pinfo, tree, drep);
+                       offset = krb5pac_dissect_element_PAC_INFO_logon_info(tvb, offset, pinfo, tree, drep);
                break;
 
                case PAC_TYPE_SRV_CHECKSUM:
-                       offset = krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_SRV_CHECKSUM_srv_cksum(tvb, offset, pinfo, tree, drep);
+                       offset = krb5pac_dissect_element_PAC_INFO_srv_cksum(tvb, offset, pinfo, tree, drep);
                break;
 
                case PAC_TYPE_KDC_CHECKSUM:
-                       offset = krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_KDC_CHECKSUM_kdc_cksum(tvb, offset, pinfo, tree, drep);
+                       offset = krb5pac_dissect_element_PAC_INFO_kdc_cksum(tvb, offset, pinfo, tree, drep);
                break;
 
                case PAC_TYPE_LOGON_NAME:
-                       offset = krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_LOGON_NAME_logon_name(tvb, offset, pinfo, tree, drep);
+                       offset = krb5pac_dissect_element_PAC_INFO_logon_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case PAC_TYPE_CONSTRAINED_DELEGATION:
-                       offset = krb5pac_dissect_element_PAC_INFO_valPAC_TYPE_CONSTRAINED_DELEGATION_constrained_delegation(tvb, offset, pinfo, tree, drep);
+                       offset = krb5pac_dissect_element_PAC_INFO_constrained_delegation(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = krb5pac_dissect_element_PAC_INFO_valdefault_unknown(tvb, offset, pinfo, tree, drep);
+                       offset = krb5pac_dissect_element_PAC_INFO_unknown(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -1630,20 +1630,22 @@ void proto_register_dcerpc_krb5pac(void)
        static hf_register_info hf[] = {
        { &hf_krb5pac_PAC_LOGON_INFO_res_group_dom_sid,
          { "Res Group Dom Sid", "krb5pac.PAC_LOGON_INFO.res_group_dom_sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_krb5pac_PAC_INFO_valPAC_TYPE_CONSTRAINED_DELEGATION_constrained_delegation_,
-         { "Subcontext length", "krb5pac.PAC_INFO_valPAC_TYPE_CONSTRAINED_DELEGATION.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_LOGON_INFO_info3,
          { "Info3", "krb5pac.PAC_LOGON_INFO.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_Validate_MessageType,
          { "Messagetype", "krb5pac.PAC_Validate.MessageType", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_krb5pac_PAC_INFO_logon_info_,
+         { "Subcontext length", "krb5pac.PAC_INFO.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_UNKNOWN_12_upn_name,
          { "Upn Name", "krb5pac.PAC_UNKNOWN_12.upn_name", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_krb5pac_PAC_INFO_valPAC_TYPE_KDC_CHECKSUM_kdc_cksum,
-         { "Kdc Cksum", "krb5pac.PAC_INFO_valPAC_TYPE_KDC_CHECKSUM.kdc_cksum", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_UNKNOWN_12_domain_size,
          { "Domain Size", "krb5pac.PAC_UNKNOWN_12.domain_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_krb5pac_PAC_INFO_unknown_,
+         { "Subcontext length", "krb5pac.PAC_INFO.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_BUFFER__pad,
          { " Pad", "krb5pac.PAC_BUFFER._pad", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_krb5pac_PAC_INFO_kdc_cksum,
+         { "Kdc Cksum", "krb5pac.PAC_INFO.kdc_cksum", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_UNKNOWN_12_domain_name,
          { "Domain Name", "krb5pac.PAC_UNKNOWN_12.domain_name", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_UNKNOWN_12_domain_offset,
@@ -1652,8 +1654,6 @@ void proto_register_dcerpc_krb5pac(void)
          { "Signature", "krb5pac.PAC_SIGNATURE_DATA.signature", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_UNKNOWN_12_upn_size,
          { "Upn Size", "krb5pac.PAC_UNKNOWN_12.upn_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_krb5pac_PAC_INFO_valPAC_TYPE_CONSTRAINED_DELEGATION_constrained_delegation,
-         { "Constrained Delegation", "krb5pac.PAC_INFO_valPAC_TYPE_CONSTRAINED_DELEGATION.constrained_delegation", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_opnum,
          { "Operation", "krb5pac.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_LOGON_NAME_size,
@@ -1676,18 +1676,22 @@ void proto_register_dcerpc_krb5pac(void)
          { "Transited Services", "krb5pac.PAC_CONSTRAINED_DELEGATION.transited_services", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_BUFFER_type,
          { "Type", "krb5pac.PAC_BUFFER.type", FT_UINT32, BASE_DEC, VALS(krb5pac_PAC_TYPE_vals), 0, NULL, HFILL }},
+       { &hf_krb5pac_PAC_INFO_logon_info,
+         { "Logon Info", "krb5pac.PAC_INFO.logon_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_CONSTRAINED_DELEGATION_proxy_target,
          { "Proxy Target", "krb5pac.PAC_CONSTRAINED_DELEGATION.proxy_target", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_krb5pac_PAC_INFO_logon_name,
+         { "Logon Name", "krb5pac.PAC_INFO.logon_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_UNKNOWN_12_unknown6,
          { "Unknown6", "krb5pac.PAC_UNKNOWN_12.unknown6", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_UNKNOWN_12_unknown5,
          { "Unknown5", "krb5pac.PAC_UNKNOWN_12.unknown5", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_krb5pac_PAC_INFO_valdefault_unknown_,
-         { "Subcontext length", "krb5pac.PAC_INFO_valdefault.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_LOGON_NAME_logon_time,
          { "Logon Time", "krb5pac.PAC_LOGON_NAME.logon_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_decode_pac_raw_pac,
          { "Pac", "krb5pac.decode_pac_raw.pac", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_krb5pac_PAC_INFO_unknown,
+         { "Unknown", "krb5pac.PAC_INFO.unknown", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_BUFFER__ndr_size,
          { " Ndr Size", "krb5pac.PAC_BUFFER._ndr_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_LOGON_INFO_res_groups,
@@ -1700,12 +1704,12 @@ void proto_register_dcerpc_krb5pac(void)
          { "Checksumandsignature", "krb5pac.PAC_Validate.ChecksumAndSignature", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_decode_login_info_ctr_logon_info_ctr,
          { "Logon Info Ctr", "krb5pac.decode_login_info_ctr.logon_info_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_krb5pac_PAC_INFO_valdefault_unknown,
-         { "Unknown", "krb5pac.PAC_INFO_valdefault.unknown", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_krb5pac_PAC_INFO_constrained_delegation,
+         { "Constrained Delegation", "krb5pac.PAC_INFO.constrained_delegation", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_krb5pac_PAC_INFO_constrained_delegation_,
+         { "Subcontext length", "krb5pac.PAC_INFO.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_CONSTRAINED_DELEGATION_CTR_info,
          { "Info", "krb5pac.PAC_CONSTRAINED_DELEGATION_CTR.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_krb5pac_PAC_INFO_valPAC_TYPE_LOGON_INFO_logon_info_,
-         { "Subcontext length", "krb5pac.PAC_INFO_valPAC_TYPE_LOGON_INFO.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_BUFFER_info,
          { "Info", "krb5pac.PAC_BUFFER.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_netsamlogoncache_entry_info3,
@@ -1718,24 +1722,20 @@ void proto_register_dcerpc_krb5pac(void)
          { " Pad", "krb5pac.PAC_BUFFER_RAW._pad", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_BUFFER_RAW_info,
          { "Info", "krb5pac.PAC_BUFFER_RAW.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_krb5pac_PAC_INFO_valPAC_TYPE_SRV_CHECKSUM_srv_cksum,
-         { "Srv Cksum", "krb5pac.PAC_INFO_valPAC_TYPE_SRV_CHECKSUM.srv_cksum", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_krb5pac_PAC_INFO_valPAC_TYPE_LOGON_NAME_logon_name,
-         { "Logon Name", "krb5pac.PAC_INFO_valPAC_TYPE_LOGON_NAME.logon_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_LOGON_NAME_account_name,
          { "Account Name", "krb5pac.PAC_LOGON_NAME.account_name", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_Validate_ChecksumLength,
          { "Checksumlength", "krb5pac.PAC_Validate.ChecksumLength", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_UNKNOWN_12_unknown4,
          { "Unknown4", "krb5pac.PAC_UNKNOWN_12.unknown4", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_krb5pac_PAC_INFO_srv_cksum,
+         { "Srv Cksum", "krb5pac.PAC_INFO.srv_cksum", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_netsamlogoncache_entry_timestamp,
          { "Timestamp", "krb5pac.netsamlogoncache_entry.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_DATA_RAW_buffers,
          { "Buffers", "krb5pac.PAC_DATA_RAW.buffers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_SIGNATURE_DATA_type,
          { "Type", "krb5pac.PAC_SIGNATURE_DATA.type", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_krb5pac_PAC_INFO_valPAC_TYPE_LOGON_INFO_logon_info,
-         { "Logon Info", "krb5pac.PAC_INFO_valPAC_TYPE_LOGON_INFO.logon_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_decode_pac_pac,
          { "Pac", "krb5pac.decode_pac.pac", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_krb5pac_PAC_Validate_SignatureLength,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-lsa.c b/bin/default/librpc/gen_ndr/packet-dcerpc-lsa.c
index 7980c90853d2f5ac3d8d7b15cf49f5c4afd955d0..f3347441c3005136749fc1f57c4200ee507029ee 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-lsa.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-lsa.c
@@ -115,8 +115,7 @@ static gint ett_lsarpc_lsa_ForestTrustCollisionInfo = -1;
 
 
 /* Header field declarations */
-static gint hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_NAME_name = -1;
-static gint hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_L_ACCOUNT_DOMAIN_l_account_domain = -1;
+static gint hf_lsarpc_lsa_TrustedDomainInfo_enc_types = -1;
 static gint hf_lsarpc_lsa_SetSystemAccessAccount_handle = -1;
 static gint hf_lsarpc_lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_FOREST_TRANSITIVE = -1;
 static gint hf_lsarpc_lsa_AsciiStringLarge_size = -1;
@@ -125,11 +124,11 @@ static gint hf_lsarpc_lsa_TrustDomainInfoAuthInfo_outgoing_count = -1;
 static gint hf_lsarpc_lsa_lsaRSetForestTrustInformation_trusted_domain_name = -1;
 static gint hf_lsarpc_lsa_CreateTrustedDomainEx2_auth_info_internal = -1;
 static gint hf_lsarpc_lsa_Delete_handle = -1;
-static gint hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_EVENTS_audit_events = -1;
+static gint hf_lsarpc_lsa_PolicyInformation_account_domain = -1;
 static gint hf_lsarpc_lsa_DomainInfoKerberos_clock_skew = -1;
 static gint hf_lsarpc_lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_TREAT_AS_EXTERNAL = -1;
 static gint hf_lsarpc_lsa_ForestTrustCollisionXrefFlags_LSA_NB_DISABLED_ADMIN = -1;
-static gint hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_2_INTERNAL_full_info2_internal = -1;
+static gint hf_lsarpc_lsa_ForestTrustData_domain_info = -1;
 static gint hf_lsarpc_lsa_AddPrivilegesToAccount_handle = -1;
 static gint hf_lsarpc_lsa_ObjectAttribute_sec_qos = -1;
 static gint hf_lsarpc_lsa_LookupNames3_handle = -1;
@@ -137,10 +136,8 @@ static gint hf_lsarpc_lsa_QueryTrustedDomainInfoBySid_level = -1;
 static gint hf_lsarpc_lsa_OpenTrustedDomain_sid = -1;
 static gint hf_lsarpc_lsa_EnumAccounts_handle = -1;
 static gint hf_lsarpc_lsa_CreateAccount_sid = -1;
-static gint hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_DOMAIN_domain = -1;
 static gint hf_lsarpc_lsa_ReplicaSourceInfo_account = -1;
 static gint hf_lsarpc_lsa_QueryDomainInformationPolicy_handle = -1;
-static gint hf_lsarpc_lsa_ForestTrustData_valLSA_FOREST_TRUST_DOMAIN_INFO_domain_info = -1;
 static gint hf_lsarpc_lsa_CreateTrustedDomain_info = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoControllers_netbios_names = -1;
 static gint hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS = -1;
@@ -153,38 +150,38 @@ static gint hf_lsarpc_lsa_lsaRSetForestTrustInformation_check_only = -1;
 static gint hf_lsarpc_lsa_LookupNames3_num_names = -1;
 static gint hf_lsarpc_lsa_EnumTrustedDomainsEx_max_size = -1;
 static gint hf_lsarpc_lsa_LookupPrivName_handle = -1;
-static gint hf_lsarpc_lsa_ForestTrustCollisionFlags_valLSA_FOREST_TRUST_COLLISION_TDO_flags = -1;
+static gint hf_lsarpc_lsa_ForestTrustCollisionFlags_flags = -1;
 static gint hf_lsarpc_lsa_OpenAccount_handle = -1;
 static gint hf_lsarpc_lsa_OpenSecret_access_mask = -1;
 static gint hf_lsarpc_lsa_QuerySecurity_sdbuf = -1;
-static gint hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_MOD_mod = -1;
 static gint hf_lsarpc_lsa_SetTrustedDomainInfoByName_trusted_domain = -1;
 static gint hf_lsarpc_lsa_CreateTrustedDomain_trustdom_handle = -1;
 static gint hf_lsarpc_lsa_EnumPrivs_handle = -1;
-static gint hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_auth_info = -1;
 static gint hf_lsarpc_lsa_LUID_high = -1;
 static gint hf_lsarpc_lsa_QueryInfoPolicy_handle = -1;
+static gint hf_lsarpc_lsa_PolicyInformation_audit_events = -1;
+static gint hf_lsarpc_lsa_TrustedDomainInfo_auth_info = -1;
 static gint hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_CREATE_PRIVILEGE = -1;
 static gint hf_lsarpc_lsa_DomainInfoKerberos_service_tkt_lifetime = -1;
-static gint hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_DNS_INT_dns = -1;
 static gint hf_lsarpc_lsa_CreateSecret_access_mask = -1;
 static gint hf_lsarpc_lsa_GetUserName_authority_name = -1;
 static gint hf_lsarpc_lsa_SetTrustedDomainInfo_dom_sid = -1;
-static gint hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET_posix_offset = -1;
 static gint hf_lsarpc_lsa_AuditFullSetInfo_shutdown_on_full = -1;
 static gint hf_lsarpc_lsa_DeleteTrustedDomain_dom_sid = -1;
 static gint hf_lsarpc_lsa_LookupNames4_names = -1;
 static gint hf_lsarpc_lsa_ForestTrustRecord_forest_trust_data = -1;
 static gint hf_lsarpc_lsa_TrustDirection_LSA_TRUST_DIRECTION_OUTBOUND = -1;
+static gint hf_lsarpc_lsa_PolicyInformation_role = -1;
+static gint hf_lsarpc_lsa_PolicyInformation_audit_log = -1;
 static gint hf_lsarpc_lsa_LookupNames2_client_revision = -1;
-static gint hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_ROLE_role = -1;
-static gint hf_lsarpc_lsa_ForestTrustData_valdefault_data = -1;
+static gint hf_lsarpc_lsa_PolicyInformation_dns = -1;
 static gint hf_lsarpc_lsa_lsaRSetForestTrustInformation_handle = -1;
 static gint hf_lsarpc_lsa_lsaRQueryForestTrustInformation_trusted_domain_name = -1;
 static gint hf_lsarpc_lsa_QueryTrustedDomainInfoByName_trusted_domain = -1;
 static gint hf_lsarpc_lsa_OpenPolicy2_handle = -1;
 static gint hf_lsarpc_lsa_EnumAccountsWithUserRight_handle = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoAuthInfo_incoming_count = -1;
+static gint hf_lsarpc_lsa_PolicyInformation_mod = -1;
 static gint hf_lsarpc_lsa_LookupSids3_client_revision = -1;
 static gint hf_lsarpc_lsa_RemoveAccountRights_rights = -1;
 static gint hf_lsarpc_lsa_SetSecret_sec_handle = -1;
@@ -193,7 +190,6 @@ static gint hf_lsarpc_lsa_OpenTrustedDomainByName_access_mask = -1;
 static gint hf_lsarpc_lsa_RightAttribute_name = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoPassword_old_password = -1;
 static gint hf_lsarpc_lsa_DomainInfoKerberos_user_tkt_renewaltime = -1;
-static gint hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_INTERNAL_auth_info_internal = -1;
 static gint hf_lsarpc_lsa_LUID_low = -1;
 static gint hf_lsarpc_lsa_LookupNames3_names = -1;
 static gint hf_lsarpc_lsa_QueryTrustedDomainInfoBySid_dom_sid = -1;
@@ -213,12 +209,10 @@ static gint hf_lsarpc_lsa_LookupSids2_client_revision = -1;
 static gint hf_lsarpc_lsa_DnsDomainInfo_dns_forest = -1;
 static gint hf_lsarpc_lsa_QueryDomainInformationPolicy_info = -1;
 static gint hf_lsarpc_lsa_ForestTrustDomainInfo_netbios_domain_name = -1;
-static gint hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES_enc_types = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoInfoEx_trust_direction = -1;
 static gint hf_lsarpc_lsa_LookupNames3_sids = -1;
 static gint hf_lsarpc_lsa_ObjectAttribute_sec_desc = -1;
 static gint hf_lsarpc_lsa_AuditLogInfo_retention_time = -1;
-static gint hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_PASSWORD_password = -1;
 static gint hf_lsarpc_lsa_DnsDomainInfo_name = -1;
 static gint hf_lsarpc_lsa_TranslatedSid2_sid_index = -1;
 static gint hf_lsarpc_lsa_QuerySecret_old_mtime = -1;
@@ -227,6 +221,7 @@ static gint hf_lsarpc_lsa_TransNameArray_names = -1;
 static gint hf_lsarpc_lsa_RefDomainList_count = -1;
 static gint hf_lsarpc_lsa_QueryInfoPolicy2_info = -1;
 static gint hf_lsarpc_lsa_GetSystemAccessAccount_access_mask = -1;
+static gint hf_lsarpc_lsa_DomainInformationPolicy_kerberos_info = -1;
 static gint hf_lsarpc_lsa_QueryInfoPolicy_info = -1;
 static gint hf_lsarpc_lsa_CreateAccount_acct_handle = -1;
 static gint hf_lsarpc_lsa_AuditLogInfo_maximum_log_size = -1;
@@ -237,7 +232,6 @@ static gint hf_lsarpc_lsa_SetInformationTrustedDomain_info = -1;
 static gint hf_lsarpc_lsa_LookupNames_handle = -1;
 static gint hf_lsarpc_lsa_EnumTrustDom_max_size = -1;
 static gint hf_lsarpc_lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_NON_TRANSITIVE = -1;
-static gint hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_CONTROLLERS_controllers = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoPassword_password = -1;
 static gint hf_lsarpc_lsa_ObjectAttribute_object_name = -1;
 static gint hf_lsarpc_lsa_lsaRSetForestTrustInformation_highest_record_type = -1;
@@ -248,6 +242,7 @@ static gint hf_lsarpc_lsa_TranslatedSid3_sid = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoBasic_netbios_name = -1;
 static gint hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_AUDIT_LOG_ADMIN = -1;
 static gint hf_lsarpc_lsa_ForestTrustInformation_entries = -1;
+static gint hf_lsarpc_lsa_ForestTrustData_top_level_name_ex = -1;
 static gint hf_lsarpc_lsa_DefaultQuotaInfo_non_paged_pool = -1;
 static gint hf_lsarpc_lsa_ForestTrustBinaryData_length = -1;
 static gint hf_lsarpc_lsa_DefaultQuotaInfo_unknown = -1;
@@ -269,6 +264,7 @@ static gint hf_lsarpc_lsa_DomainListEx_count = -1;
 static gint hf_lsarpc_lsa_DeleteObject_handle = -1;
 static gint hf_lsarpc_lsa_DefaultQuotaInfo_pagefile = -1;
 static gint hf_lsarpc_lsa_DefaultQuotaInfo_min_wss = -1;
+static gint hf_lsarpc_lsa_ForestTrustData_top_level_name = -1;
 static gint hf_lsarpc_lsa_TranslatedName2_sid_type = -1;
 static gint hf_lsarpc_lsa_LookupPrivDisplayName_returned_language_id = -1;
 static gint hf_lsarpc_lsa_SetSystemAccessAccount_access_mask = -1;
@@ -278,6 +274,7 @@ static gint hf_lsarpc_lsa_ForestTrustRecord_type = -1;
 static gint hf_lsarpc_lsa_DATA_BUF2_data = -1;
 static gint hf_lsarpc_lsa_TrustedAccessMask_LSA_TRUSTED_SET_AUTH = -1;
 static gint hf_lsarpc_lsa_RemoveAccountRights_handle = -1;
+static gint hf_lsarpc_lsa_TrustedDomainInfo_full_info_internal = -1;
 static gint hf_lsarpc_lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_CROSS_ORGANIZATION = -1;
 static gint hf_lsarpc_lsa_LookupNames3_count = -1;
 static gint hf_lsarpc_lsa_LookupNames3_client_revision = -1;
@@ -302,24 +299,23 @@ static gint hf_lsarpc_lsa_ForestTrustCollisionRecord_index = -1;
 static gint hf_lsarpc_lsa_StringLarge_string = -1;
 static gint hf_lsarpc_lsa_DomainInfo_name = -1;
 static gint hf_lsarpc_lsa_AsciiString_size = -1;
-static gint hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_INFO_EX_info_ex = -1;
 static gint hf_lsarpc_lsa_ForestTrustCollisionTDOFlags_LSA_TLN_DISABLED_ADMIN = -1;
 static gint hf_lsarpc_lsa_ForestTrustCollisionTDOFlags_LSA_TLN_DISABLED_NEW = -1;
 static gint hf_lsarpc_lsa_LookupNames2_sids = -1;
 static gint hf_lsarpc_lsa_SetDomainInformationPolicy_level = -1;
 static gint hf_lsarpc_lsa_krbAuthenticationOptions_LSA_POLICY_KERBEROS_VALIDATE_CLIENT = -1;
-static gint hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_FULL_SET_auditfullset = -1;
 static gint hf_lsarpc_lsa_SetInfoPolicy2_info = -1;
 static gint hf_lsarpc_lsa_TrustDirection_LSA_TRUST_DIRECTION_INBOUND = -1;
 static gint hf_lsarpc_lsa_AsciiStringLarge_string = -1;
-static gint hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_QUOTA_quota = -1;
 static gint hf_lsarpc_lsa_LookupSids2_level = -1;
 static gint hf_lsarpc_lsa_OpenSecret_sec_handle = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoAuthInfo_incoming_current_auth_info = -1;
+static gint hf_lsarpc_lsa_DomainInformationPolicy_efs_info = -1;
 static gint hf_lsarpc_lsa_EnumAccounts_sids = -1;
 static gint hf_lsarpc_lsa_ReplicaSourceInfo_source = -1;
 static gint hf_lsarpc_lsa_QuerySecurity_sec_info = -1;
 static gint hf_lsarpc_lsa_ForestTrustCollisionRecord_name = -1;
+static gint hf_lsarpc_lsa_TrustedDomainInfo_info_ex2_internal = -1;
 static gint hf_lsarpc_lsa_LookupSids2_domains = -1;
 static gint hf_lsarpc_lsa_EnumTrustedDomainsEx_domains = -1;
 static gint hf_lsarpc_lsa_EnumAccounts_num_entries = -1;
@@ -330,10 +326,12 @@ static gint hf_lsarpc_lsa_LookupNames_num_names = -1;
 static gint hf_lsarpc_lsa_ForestTrustDomainInfo_domain_sid = -1;
 static gint hf_lsarpc_lsa_LookupSids_handle = -1;
 static gint hf_lsarpc_lsa_AsciiString_string = -1;
+static gint hf_lsarpc_lsa_TrustedDomainInfo_info_ex = -1;
 static gint hf_lsarpc_lsa_CreateTrustedDomainEx2_trustdom_handle = -1;
 static gint hf_lsarpc_lsa_RemovePrivilegesFromAccount_handle = -1;
 static gint hf_lsarpc_lsa_CreateAccount_handle = -1;
 static gint hf_lsarpc_lsa_TrustedAccessMask_LSA_TRUSTED_QUERY_DOMAIN_NAME = -1;
+static gint hf_lsarpc_lsa_TrustedDomainInfo_name = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoInfoEx2Internal_forest_trust_length = -1;
 static gint hf_lsarpc_lsa_EnumAccountRights_rights = -1;
 static gint hf_lsarpc_lsa_SetSecObj_handle = -1;
@@ -345,10 +343,12 @@ static gint hf_lsarpc_lsa_SetInfoPolicy2_handle = -1;
 static gint hf_lsarpc_lsa_LookupNames2_num_names = -1;
 static gint hf_lsarpc_lsa_SetInfoPolicy2_level = -1;
 static gint hf_lsarpc_lsa_EnumPrivsAccount_privs = -1;
+static gint hf_lsarpc_lsa_TrustedDomainInfo_controllers = -1;
 static gint hf_lsarpc_lsa_OpenAccount_access_mask = -1;
 static gint hf_lsarpc_lsa_EnumPrivs_privs = -1;
 static gint hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_TRUST_ADMIN = -1;
 static gint hf_lsarpc_lsa_AuditLogInfo_percent_full = -1;
+static gint hf_lsarpc_lsa_PolicyInformation_quota = -1;
 static gint hf_lsarpc_lsa_RemovePrivilegesFromAccount_privs = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoBuffer_AuthType = -1;
 static gint hf_lsarpc_lsa_TranslatedName_sid_type = -1;
@@ -363,7 +363,6 @@ static gint hf_lsarpc_lsa_CreateTrustedDomainEx_info = -1;
 static gint hf_lsarpc_lsa_PrivilegeSet_count = -1;
 static gint hf_lsarpc_lsa_SetTrustedDomainInfoByName_level = -1;
 static gint hf_lsarpc_lsa_lsaRSetForestTrustInformation_collision_info = -1;
-static gint hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_INFO_EX2_INTERNAL_info_ex2_internal = -1;
 static gint hf_lsarpc_lsa_LookupPrivDisplayName_language_id = -1;
 static gint hf_lsarpc_lsa_TransSidArray3_sids = -1;
 static gint hf_lsarpc_status = -1;
@@ -371,7 +370,6 @@ static gint hf_lsarpc_lsa_LookupNames_count = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoFullInfo2Internal_info = -1;
 static gint hf_lsarpc_lsa_SetTrustedDomainInfo_handle = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoAuthInfo_outgoing_previous_auth_info = -1;
-static gint hf_lsarpc_lsa_ForestTrustData_valLSA_FOREST_TRUST_TOP_LEVEL_NAME_top_level_name = -1;
 static gint hf_lsarpc_lsa_LookupPrivValue_name = -1;
 static gint hf_lsarpc_lsa_TrustedAccessMask_LSA_TRUSTED_QUERY_CONTROLLERS = -1;
 static gint hf_lsarpc_lsa_ForestTrustBinaryData_data = -1;
@@ -384,7 +382,6 @@ static gint hf_lsarpc_lsa_OpenTrustedDomainByName_trustdom_handle = -1;
 static gint hf_lsarpc_lsa_TransNameArray2_names = -1;
 static gint hf_lsarpc_lsa_EnumTrustDom_handle = -1;
 static gint hf_lsarpc_lsa_ForestTrustCollisionInfo_count = -1;
-static gint hf_lsarpc_lsa_DomainInformationPolicy_valLSA_DOMAIN_INFO_POLICY_EFS_efs_info = -1;
 static gint hf_lsarpc_lsa_CreateAccount_access_mask = -1;
 static gint hf_lsarpc_lsa_OpenPolicy2_attr = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoInfoEx_netbios_name = -1;
@@ -393,11 +390,11 @@ static gint hf_lsarpc_lsa_ForestTrustRecord_flags = -1;
 static gint hf_lsarpc_lsa_LookupSids2_sids = -1;
 static gint hf_lsarpc_lsa_CreateTrustedDomainEx_auth_info = -1;
 static gint hf_lsarpc_lsa_TranslatedName_sid_index = -1;
-static gint hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_PD_pd = -1;
-static gint hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_full_info = -1;
+static gint hf_lsarpc_lsa_TrustedDomainInfo_password = -1;
 static gint hf_lsarpc_lsa_ModificationInfo_db_create_time = -1;
 static gint hf_lsarpc_lsa_RetrievePrivateData_name = -1;
 static gint hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_NOTIFICATION = -1;
+static gint hf_lsarpc_lsa_PolicyInformation_domain = -1;
 static gint hf_lsarpc_lsa_DATA_BUF2_size = -1;
 static gint hf_lsarpc_lsa_QueryTrustedDomainInfoByName_handle = -1;
 static gint hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_SET_AUDIT_REQUIREMENTS = -1;
@@ -411,9 +408,9 @@ static gint hf_lsarpc_lsa_PrivArray_privs = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoFullInfo2Internal_posix_offset = -1;
 static gint hf_lsarpc_lsa_TransSidArray2_sids = -1;
 static gint hf_lsarpc_lsa_TransSidArray3_count = -1;
-static gint hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_REPLICA_replica = -1;
 static gint hf_lsarpc_lsa_lsaRQueryForestTrustInformation_handle = -1;
 static gint hf_lsarpc_lsa_CreateTrustedDomainEx_policy_handle = -1;
+static gint hf_lsarpc_lsa_PolicyInformation_l_account_domain = -1;
 static gint hf_lsarpc_lsa_StorePrivateData_handle = -1;
 static gint hf_lsarpc_lsa_DomainList_count = -1;
 static gint hf_lsarpc_lsa_QuerySecret_sec_handle = -1;
@@ -427,7 +424,6 @@ static gint hf_lsarpc_lsa_RightSet_names = -1;
 static gint hf_lsarpc_lsa_LookupNames_domains = -1;
 static gint hf_lsarpc_lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_USES_RC4_ENCRYPTION = -1;
 static gint hf_lsarpc_lsa_LookupNames_sids = -1;
-static gint hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_FULL_QUERY_auditfullquery = -1;
 static gint hf_lsarpc_lsa_EnumAccountsWithUserRight_name = -1;
 static gint hf_lsarpc_lsa_LookupPrivName_name = -1;
 static gint hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_VIEW_LOCAL_INFORMATION = -1;
@@ -436,6 +432,7 @@ static gint hf_lsarpc_lsa_SetInformationTrustedDomain_level = -1;
 static gint hf_lsarpc_lsa_RefDomainList_domains = -1;
 static gint hf_lsarpc_lsa_SetDomainInformationPolicy_info = -1;
 static gint hf_lsarpc_lsa_SetDomainInformationPolicy_handle = -1;
+static gint hf_lsarpc_lsa_PolicyInformation_replica = -1;
 static gint hf_lsarpc_lsa_TransSidArray_count = -1;
 static gint hf_lsarpc_lsa_SetTrustedDomainInfo_level = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoFullInfo_auth_info = -1;
@@ -446,20 +443,21 @@ static gint hf_lsarpc_lsa_AuditLogInfo_time_to_shutdown = -1;
 static gint hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_VIEW = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoInfoEx_domain_name = -1;
 static gint hf_lsarpc_lsa_LookupSids2_count = -1;
+static gint hf_lsarpc_lsa_TrustedDomainInfo_info_basic = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoPosixOffset_posix_offset = -1;
+static gint hf_lsarpc_lsa_TrustedDomainInfo_full_info2_internal = -1;
 static gint hf_lsarpc_lsa_CreateTrustedDomainEx2_policy_handle = -1;
-static gint hf_lsarpc_lsa_ForestTrustCollisionFlags_valdefault_flags = -1;
 static gint hf_lsarpc_lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_WITHIN_FOREST = -1;
 static gint hf_lsarpc_lsa_OpenSecret_name = -1;
 static gint hf_lsarpc_lsa_CreateTrustedDomainEx2_info = -1;
 static gint hf_lsarpc_lsa_GetUserName_account_name = -1;
 static gint hf_lsarpc_lsa_LUIDAttribute_attribute = -1;
-static gint hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_BASIC_info_basic = -1;
 static gint hf_lsarpc_lsa_OpenPolicy_access_mask = -1;
 static gint hf_lsarpc_lsa_DATA_BUF_PTR_buf = -1;
 static gint hf_lsarpc_lsa_LookupSids3_sids = -1;
 static gint hf_lsarpc_lsa_String_size = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoAuthInfo_outgoing_current_auth_info = -1;
+static gint hf_lsarpc_lsa_TrustedDomainInfo_posix_offset = -1;
 static gint hf_lsarpc_lsa_LookupSids3_lookup_options = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoInfoEx2Internal_info_ex = -1;
 static gint hf_lsarpc_lsa_OpenAccount_sid = -1;
@@ -531,13 +529,12 @@ static gint hf_lsarpc_lsa_TrustDomainInfoBuffer_data = -1;
 static gint hf_lsarpc_lsa_LookupNames3_lookup_options = -1;
 static gint hf_lsarpc_lsa_StringLarge_size = -1;
 static gint hf_lsarpc_lsa_ObjectAttribute_attributes = -1;
+static gint hf_lsarpc_lsa_TrustedDomainInfo_auth_info_internal = -1;
 static gint hf_lsarpc_lsa_QosInfo_effective_only = -1;
 static gint hf_lsarpc_lsa_OpenPolicy_attr = -1;
 static gint hf_lsarpc_lsa_ObjectAttribute_len = -1;
-static gint hf_lsarpc_lsa_ForestTrustData_valLSA_FOREST_TRUST_TOP_LEVEL_NAME_EX_top_level_name_ex = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoBasic_sid = -1;
 static gint hf_lsarpc_lsa_PrivEntry_name = -1;
-static gint hf_lsarpc_lsa_DomainInformationPolicy_valLSA_DOMAIN_INFO_POLICY_KERBEROS_kerberos_info = -1;
 static gint hf_lsarpc_lsa_ServerRole_role = -1;
 static gint hf_lsarpc_lsa_BinaryString_array = -1;
 static gint hf_lsarpc_lsa_TranslatedSid3_sid_type = -1;
@@ -550,7 +547,9 @@ static gint hf_lsarpc_lsa_TrustDomainInfoFullInfoInternal_info_ex = -1;
 static gint hf_lsarpc_lsa_DATA_BUF_length = -1;
 static gint hf_lsarpc_lsa_Strings_names = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoFullInfoInternal_posix_offset = -1;
+static gint hf_lsarpc_lsa_PolicyInformation_auditfullset = -1;
 static gint hf_lsarpc_lsa_OpenPolicy_handle = -1;
+static gint hf_lsarpc_lsa_ForestTrustData_data = -1;
 static gint hf_lsarpc_lsa_ForestTrustCollisionRecord_flags = -1;
 static gint hf_lsarpc_lsa_LookupSids_count = -1;
 static gint hf_lsarpc_lsa_DnsDomainInfo_dns_domain = -1;
@@ -558,21 +557,17 @@ static gint hf_lsarpc_lsa_QueryInfoPolicy_level = -1;
 static gint hf_lsarpc_lsa_TranslatedName_name = -1;
 static gint hf_lsarpc_lsa_LookupSids_domains = -1;
 static gint hf_lsarpc_lsa_TranslatedSid_rid = -1;
-static gint hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_ACCOUNT_DOMAIN_account_domain = -1;
 static gint hf_lsarpc_lsa_DomainInfoEfs_efs_blob = -1;
 static gint hf_lsarpc_lsa_RemovePrivilegesFromAccount_remove_all = -1;
 static gint hf_lsarpc_lsa_SecretAccessMask_LSA_SECRET_QUERY_VALUE = -1;
 static gint hf_lsarpc_lsa_AddAccountRights_handle = -1;
-static gint hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_DNS_dns = -1;
 static gint hf_lsarpc_lsa_DomainInfoEfs_blob_size = -1;
 static gint hf_lsarpc_lsa_OpenPolicy2_system_name = -1;
 static gint hf_lsarpc_lsa_lsaRQueryForestTrustInformation_forest_trust_info = -1;
 static gint hf_lsarpc_lsa_CreateTrustedDomain_policy_handle = -1;
-static gint hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_LOG_audit_log = -1;
 static gint hf_lsarpc_lsa_TrustDomainInfoFullInfoInternal_auth_info = -1;
 static gint hf_lsarpc_lsa_DefaultQuotaInfo_max_wss = -1;
 static gint hf_lsarpc_lsa_DefaultQuotaInfo_paged_pool = -1;
-static gint hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_INTERNAL_full_info_internal = -1;
 static gint hf_lsarpc_lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_UPLEVEL_ONLY = -1;
 static gint hf_lsarpc_lsa_LookupSids_level = -1;
 static gint hf_lsarpc_lsa_AuditFullQueryInfo_log_is_full = -1;
@@ -584,7 +579,6 @@ static gint hf_lsarpc_lsa_TranslatedSid2_sid_type = -1;
 static gint hf_lsarpc_lsa_OpenTrustedDomainByName_handle = -1;
 static gint hf_lsarpc_lsa_EnumTrustedDomainsEx_handle = -1;
 static gint hf_lsarpc_lsa_AsciiString_length = -1;
-static gint hf_lsarpc_lsa_ForestTrustCollisionFlags_valLSA_FOREST_TRUST_COLLISION_XREF_flags = -1;
 static gint hf_lsarpc_lsa_EnumAccountRights_sid = -1;
 static gint hf_lsarpc_lsa_LookupSids_sids = -1;
 static gint hf_lsarpc_lsa_CloseTrustedDomainEx_handle = -1;
@@ -595,13 +589,16 @@ static gint hf_lsarpc_lsa_SecretAccessMask_LSA_SECRET_SET_VALUE = -1;
 static gint hf_lsarpc_lsa_EnumTrustDom_domains = -1;
 static gint hf_lsarpc_lsa_TransNameArray_count = -1;
 static gint hf_lsarpc_lsa_RetrievePrivateData_val = -1;
+static gint hf_lsarpc_lsa_PolicyInformation_pd = -1;
 static gint hf_lsarpc_lsa_TranslatedName2_sid_index = -1;
+static gint hf_lsarpc_lsa_PolicyInformation_auditfullquery = -1;
 static gint hf_lsarpc_lsa_ModificationInfo_modified_id = -1;
 static gint hf_lsarpc_lsa_QuerySecret_new_mtime = -1;
 static gint hf_lsarpc_lsa_LookupPrivValue_handle = -1;
 static gint hf_lsarpc_lsa_TransSidArray2_count = -1;
 static gint hf_lsarpc_lsa_AuditEventsInfo_count = -1;
 static gint hf_lsarpc_lsa_SetInfoPolicy_level = -1;
+static gint hf_lsarpc_lsa_TrustedDomainInfo_full_info = -1;
 static gint hf_lsarpc_lsa_CreateTrustedDomainEx_access_mask = -1;
 static gint hf_lsarpc_lsa_LookupSids3_count = -1;
 static gint hf_lsarpc_lsa_SetInfoPolicy_handle = -1;
@@ -849,20 +846,20 @@ const value_string lsarpc_lsa_PolicyInfo_vals[] = {
        { LSA_POLICY_INFO_L_ACCOUNT_DOMAIN, "LSA_POLICY_INFO_L_ACCOUNT_DOMAIN" },
 { 0, NULL }
 };
-static int lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_LOG_audit_log(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_EVENTS_audit_events(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_DOMAIN_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_PD_pd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_ACCOUNT_DOMAIN_account_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_ROLE_role(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_REPLICA_replica(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_QUOTA_quota(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_MOD_mod(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_FULL_SET_auditfullset(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_FULL_QUERY_auditfullquery(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_DNS_dns(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_DNS_INT_dns(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_L_ACCOUNT_DOMAIN_l_account_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_PolicyInformation_audit_log(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_PolicyInformation_audit_events(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_PolicyInformation_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_PolicyInformation_pd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_PolicyInformation_account_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_PolicyInformation_role(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_PolicyInformation_replica(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_PolicyInformation_quota(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_PolicyInformation_mod(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_PolicyInformation_auditfullset(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_PolicyInformation_auditfullquery(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_PolicyInformation_dns(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_PolicyInformation_dns(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_PolicyInformation_l_account_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int lsarpc_dissect_element_lsa_SidPtr_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int lsarpc_dissect_element_lsa_SidPtr_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int lsarpc_dissect_element_lsa_SidArray_num_sids(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1048,19 +1045,19 @@ static int lsarpc_dissect_element_lsa_TrustDomainInfoFullInfo2Internal_info(tvbu
 static int lsarpc_dissect_element_lsa_TrustDomainInfoFullInfo2Internal_posix_offset(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int lsarpc_dissect_element_lsa_TrustDomainInfoFullInfo2Internal_auth_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int lsarpc_dissect_element_lsa_TrustDomainInfoSupportedEncTypes_enc_types(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_NAME_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_CONTROLLERS_controllers(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET_posix_offset(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_PASSWORD_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_BASIC_info_basic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_INFO_EX_info_ex(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_auth_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_full_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_INTERNAL_auth_info_internal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_INTERNAL_full_info_internal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_INFO_EX2_INTERNAL_info_ex2_internal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_2_INTERNAL_full_info2_internal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES_enc_types(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_TrustedDomainInfo_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_TrustedDomainInfo_controllers(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_TrustedDomainInfo_posix_offset(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_TrustedDomainInfo_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_TrustedDomainInfo_info_basic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_TrustedDomainInfo_info_ex(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_TrustedDomainInfo_auth_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_TrustedDomainInfo_full_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_TrustedDomainInfo_auth_info_internal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_TrustedDomainInfo_full_info_internal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_TrustedDomainInfo_info_ex2_internal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_TrustedDomainInfo_full_info2_internal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_TrustedDomainInfo_enc_types(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int lsarpc_dissect_element_lsa_DATA_BUF_PTR_buf(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int lsarpc_dissect_element_lsa_DATA_BUF_PTR_buf_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int lsarpc_dissect_element_lsa_RightAttribute_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1092,8 +1089,8 @@ const value_string lsarpc_lsa_DomainInfoEnum_vals[] = {
        { LSA_DOMAIN_INFO_POLICY_KERBEROS, "LSA_DOMAIN_INFO_POLICY_KERBEROS" },
 { 0, NULL }
 };
-static int lsarpc_dissect_element_lsa_DomainInformationPolicy_valLSA_DOMAIN_INFO_POLICY_EFS_efs_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_DomainInformationPolicy_valLSA_DOMAIN_INFO_POLICY_KERBEROS_kerberos_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_DomainInformationPolicy_efs_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_DomainInformationPolicy_kerberos_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int lsarpc_dissect_element_lsa_TranslatedName2_sid_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int lsarpc_dissect_element_lsa_TranslatedName2_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int lsarpc_dissect_element_lsa_TranslatedName2_sid_index(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1137,10 +1134,10 @@ static int lsarpc_dissect_element_lsa_ForestTrustDomainInfo_domain_sid(tvbuff_t
 static int lsarpc_dissect_element_lsa_ForestTrustDomainInfo_domain_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int lsarpc_dissect_element_lsa_ForestTrustDomainInfo_dns_domain_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int lsarpc_dissect_element_lsa_ForestTrustDomainInfo_netbios_domain_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_ForestTrustData_valLSA_FOREST_TRUST_TOP_LEVEL_NAME_top_level_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_ForestTrustData_valLSA_FOREST_TRUST_TOP_LEVEL_NAME_EX_top_level_name_ex(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_ForestTrustData_valLSA_FOREST_TRUST_DOMAIN_INFO_domain_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_ForestTrustData_valdefault_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_ForestTrustData_top_level_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_ForestTrustData_top_level_name_ex(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_ForestTrustData_domain_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_ForestTrustData_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 const value_string lsarpc_lsa_ForestTrustRecordType_vals[] = {
        { LSA_FOREST_TRUST_TOP_LEVEL_NAME, "LSA_FOREST_TRUST_TOP_LEVEL_NAME" },
        { LSA_FOREST_TRUST_TOP_LEVEL_NAME_EX, "LSA_FOREST_TRUST_TOP_LEVEL_NAME_EX" },
@@ -1191,9 +1188,9 @@ static const true_false_string lsa_ForestTrustCollisionXrefFlags_LSA_NB_DISABLED
    "LSA_NB_DISABLED_CONFLICT is SET",
    "LSA_NB_DISABLED_CONFLICT is NOT SET",
 };
-static int lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_valLSA_FOREST_TRUST_COLLISION_TDO_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_valLSA_FOREST_TRUST_COLLISION_XREF_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_valdefault_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int lsarpc_dissect_element_lsa_ForestTrustCollisionRecord_index(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int lsarpc_dissect_element_lsa_ForestTrustCollisionRecord_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *type);
 static int lsarpc_dissect_element_lsa_ForestTrustCollisionRecord_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *type);
@@ -3743,113 +3740,113 @@ lsarpc_dissect_enum_lsa_PolicyInfo(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 /* IDL: } */
 
 static int
-lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_LOG_audit_log(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_PolicyInformation_audit_log(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_AuditLogInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_LOG_audit_log,0);
+       offset = lsarpc_dissect_struct_lsa_AuditLogInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_audit_log,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_EVENTS_audit_events(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_PolicyInformation_audit_events(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_AuditEventsInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_EVENTS_audit_events,0);
+       offset = lsarpc_dissect_struct_lsa_AuditEventsInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_audit_events,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_DOMAIN_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_PolicyInformation_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_DomainInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_DOMAIN_domain,0);
+       offset = lsarpc_dissect_struct_lsa_DomainInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_domain,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_PD_pd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_PolicyInformation_pd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_PDAccountInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_PD_pd,0);
+       offset = lsarpc_dissect_struct_lsa_PDAccountInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_pd,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_ACCOUNT_DOMAIN_account_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_PolicyInformation_account_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_DomainInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_ACCOUNT_DOMAIN_account_domain,0);
+       offset = lsarpc_dissect_struct_lsa_DomainInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_account_domain,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_ROLE_role(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_PolicyInformation_role(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_ServerRole(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_ROLE_role,0);
+       offset = lsarpc_dissect_struct_lsa_ServerRole(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_role,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_REPLICA_replica(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_PolicyInformation_replica(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_ReplicaSourceInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_REPLICA_replica,0);
+       offset = lsarpc_dissect_struct_lsa_ReplicaSourceInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_replica,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_QUOTA_quota(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_PolicyInformation_quota(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_DefaultQuotaInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_QUOTA_quota,0);
+       offset = lsarpc_dissect_struct_lsa_DefaultQuotaInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_quota,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_MOD_mod(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_PolicyInformation_mod(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_ModificationInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_MOD_mod,0);
+       offset = lsarpc_dissect_struct_lsa_ModificationInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_mod,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_FULL_SET_auditfullset(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_PolicyInformation_auditfullset(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_AuditFullSetInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_FULL_SET_auditfullset,0);
+       offset = lsarpc_dissect_struct_lsa_AuditFullSetInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_auditfullset,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_FULL_QUERY_auditfullquery(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_PolicyInformation_auditfullquery(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_AuditFullQueryInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_FULL_QUERY_auditfullquery,0);
+       offset = lsarpc_dissect_struct_lsa_AuditFullQueryInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_auditfullquery,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_DNS_dns(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_PolicyInformation_dns(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_DnsDomainInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_DNS_dns,0);
+       offset = lsarpc_dissect_struct_lsa_DnsDomainInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_dns,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_DNS_INT_dns(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_PolicyInformation_dns(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_DnsDomainInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_DNS_INT_dns,0);
+       offset = lsarpc_dissect_struct_lsa_DnsDomainInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_dns,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_L_ACCOUNT_DOMAIN_l_account_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_PolicyInformation_l_account_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_DomainInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_L_ACCOUNT_DOMAIN_l_account_domain,0);
+       offset = lsarpc_dissect_struct_lsa_DomainInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_PolicyInformation_l_account_domain,0);
 
        return offset;
 }
@@ -3873,59 +3870,59 @@ lsarpc_dissect_lsa_PolicyInformation(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
        switch(level) {
                case LSA_POLICY_INFO_AUDIT_LOG:
-                       offset = lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_LOG_audit_log(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_PolicyInformation_audit_log(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_POLICY_INFO_AUDIT_EVENTS:
-                       offset = lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_EVENTS_audit_events(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_PolicyInformation_audit_events(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_POLICY_INFO_DOMAIN:
-                       offset = lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_DOMAIN_domain(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_PolicyInformation_domain(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_POLICY_INFO_PD:
-                       offset = lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_PD_pd(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_PolicyInformation_pd(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_POLICY_INFO_ACCOUNT_DOMAIN:
-                       offset = lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_ACCOUNT_DOMAIN_account_domain(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_PolicyInformation_account_domain(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_POLICY_INFO_ROLE:
-                       offset = lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_ROLE_role(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_PolicyInformation_role(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_POLICY_INFO_REPLICA:
-                       offset = lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_REPLICA_replica(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_PolicyInformation_replica(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_POLICY_INFO_QUOTA:
-                       offset = lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_QUOTA_quota(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_PolicyInformation_quota(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_POLICY_INFO_MOD:
-                       offset = lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_MOD_mod(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_PolicyInformation_mod(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_POLICY_INFO_AUDIT_FULL_SET:
-                       offset = lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_FULL_SET_auditfullset(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_PolicyInformation_auditfullset(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_POLICY_INFO_AUDIT_FULL_QUERY:
-                       offset = lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_FULL_QUERY_auditfullquery(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_PolicyInformation_auditfullquery(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_POLICY_INFO_DNS:
-                       offset = lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_DNS_dns(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_PolicyInformation_dns(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_POLICY_INFO_DNS_INT:
-                       offset = lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_DNS_INT_dns(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_PolicyInformation_dns(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_POLICY_INFO_L_ACCOUNT_DOMAIN:
-                       offset = lsarpc_dissect_element_lsa_PolicyInformation_valLSA_POLICY_INFO_L_ACCOUNT_DOMAIN_l_account_domain(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_PolicyInformation_l_account_domain(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -6001,105 +5998,105 @@ lsarpc_dissect_struct_lsa_TrustDomainInfoSupportedEncTypes(tvbuff_t *tvb _U_, in
 /* IDL: } */
 
 static int
-lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_NAME_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_TrustedDomainInfo_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoName(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_NAME_name,0);
+       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoName(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_name,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_CONTROLLERS_controllers(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_TrustedDomainInfo_controllers(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoControllers(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_CONTROLLERS_controllers,0);
+       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoControllers(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_controllers,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET_posix_offset(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_TrustedDomainInfo_posix_offset(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoPosixOffset(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET_posix_offset,0);
+       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoPosixOffset(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_posix_offset,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_PASSWORD_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_TrustedDomainInfo_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoPassword(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_PASSWORD_password,0);
+       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoPassword(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_password,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_BASIC_info_basic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_TrustedDomainInfo_info_basic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoBasic(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_BASIC_info_basic,0);
+       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoBasic(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_info_basic,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_INFO_EX_info_ex(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_TrustedDomainInfo_info_ex(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoInfoEx(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_INFO_EX_info_ex,0);
+       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoInfoEx(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_info_ex,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_auth_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_TrustedDomainInfo_auth_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoAuthInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_auth_info,0);
+       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoAuthInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_auth_info,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_full_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_TrustedDomainInfo_full_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoFullInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_full_info,0);
+       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoFullInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_full_info,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_INTERNAL_auth_info_internal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_TrustedDomainInfo_auth_info_internal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoAuthInfoInternal(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_INTERNAL_auth_info_internal,0);
+       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoAuthInfoInternal(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_auth_info_internal,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_INTERNAL_full_info_internal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_TrustedDomainInfo_full_info_internal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoFullInfoInternal(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_INTERNAL_full_info_internal,0);
+       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoFullInfoInternal(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_full_info_internal,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_INFO_EX2_INTERNAL_info_ex2_internal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_TrustedDomainInfo_info_ex2_internal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoInfoEx2Internal(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_INFO_EX2_INTERNAL_info_ex2_internal,0);
+       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoInfoEx2Internal(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_info_ex2_internal,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_2_INTERNAL_full_info2_internal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_TrustedDomainInfo_full_info2_internal(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoFullInfo2Internal(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_2_INTERNAL_full_info2_internal,0);
+       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoFullInfo2Internal(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_full_info2_internal,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES_enc_types(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_TrustedDomainInfo_enc_types(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoSupportedEncTypes(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES_enc_types,0);
+       offset = lsarpc_dissect_struct_lsa_TrustDomainInfoSupportedEncTypes(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_TrustedDomainInfo_enc_types,0);
 
        return offset;
 }
@@ -6123,55 +6120,55 @@ lsarpc_dissect_lsa_TrustedDomainInfo(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
        switch(level) {
                case LSA_TRUSTED_DOMAIN_INFO_NAME:
-                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_NAME_name(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_TRUSTED_DOMAIN_INFO_CONTROLLERS:
-                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_CONTROLLERS_controllers(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_controllers(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET:
-                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET_posix_offset(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_posix_offset(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_TRUSTED_DOMAIN_INFO_PASSWORD:
-                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_PASSWORD_password(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_password(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_TRUSTED_DOMAIN_INFO_BASIC:
-                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_BASIC_info_basic(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_info_basic(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_TRUSTED_DOMAIN_INFO_INFO_EX:
-                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_INFO_EX_info_ex(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_info_ex(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO:
-                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_auth_info(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_auth_info(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_TRUSTED_DOMAIN_INFO_FULL_INFO:
-                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_full_info(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_full_info(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_INTERNAL:
-                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_INTERNAL_auth_info_internal(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_auth_info_internal(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_TRUSTED_DOMAIN_INFO_FULL_INFO_INTERNAL:
-                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_INTERNAL_full_info_internal(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_full_info_internal(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_TRUSTED_DOMAIN_INFO_INFO_EX2_INTERNAL:
-                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_INFO_EX2_INTERNAL_info_ex2_internal(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_info_ex2_internal(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_TRUSTED_DOMAIN_INFO_FULL_INFO_2_INTERNAL:
-                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_2_INTERNAL_full_info2_internal(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_full_info2_internal(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES:
-                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES_enc_types(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_TrustedDomainInfo_enc_types(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -6659,17 +6656,17 @@ lsarpc_dissect_enum_lsa_DomainInfoEnum(tvbuff_t *tvb _U_, int offset _U_, packet
 /* IDL: } */
 
 static int
-lsarpc_dissect_element_lsa_DomainInformationPolicy_valLSA_DOMAIN_INFO_POLICY_EFS_efs_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_DomainInformationPolicy_efs_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_DomainInfoEfs(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_DomainInformationPolicy_valLSA_DOMAIN_INFO_POLICY_EFS_efs_info,0);
+       offset = lsarpc_dissect_struct_lsa_DomainInfoEfs(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_DomainInformationPolicy_efs_info,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_DomainInformationPolicy_valLSA_DOMAIN_INFO_POLICY_KERBEROS_kerberos_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_DomainInformationPolicy_kerberos_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_DomainInfoKerberos(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_DomainInformationPolicy_valLSA_DOMAIN_INFO_POLICY_KERBEROS_kerberos_info,0);
+       offset = lsarpc_dissect_struct_lsa_DomainInfoKerberos(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_DomainInformationPolicy_kerberos_info,0);
 
        return offset;
 }
@@ -6693,11 +6690,11 @@ lsarpc_dissect_lsa_DomainInformationPolicy(tvbuff_t *tvb _U_, int offset _U_, pa
 
        switch(level) {
                case LSA_DOMAIN_INFO_POLICY_EFS:
-                       offset = lsarpc_dissect_element_lsa_DomainInformationPolicy_valLSA_DOMAIN_INFO_POLICY_EFS_efs_info(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_DomainInformationPolicy_efs_info(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_DOMAIN_INFO_POLICY_KERBEROS:
-                       offset = lsarpc_dissect_element_lsa_DomainInformationPolicy_valLSA_DOMAIN_INFO_POLICY_KERBEROS_kerberos_info(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_DomainInformationPolicy_kerberos_info(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -7343,33 +7340,33 @@ lsarpc_dissect_struct_lsa_ForestTrustDomainInfo(tvbuff_t *tvb _U_, int offset _U
 /* IDL: } */
 
 static int
-lsarpc_dissect_element_lsa_ForestTrustData_valLSA_FOREST_TRUST_TOP_LEVEL_NAME_top_level_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_ForestTrustData_top_level_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_StringLarge(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_ForestTrustData_valLSA_FOREST_TRUST_TOP_LEVEL_NAME_top_level_name,0);
+       offset = lsarpc_dissect_struct_lsa_StringLarge(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_ForestTrustData_top_level_name,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_ForestTrustData_valLSA_FOREST_TRUST_TOP_LEVEL_NAME_EX_top_level_name_ex(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_ForestTrustData_top_level_name_ex(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_StringLarge(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_ForestTrustData_valLSA_FOREST_TRUST_TOP_LEVEL_NAME_EX_top_level_name_ex,0);
+       offset = lsarpc_dissect_struct_lsa_StringLarge(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_ForestTrustData_top_level_name_ex,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_ForestTrustData_valLSA_FOREST_TRUST_DOMAIN_INFO_domain_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_ForestTrustData_domain_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_ForestTrustDomainInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_ForestTrustData_valLSA_FOREST_TRUST_DOMAIN_INFO_domain_info,0);
+       offset = lsarpc_dissect_struct_lsa_ForestTrustDomainInfo(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_ForestTrustData_domain_info,0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_ForestTrustData_valdefault_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_ForestTrustData_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_struct_lsa_ForestTrustBinaryData(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_ForestTrustData_valdefault_data,0);
+       offset = lsarpc_dissect_struct_lsa_ForestTrustBinaryData(tvb,offset,pinfo,tree,drep,hf_lsarpc_lsa_ForestTrustData_data,0);
 
        return offset;
 }
@@ -7393,19 +7390,19 @@ lsarpc_dissect_lsa_ForestTrustData(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 
        switch(level) {
                case LSA_FOREST_TRUST_TOP_LEVEL_NAME:
-                       offset = lsarpc_dissect_element_lsa_ForestTrustData_valLSA_FOREST_TRUST_TOP_LEVEL_NAME_top_level_name(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_ForestTrustData_top_level_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_FOREST_TRUST_TOP_LEVEL_NAME_EX:
-                       offset = lsarpc_dissect_element_lsa_ForestTrustData_valLSA_FOREST_TRUST_TOP_LEVEL_NAME_EX_top_level_name_ex(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_ForestTrustData_top_level_name_ex(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_FOREST_TRUST_DOMAIN_INFO:
-                       offset = lsarpc_dissect_element_lsa_ForestTrustData_valLSA_FOREST_TRUST_DOMAIN_INFO_domain_info(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_ForestTrustData_domain_info(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = lsarpc_dissect_element_lsa_ForestTrustData_valdefault_data(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_ForestTrustData_data(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -7744,25 +7741,25 @@ lsarpc_dissect_bitmap_lsa_ForestTrustCollisionXrefFlags(tvbuff_t *tvb _U_, int o
 /* IDL: } */
 
 static int
-lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_valLSA_FOREST_TRUST_COLLISION_TDO_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_bitmap_lsa_ForestTrustCollisionTDOFlags(tvb, offset, pinfo, tree, drep, hf_lsarpc_lsa_ForestTrustCollisionFlags_valLSA_FOREST_TRUST_COLLISION_TDO_flags, 0);
+       offset = lsarpc_dissect_bitmap_lsa_ForestTrustCollisionTDOFlags(tvb, offset, pinfo, tree, drep, hf_lsarpc_lsa_ForestTrustCollisionFlags_flags, 0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_valLSA_FOREST_TRUST_COLLISION_XREF_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = lsarpc_dissect_bitmap_lsa_ForestTrustCollisionXrefFlags(tvb, offset, pinfo, tree, drep, hf_lsarpc_lsa_ForestTrustCollisionFlags_valLSA_FOREST_TRUST_COLLISION_XREF_flags, 0);
+       offset = lsarpc_dissect_bitmap_lsa_ForestTrustCollisionXrefFlags(tvb, offset, pinfo, tree, drep, hf_lsarpc_lsa_ForestTrustCollisionFlags_flags, 0);
 
        return offset;
 }
 
 static int
-lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_valdefault_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_flags(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_lsarpc_lsa_ForestTrustCollisionFlags_valdefault_flags, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_lsarpc_lsa_ForestTrustCollisionFlags_flags, 0);
 
        return offset;
 }
@@ -7783,15 +7780,15 @@ lsarpc_dissect_lsa_ForestTrustCollisionFlags(tvbuff_t *tvb _U_, int offset _U_,
 
        switch(level) {
                case LSA_FOREST_TRUST_COLLISION_TDO:
-                       offset = lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_valLSA_FOREST_TRUST_COLLISION_TDO_flags(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_flags(tvb, offset, pinfo, tree, drep);
                break;
 
                case LSA_FOREST_TRUST_COLLISION_XREF:
-                       offset = lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_valLSA_FOREST_TRUST_COLLISION_XREF_flags(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_flags(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_valdefault_flags(tvb, offset, pinfo, tree, drep);
+                       offset = lsarpc_dissect_element_lsa_ForestTrustCollisionFlags_flags(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -14322,10 +14319,8 @@ static dcerpc_sub_dissector lsarpc_dissectors[] = {
 void proto_register_dcerpc_lsarpc(void)
 {
        static hf_register_info hf[] = {
-       { &hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_NAME_name,
-         { "Name", "lsarpc.lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_NAME.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_L_ACCOUNT_DOMAIN_l_account_domain,
-         { "L Account Domain", "lsarpc.lsa_PolicyInformation_valLSA_POLICY_INFO_L_ACCOUNT_DOMAIN.l_account_domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_TrustedDomainInfo_enc_types,
+         { "Enc Types", "lsarpc.lsa_TrustedDomainInfo.enc_types", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_SetSystemAccessAccount_handle,
          { "Handle", "lsarpc.lsa_SetSystemAccessAccount.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_FOREST_TRANSITIVE,
@@ -14342,16 +14337,16 @@ void proto_register_dcerpc_lsarpc(void)
          { "Auth Info Internal", "lsarpc.lsa_CreateTrustedDomainEx2.auth_info_internal", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_Delete_handle,
          { "Handle", "lsarpc.lsa_Delete.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_EVENTS_audit_events,
-         { "Audit Events", "lsarpc.lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_EVENTS.audit_events", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_PolicyInformation_account_domain,
+         { "Account Domain", "lsarpc.lsa_PolicyInformation.account_domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_DomainInfoKerberos_clock_skew,
          { "Clock Skew", "lsarpc.lsa_DomainInfoKerberos.clock_skew", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_TREAT_AS_EXTERNAL,
          { "Lsa Trust Attribute Treat As External", "lsarpc.lsa_TrustAttributes.LSA_TRUST_ATTRIBUTE_TREAT_AS_EXTERNAL", FT_BOOLEAN, 32, TFS(&lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_TREAT_AS_EXTERNAL_tfs), ( 0x00000040 ), NULL, HFILL }},
        { &hf_lsarpc_lsa_ForestTrustCollisionXrefFlags_LSA_NB_DISABLED_ADMIN,
          { "Lsa Nb Disabled Admin", "lsarpc.lsa_ForestTrustCollisionXrefFlags.LSA_NB_DISABLED_ADMIN", FT_BOOLEAN, 32, TFS(&lsa_ForestTrustCollisionXrefFlags_LSA_NB_DISABLED_ADMIN_tfs), ( 0x00000004 ), NULL, HFILL }},
-       { &hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_2_INTERNAL_full_info2_internal,
-         { "Full Info2 Internal", "lsarpc.lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_2_INTERNAL.full_info2_internal", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_ForestTrustData_domain_info,
+         { "Domain Info", "lsarpc.lsa_ForestTrustData.domain_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_AddPrivilegesToAccount_handle,
          { "Handle", "lsarpc.lsa_AddPrivilegesToAccount.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_ObjectAttribute_sec_qos,
@@ -14366,14 +14361,10 @@ void proto_register_dcerpc_lsarpc(void)
          { "Handle", "lsarpc.lsa_EnumAccounts.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_CreateAccount_sid,
          { "Sid", "lsarpc.lsa_CreateAccount.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_DOMAIN_domain,
-         { "Domain", "lsarpc.lsa_PolicyInformation_valLSA_POLICY_INFO_DOMAIN.domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_ReplicaSourceInfo_account,
          { "Account", "lsarpc.lsa_ReplicaSourceInfo.account", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_QueryDomainInformationPolicy_handle,
          { "Handle", "lsarpc.lsa_QueryDomainInformationPolicy.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_ForestTrustData_valLSA_FOREST_TRUST_DOMAIN_INFO_domain_info,
-         { "Domain Info", "lsarpc.lsa_ForestTrustData_valLSA_FOREST_TRUST_DOMAIN_INFO.domain_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_CreateTrustedDomain_info,
          { "Info", "lsarpc.lsa_CreateTrustedDomain.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustDomainInfoControllers_netbios_names,
@@ -14398,42 +14389,38 @@ void proto_register_dcerpc_lsarpc(void)
          { "Max Size", "lsarpc.lsa_EnumTrustedDomainsEx.max_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupPrivName_handle,
          { "Handle", "lsarpc.lsa_LookupPrivName.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_ForestTrustCollisionFlags_valLSA_FOREST_TRUST_COLLISION_TDO_flags,
-         { "Flags", "lsarpc.lsa_ForestTrustCollisionFlags_valLSA_FOREST_TRUST_COLLISION_TDO.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_ForestTrustCollisionFlags_flags,
+         { "Flags", "lsarpc.lsa_ForestTrustCollisionFlags.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_OpenAccount_handle,
          { "Handle", "lsarpc.lsa_OpenAccount.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_OpenSecret_access_mask,
          { "Access Mask", "lsarpc.lsa_OpenSecret.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_QuerySecurity_sdbuf,
          { "Sdbuf", "lsarpc.lsa_QuerySecurity.sdbuf", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_MOD_mod,
-         { "Mod", "lsarpc.lsa_PolicyInformation_valLSA_POLICY_INFO_MOD.mod", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_SetTrustedDomainInfoByName_trusted_domain,
          { "Trusted Domain", "lsarpc.lsa_SetTrustedDomainInfoByName.trusted_domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_CreateTrustedDomain_trustdom_handle,
          { "Trustdom Handle", "lsarpc.lsa_CreateTrustedDomain.trustdom_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_EnumPrivs_handle,
          { "Handle", "lsarpc.lsa_EnumPrivs.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_auth_info,
-         { "Auth Info", "lsarpc.lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_AUTH_INFO.auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LUID_high,
          { "High", "lsarpc.lsa_LUID.high", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_QueryInfoPolicy_handle,
          { "Handle", "lsarpc.lsa_QueryInfoPolicy.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_PolicyInformation_audit_events,
+         { "Audit Events", "lsarpc.lsa_PolicyInformation.audit_events", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_TrustedDomainInfo_auth_info,
+         { "Auth Info", "lsarpc.lsa_TrustedDomainInfo.auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_CREATE_PRIVILEGE,
          { "Lsa Policy Create Privilege", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_CREATE_PRIVILEGE", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_CREATE_PRIVILEGE_tfs), ( 0x00000040 ), NULL, HFILL }},
        { &hf_lsarpc_lsa_DomainInfoKerberos_service_tkt_lifetime,
          { "Service Tkt Lifetime", "lsarpc.lsa_DomainInfoKerberos.service_tkt_lifetime", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_DNS_INT_dns,
-         { "Dns", "lsarpc.lsa_PolicyInformation_valLSA_POLICY_INFO_DNS_INT.dns", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_CreateSecret_access_mask,
          { "Access Mask", "lsarpc.lsa_CreateSecret.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_GetUserName_authority_name,
          { "Authority Name", "lsarpc.lsa_GetUserName.authority_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_SetTrustedDomainInfo_dom_sid,
          { "Dom Sid", "lsarpc.lsa_SetTrustedDomainInfo.dom_sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET_posix_offset,
-         { "Posix Offset", "lsarpc.lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET.posix_offset", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_AuditFullSetInfo_shutdown_on_full,
          { "Shutdown On Full", "lsarpc.lsa_AuditFullSetInfo.shutdown_on_full", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_DeleteTrustedDomain_dom_sid,
@@ -14444,12 +14431,14 @@ void proto_register_dcerpc_lsarpc(void)
          { "Forest Trust Data", "lsarpc.lsa_ForestTrustRecord.forest_trust_data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustDirection_LSA_TRUST_DIRECTION_OUTBOUND,
          { "Lsa Trust Direction Outbound", "lsarpc.lsa_TrustDirection.LSA_TRUST_DIRECTION_OUTBOUND", FT_BOOLEAN, 32, TFS(&lsa_TrustDirection_LSA_TRUST_DIRECTION_OUTBOUND_tfs), ( 0x00000002 ), NULL, HFILL }},
+       { &hf_lsarpc_lsa_PolicyInformation_role,
+         { "Role", "lsarpc.lsa_PolicyInformation.role", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_PolicyInformation_audit_log,
+         { "Audit Log", "lsarpc.lsa_PolicyInformation.audit_log", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupNames2_client_revision,
          { "Client Revision", "lsarpc.lsa_LookupNames2.client_revision", FT_UINT32, BASE_DEC, VALS(lsarpc_lsa_ClientRevision_vals), 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_ROLE_role,
-         { "Role", "lsarpc.lsa_PolicyInformation_valLSA_POLICY_INFO_ROLE.role", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_ForestTrustData_valdefault_data,
-         { "Data", "lsarpc.lsa_ForestTrustData_valdefault.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_PolicyInformation_dns,
+         { "Dns", "lsarpc.lsa_PolicyInformation.dns", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_lsaRSetForestTrustInformation_handle,
          { "Handle", "lsarpc.lsa_lsaRSetForestTrustInformation.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_lsaRQueryForestTrustInformation_trusted_domain_name,
@@ -14462,6 +14451,8 @@ void proto_register_dcerpc_lsarpc(void)
          { "Handle", "lsarpc.lsa_EnumAccountsWithUserRight.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustDomainInfoAuthInfo_incoming_count,
          { "Incoming Count", "lsarpc.lsa_TrustDomainInfoAuthInfo.incoming_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_PolicyInformation_mod,
+         { "Mod", "lsarpc.lsa_PolicyInformation.mod", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupSids3_client_revision,
          { "Client Revision", "lsarpc.lsa_LookupSids3.client_revision", FT_UINT32, BASE_DEC, VALS(lsarpc_lsa_ClientRevision_vals), 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_RemoveAccountRights_rights,
@@ -14478,8 +14469,6 @@ void proto_register_dcerpc_lsarpc(void)
          { "Old Password", "lsarpc.lsa_TrustDomainInfoPassword.old_password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_DomainInfoKerberos_user_tkt_renewaltime,
          { "User Tkt Renewaltime", "lsarpc.lsa_DomainInfoKerberos.user_tkt_renewaltime", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_INTERNAL_auth_info_internal,
-         { "Auth Info Internal", "lsarpc.lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_INTERNAL.auth_info_internal", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LUID_low,
          { "Low", "lsarpc.lsa_LUID.low", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupNames3_names,
@@ -14518,8 +14507,6 @@ void proto_register_dcerpc_lsarpc(void)
          { "Info", "lsarpc.lsa_QueryDomainInformationPolicy.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_ForestTrustDomainInfo_netbios_domain_name,
          { "Netbios Domain Name", "lsarpc.lsa_ForestTrustDomainInfo.netbios_domain_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES_enc_types,
-         { "Enc Types", "lsarpc.lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES.enc_types", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustDomainInfoInfoEx_trust_direction,
          { "Trust Direction", "lsarpc.lsa_TrustDomainInfoInfoEx.trust_direction", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupNames3_sids,
@@ -14528,8 +14515,6 @@ void proto_register_dcerpc_lsarpc(void)
          { "Sec Desc", "lsarpc.lsa_ObjectAttribute.sec_desc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_AuditLogInfo_retention_time,
          { "Retention Time", "lsarpc.lsa_AuditLogInfo.retention_time", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_PASSWORD_password,
-         { "Password", "lsarpc.lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_PASSWORD.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_DnsDomainInfo_name,
          { "Name", "lsarpc.lsa_DnsDomainInfo.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TranslatedSid2_sid_index,
@@ -14546,6 +14531,8 @@ void proto_register_dcerpc_lsarpc(void)
          { "Info", "lsarpc.lsa_QueryInfoPolicy2.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_GetSystemAccessAccount_access_mask,
          { "Access Mask", "lsarpc.lsa_GetSystemAccessAccount.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_DomainInformationPolicy_kerberos_info,
+         { "Kerberos Info", "lsarpc.lsa_DomainInformationPolicy.kerberos_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_QueryInfoPolicy_info,
          { "Info", "lsarpc.lsa_QueryInfoPolicy.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_CreateAccount_acct_handle,
@@ -14566,8 +14553,6 @@ void proto_register_dcerpc_lsarpc(void)
          { "Max Size", "lsarpc.lsa_EnumTrustDom.max_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_NON_TRANSITIVE,
          { "Lsa Trust Attribute Non Transitive", "lsarpc.lsa_TrustAttributes.LSA_TRUST_ATTRIBUTE_NON_TRANSITIVE", FT_BOOLEAN, 32, TFS(&lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_NON_TRANSITIVE_tfs), ( 0x00000001 ), NULL, HFILL }},
-       { &hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_CONTROLLERS_controllers,
-         { "Controllers", "lsarpc.lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_CONTROLLERS.controllers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustDomainInfoPassword_password,
          { "Password", "lsarpc.lsa_TrustDomainInfoPassword.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_ObjectAttribute_object_name,
@@ -14588,6 +14573,8 @@ void proto_register_dcerpc_lsarpc(void)
          { "Lsa Policy Audit Log Admin", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_AUDIT_LOG_ADMIN", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_AUDIT_LOG_ADMIN_tfs), ( 0x00000200 ), NULL, HFILL }},
        { &hf_lsarpc_lsa_ForestTrustInformation_entries,
          { "Entries", "lsarpc.lsa_ForestTrustInformation.entries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_ForestTrustData_top_level_name_ex,
+         { "Top Level Name Ex", "lsarpc.lsa_ForestTrustData.top_level_name_ex", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_DefaultQuotaInfo_non_paged_pool,
          { "Non Paged Pool", "lsarpc.lsa_DefaultQuotaInfo.non_paged_pool", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_ForestTrustBinaryData_length,
@@ -14630,6 +14617,8 @@ void proto_register_dcerpc_lsarpc(void)
          { "Pagefile", "lsarpc.lsa_DefaultQuotaInfo.pagefile", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_DefaultQuotaInfo_min_wss,
          { "Min Wss", "lsarpc.lsa_DefaultQuotaInfo.min_wss", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_ForestTrustData_top_level_name,
+         { "Top Level Name", "lsarpc.lsa_ForestTrustData.top_level_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TranslatedName2_sid_type,
          { "Sid Type", "lsarpc.lsa_TranslatedName2.sid_type", FT_UINT1632, BASE_DEC, VALS(lsarpc_lsa_SidType_vals), 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupPrivDisplayName_returned_language_id,
@@ -14648,6 +14637,8 @@ void proto_register_dcerpc_lsarpc(void)
          { "Lsa Trusted Set Auth", "lsarpc.lsa_TrustedAccessMask.LSA_TRUSTED_SET_AUTH", FT_BOOLEAN, 32, TFS(&lsa_TrustedAccessMask_LSA_TRUSTED_SET_AUTH_tfs), ( 0x00000020 ), NULL, HFILL }},
        { &hf_lsarpc_lsa_RemoveAccountRights_handle,
          { "Handle", "lsarpc.lsa_RemoveAccountRights.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_TrustedDomainInfo_full_info_internal,
+         { "Full Info Internal", "lsarpc.lsa_TrustedDomainInfo.full_info_internal", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_CROSS_ORGANIZATION,
          { "Lsa Trust Attribute Cross Organization", "lsarpc.lsa_TrustAttributes.LSA_TRUST_ATTRIBUTE_CROSS_ORGANIZATION", FT_BOOLEAN, 32, TFS(&lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_CROSS_ORGANIZATION_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupNames3_count,
@@ -14696,8 +14687,6 @@ void proto_register_dcerpc_lsarpc(void)
          { "Name", "lsarpc.lsa_DomainInfo.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_AsciiString_size,
          { "Size", "lsarpc.lsa_AsciiString.size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_INFO_EX_info_ex,
-         { "Info Ex", "lsarpc.lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_INFO_EX.info_ex", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_ForestTrustCollisionTDOFlags_LSA_TLN_DISABLED_ADMIN,
          { "Lsa Tln Disabled Admin", "lsarpc.lsa_ForestTrustCollisionTDOFlags.LSA_TLN_DISABLED_ADMIN", FT_BOOLEAN, 32, TFS(&lsa_ForestTrustCollisionTDOFlags_LSA_TLN_DISABLED_ADMIN_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_lsarpc_lsa_ForestTrustCollisionTDOFlags_LSA_TLN_DISABLED_NEW,
@@ -14708,22 +14697,20 @@ void proto_register_dcerpc_lsarpc(void)
          { "Level", "lsarpc.lsa_SetDomainInformationPolicy.level", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_krbAuthenticationOptions_LSA_POLICY_KERBEROS_VALIDATE_CLIENT,
          { "Lsa Policy Kerberos Validate Client", "lsarpc.lsa_krbAuthenticationOptions.LSA_POLICY_KERBEROS_VALIDATE_CLIENT", FT_BOOLEAN, 32, TFS(&lsa_krbAuthenticationOptions_LSA_POLICY_KERBEROS_VALIDATE_CLIENT_tfs), ( 0x00000080 ), NULL, HFILL }},
-       { &hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_FULL_SET_auditfullset,
-         { "Auditfullset", "lsarpc.lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_FULL_SET.auditfullset", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_SetInfoPolicy2_info,
          { "Info", "lsarpc.lsa_SetInfoPolicy2.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustDirection_LSA_TRUST_DIRECTION_INBOUND,
          { "Lsa Trust Direction Inbound", "lsarpc.lsa_TrustDirection.LSA_TRUST_DIRECTION_INBOUND", FT_BOOLEAN, 32, TFS(&lsa_TrustDirection_LSA_TRUST_DIRECTION_INBOUND_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_lsarpc_lsa_AsciiStringLarge_string,
          { "String", "lsarpc.lsa_AsciiStringLarge.string", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_QUOTA_quota,
-         { "Quota", "lsarpc.lsa_PolicyInformation_valLSA_POLICY_INFO_QUOTA.quota", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupSids2_level,
          { "Level", "lsarpc.lsa_LookupSids2.level", FT_UINT1632, BASE_DEC, VALS(lsarpc_lsa_LookupNamesLevel_vals), 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_OpenSecret_sec_handle,
          { "Sec Handle", "lsarpc.lsa_OpenSecret.sec_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustDomainInfoAuthInfo_incoming_current_auth_info,
          { "Incoming Current Auth Info", "lsarpc.lsa_TrustDomainInfoAuthInfo.incoming_current_auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_DomainInformationPolicy_efs_info,
+         { "Efs Info", "lsarpc.lsa_DomainInformationPolicy.efs_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_EnumAccounts_sids,
          { "Sids", "lsarpc.lsa_EnumAccounts.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_ReplicaSourceInfo_source,
@@ -14732,6 +14719,8 @@ void proto_register_dcerpc_lsarpc(void)
          { "Sec Info", "lsarpc.lsa_QuerySecurity.sec_info", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_ForestTrustCollisionRecord_name,
          { "Name", "lsarpc.lsa_ForestTrustCollisionRecord.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_TrustedDomainInfo_info_ex2_internal,
+         { "Info Ex2 Internal", "lsarpc.lsa_TrustedDomainInfo.info_ex2_internal", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupSids2_domains,
          { "Domains", "lsarpc.lsa_LookupSids2.domains", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_EnumTrustedDomainsEx_domains,
@@ -14752,6 +14741,8 @@ void proto_register_dcerpc_lsarpc(void)
          { "Handle", "lsarpc.lsa_LookupSids.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_AsciiString_string,
          { "String", "lsarpc.lsa_AsciiString.string", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_TrustedDomainInfo_info_ex,
+         { "Info Ex", "lsarpc.lsa_TrustedDomainInfo.info_ex", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_CreateTrustedDomainEx2_trustdom_handle,
          { "Trustdom Handle", "lsarpc.lsa_CreateTrustedDomainEx2.trustdom_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_RemovePrivilegesFromAccount_handle,
@@ -14760,6 +14751,8 @@ void proto_register_dcerpc_lsarpc(void)
          { "Handle", "lsarpc.lsa_CreateAccount.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustedAccessMask_LSA_TRUSTED_QUERY_DOMAIN_NAME,
          { "Lsa Trusted Query Domain Name", "lsarpc.lsa_TrustedAccessMask.LSA_TRUSTED_QUERY_DOMAIN_NAME", FT_BOOLEAN, 32, TFS(&lsa_TrustedAccessMask_LSA_TRUSTED_QUERY_DOMAIN_NAME_tfs), ( 0x00000001 ), NULL, HFILL }},
+       { &hf_lsarpc_lsa_TrustedDomainInfo_name,
+         { "Name", "lsarpc.lsa_TrustedDomainInfo.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustDomainInfoInfoEx2Internal_forest_trust_length,
          { "Forest Trust Length", "lsarpc.lsa_TrustDomainInfoInfoEx2Internal.forest_trust_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_EnumAccountRights_rights,
@@ -14782,6 +14775,8 @@ void proto_register_dcerpc_lsarpc(void)
          { "Level", "lsarpc.lsa_SetInfoPolicy2.level", FT_UINT1632, BASE_DEC, VALS(lsarpc_lsa_PolicyInfo_vals), 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_EnumPrivsAccount_privs,
          { "Privs", "lsarpc.lsa_EnumPrivsAccount.privs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_TrustedDomainInfo_controllers,
+         { "Controllers", "lsarpc.lsa_TrustedDomainInfo.controllers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_OpenAccount_access_mask,
          { "Access Mask", "lsarpc.lsa_OpenAccount.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_EnumPrivs_privs,
@@ -14790,6 +14785,8 @@ void proto_register_dcerpc_lsarpc(void)
          { "Lsa Policy Trust Admin", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_TRUST_ADMIN", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_TRUST_ADMIN_tfs), ( 0x00000008 ), NULL, HFILL }},
        { &hf_lsarpc_lsa_AuditLogInfo_percent_full,
          { "Percent Full", "lsarpc.lsa_AuditLogInfo.percent_full", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_PolicyInformation_quota,
+         { "Quota", "lsarpc.lsa_PolicyInformation.quota", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_RemovePrivilegesFromAccount_privs,
          { "Privs", "lsarpc.lsa_RemovePrivilegesFromAccount.privs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustDomainInfoBuffer_AuthType,
@@ -14818,8 +14815,6 @@ void proto_register_dcerpc_lsarpc(void)
          { "Level", "lsarpc.lsa_SetTrustedDomainInfoByName.level", FT_UINT1632, BASE_DEC, VALS(lsarpc_lsa_TrustDomInfoEnum_vals), 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_lsaRSetForestTrustInformation_collision_info,
          { "Collision Info", "lsarpc.lsa_lsaRSetForestTrustInformation.collision_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_INFO_EX2_INTERNAL_info_ex2_internal,
-         { "Info Ex2 Internal", "lsarpc.lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_INFO_EX2_INTERNAL.info_ex2_internal", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupPrivDisplayName_language_id,
          { "Language Id", "lsarpc.lsa_LookupPrivDisplayName.language_id", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TransSidArray3_sids,
@@ -14834,8 +14829,6 @@ void proto_register_dcerpc_lsarpc(void)
          { "Handle", "lsarpc.lsa_SetTrustedDomainInfo.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustDomainInfoAuthInfo_outgoing_previous_auth_info,
          { "Outgoing Previous Auth Info", "lsarpc.lsa_TrustDomainInfoAuthInfo.outgoing_previous_auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_ForestTrustData_valLSA_FOREST_TRUST_TOP_LEVEL_NAME_top_level_name,
-         { "Top Level Name", "lsarpc.lsa_ForestTrustData_valLSA_FOREST_TRUST_TOP_LEVEL_NAME.top_level_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupPrivValue_name,
          { "Name", "lsarpc.lsa_LookupPrivValue.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustedAccessMask_LSA_TRUSTED_QUERY_CONTROLLERS,
@@ -14860,8 +14853,6 @@ void proto_register_dcerpc_lsarpc(void)
          { "Handle", "lsarpc.lsa_EnumTrustDom.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_ForestTrustCollisionInfo_count,
          { "Count", "lsarpc.lsa_ForestTrustCollisionInfo.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_DomainInformationPolicy_valLSA_DOMAIN_INFO_POLICY_EFS_efs_info,
-         { "Efs Info", "lsarpc.lsa_DomainInformationPolicy_valLSA_DOMAIN_INFO_POLICY_EFS.efs_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_CreateAccount_access_mask,
          { "Access Mask", "lsarpc.lsa_CreateAccount.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_OpenPolicy2_attr,
@@ -14878,16 +14869,16 @@ void proto_register_dcerpc_lsarpc(void)
          { "Auth Info", "lsarpc.lsa_CreateTrustedDomainEx.auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TranslatedName_sid_index,
          { "Sid Index", "lsarpc.lsa_TranslatedName.sid_index", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_PD_pd,
-         { "Pd", "lsarpc.lsa_PolicyInformation_valLSA_POLICY_INFO_PD.pd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_full_info,
-         { "Full Info", "lsarpc.lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO.full_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_TrustedDomainInfo_password,
+         { "Password", "lsarpc.lsa_TrustedDomainInfo.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_ModificationInfo_db_create_time,
          { "Db Create Time", "lsarpc.lsa_ModificationInfo.db_create_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_RetrievePrivateData_name,
          { "Name", "lsarpc.lsa_RetrievePrivateData.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_NOTIFICATION,
          { "Lsa Policy Notification", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_NOTIFICATION", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_NOTIFICATION_tfs), ( 0x00001000 ), NULL, HFILL }},
+       { &hf_lsarpc_lsa_PolicyInformation_domain,
+         { "Domain", "lsarpc.lsa_PolicyInformation.domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_DATA_BUF2_size,
          { "Size", "lsarpc.lsa_DATA_BUF2.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_QueryTrustedDomainInfoByName_handle,
@@ -14914,12 +14905,12 @@ void proto_register_dcerpc_lsarpc(void)
          { "Sids", "lsarpc.lsa_TransSidArray2.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TransSidArray3_count,
          { "Count", "lsarpc.lsa_TransSidArray3.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_REPLICA_replica,
-         { "Replica", "lsarpc.lsa_PolicyInformation_valLSA_POLICY_INFO_REPLICA.replica", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_lsaRQueryForestTrustInformation_handle,
          { "Handle", "lsarpc.lsa_lsaRQueryForestTrustInformation.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_CreateTrustedDomainEx_policy_handle,
          { "Policy Handle", "lsarpc.lsa_CreateTrustedDomainEx.policy_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_PolicyInformation_l_account_domain,
+         { "L Account Domain", "lsarpc.lsa_PolicyInformation.l_account_domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_StorePrivateData_handle,
          { "Handle", "lsarpc.lsa_StorePrivateData.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_DomainList_count,
@@ -14946,8 +14937,6 @@ void proto_register_dcerpc_lsarpc(void)
          { "Lsa Trust Attribute Uses Rc4 Encryption", "lsarpc.lsa_TrustAttributes.LSA_TRUST_ATTRIBUTE_USES_RC4_ENCRYPTION", FT_BOOLEAN, 32, TFS(&lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_USES_RC4_ENCRYPTION_tfs), ( 0x00000080 ), NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupNames_sids,
          { "Sids", "lsarpc.lsa_LookupNames.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_FULL_QUERY_auditfullquery,
-         { "Auditfullquery", "lsarpc.lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_FULL_QUERY.auditfullquery", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_EnumAccountsWithUserRight_name,
          { "Name", "lsarpc.lsa_EnumAccountsWithUserRight.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupPrivName_name,
@@ -14964,6 +14953,8 @@ void proto_register_dcerpc_lsarpc(void)
          { "Info", "lsarpc.lsa_SetDomainInformationPolicy.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_SetDomainInformationPolicy_handle,
          { "Handle", "lsarpc.lsa_SetDomainInformationPolicy.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_PolicyInformation_replica,
+         { "Replica", "lsarpc.lsa_PolicyInformation.replica", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TransSidArray_count,
          { "Count", "lsarpc.lsa_TransSidArray.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_SetTrustedDomainInfo_level,
@@ -14984,12 +14975,14 @@ void proto_register_dcerpc_lsarpc(void)
          { "Domain Name", "lsarpc.lsa_TrustDomainInfoInfoEx.domain_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupSids2_count,
          { "Count", "lsarpc.lsa_LookupSids2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_TrustedDomainInfo_info_basic,
+         { "Info Basic", "lsarpc.lsa_TrustedDomainInfo.info_basic", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustDomainInfoPosixOffset_posix_offset,
          { "Posix Offset", "lsarpc.lsa_TrustDomainInfoPosixOffset.posix_offset", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_TrustedDomainInfo_full_info2_internal,
+         { "Full Info2 Internal", "lsarpc.lsa_TrustedDomainInfo.full_info2_internal", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_CreateTrustedDomainEx2_policy_handle,
          { "Policy Handle", "lsarpc.lsa_CreateTrustedDomainEx2.policy_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_ForestTrustCollisionFlags_valdefault_flags,
-         { "Flags", "lsarpc.lsa_ForestTrustCollisionFlags_valdefault.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_WITHIN_FOREST,
          { "Lsa Trust Attribute Within Forest", "lsarpc.lsa_TrustAttributes.LSA_TRUST_ATTRIBUTE_WITHIN_FOREST", FT_BOOLEAN, 32, TFS(&lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_WITHIN_FOREST_tfs), ( 0x00000020 ), NULL, HFILL }},
        { &hf_lsarpc_lsa_OpenSecret_name,
@@ -15000,8 +14993,6 @@ void proto_register_dcerpc_lsarpc(void)
          { "Account Name", "lsarpc.lsa_GetUserName.account_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LUIDAttribute_attribute,
          { "Attribute", "lsarpc.lsa_LUIDAttribute.attribute", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_BASIC_info_basic,
-         { "Info Basic", "lsarpc.lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_BASIC.info_basic", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_OpenPolicy_access_mask,
          { "Access Mask", "lsarpc.lsa_OpenPolicy.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_DATA_BUF_PTR_buf,
@@ -15012,6 +15003,8 @@ void proto_register_dcerpc_lsarpc(void)
          { "Size", "lsarpc.lsa_String.size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustDomainInfoAuthInfo_outgoing_current_auth_info,
          { "Outgoing Current Auth Info", "lsarpc.lsa_TrustDomainInfoAuthInfo.outgoing_current_auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_TrustedDomainInfo_posix_offset,
+         { "Posix Offset", "lsarpc.lsa_TrustedDomainInfo.posix_offset", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupSids3_lookup_options,
          { "Lookup Options", "lsarpc.lsa_LookupSids3.lookup_options", FT_UINT32, BASE_DEC, VALS(lsarpc_lsa_LookupOptions_vals), 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustDomainInfoInfoEx2Internal_info_ex,
@@ -15154,20 +15147,18 @@ void proto_register_dcerpc_lsarpc(void)
          { "Size", "lsarpc.lsa_StringLarge.size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_ObjectAttribute_attributes,
          { "Attributes", "lsarpc.lsa_ObjectAttribute.attributes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_TrustedDomainInfo_auth_info_internal,
+         { "Auth Info Internal", "lsarpc.lsa_TrustedDomainInfo.auth_info_internal", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_QosInfo_effective_only,
          { "Effective Only", "lsarpc.lsa_QosInfo.effective_only", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_OpenPolicy_attr,
          { "Attr", "lsarpc.lsa_OpenPolicy.attr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_ObjectAttribute_len,
          { "Len", "lsarpc.lsa_ObjectAttribute.len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_ForestTrustData_valLSA_FOREST_TRUST_TOP_LEVEL_NAME_EX_top_level_name_ex,
-         { "Top Level Name Ex", "lsarpc.lsa_ForestTrustData_valLSA_FOREST_TRUST_TOP_LEVEL_NAME_EX.top_level_name_ex", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustDomainInfoBasic_sid,
          { "Sid", "lsarpc.lsa_TrustDomainInfoBasic.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_PrivEntry_name,
          { "Name", "lsarpc.lsa_PrivEntry.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_DomainInformationPolicy_valLSA_DOMAIN_INFO_POLICY_KERBEROS_kerberos_info,
-         { "Kerberos Info", "lsarpc.lsa_DomainInformationPolicy_valLSA_DOMAIN_INFO_POLICY_KERBEROS.kerberos_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_ServerRole_role,
          { "Role", "lsarpc.lsa_ServerRole.role", FT_UINT32, BASE_DEC, VALS(lsarpc_lsa_Role_vals), 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_BinaryString_array,
@@ -15192,8 +15183,12 @@ void proto_register_dcerpc_lsarpc(void)
          { "Names", "lsarpc.lsa_Strings.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustDomainInfoFullInfoInternal_posix_offset,
          { "Posix Offset", "lsarpc.lsa_TrustDomainInfoFullInfoInternal.posix_offset", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_PolicyInformation_auditfullset,
+         { "Auditfullset", "lsarpc.lsa_PolicyInformation.auditfullset", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_OpenPolicy_handle,
          { "Handle", "lsarpc.lsa_OpenPolicy.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_ForestTrustData_data,
+         { "Data", "lsarpc.lsa_ForestTrustData.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_ForestTrustCollisionRecord_flags,
          { "Flags", "lsarpc.lsa_ForestTrustCollisionRecord.flags", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupSids_count,
@@ -15208,8 +15203,6 @@ void proto_register_dcerpc_lsarpc(void)
          { "Domains", "lsarpc.lsa_LookupSids.domains", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TranslatedSid_rid,
          { "Rid", "lsarpc.lsa_TranslatedSid.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_ACCOUNT_DOMAIN_account_domain,
-         { "Account Domain", "lsarpc.lsa_PolicyInformation_valLSA_POLICY_INFO_ACCOUNT_DOMAIN.account_domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_DomainInfoEfs_efs_blob,
          { "Efs Blob", "lsarpc.lsa_DomainInfoEfs.efs_blob", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_RemovePrivilegesFromAccount_remove_all,
@@ -15218,8 +15211,6 @@ void proto_register_dcerpc_lsarpc(void)
          { "Lsa Secret Query Value", "lsarpc.lsa_SecretAccessMask.LSA_SECRET_QUERY_VALUE", FT_BOOLEAN, 32, TFS(&lsa_SecretAccessMask_LSA_SECRET_QUERY_VALUE_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_lsarpc_lsa_AddAccountRights_handle,
          { "Handle", "lsarpc.lsa_AddAccountRights.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_DNS_dns,
-         { "Dns", "lsarpc.lsa_PolicyInformation_valLSA_POLICY_INFO_DNS.dns", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_DomainInfoEfs_blob_size,
          { "Blob Size", "lsarpc.lsa_DomainInfoEfs.blob_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_OpenPolicy2_system_name,
@@ -15228,16 +15219,12 @@ void proto_register_dcerpc_lsarpc(void)
          { "Forest Trust Info", "lsarpc.lsa_lsaRQueryForestTrustInformation.forest_trust_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_CreateTrustedDomain_policy_handle,
          { "Policy Handle", "lsarpc.lsa_CreateTrustedDomain.policy_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_LOG_audit_log,
-         { "Audit Log", "lsarpc.lsa_PolicyInformation_valLSA_POLICY_INFO_AUDIT_LOG.audit_log", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustDomainInfoFullInfoInternal_auth_info,
          { "Auth Info", "lsarpc.lsa_TrustDomainInfoFullInfoInternal.auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_DefaultQuotaInfo_max_wss,
          { "Max Wss", "lsarpc.lsa_DefaultQuotaInfo.max_wss", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_DefaultQuotaInfo_paged_pool,
          { "Paged Pool", "lsarpc.lsa_DefaultQuotaInfo.paged_pool", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_INTERNAL_full_info_internal,
-         { "Full Info Internal", "lsarpc.lsa_TrustedDomainInfo_valLSA_TRUSTED_DOMAIN_INFO_FULL_INFO_INTERNAL.full_info_internal", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_UPLEVEL_ONLY,
          { "Lsa Trust Attribute Uplevel Only", "lsarpc.lsa_TrustAttributes.LSA_TRUST_ATTRIBUTE_UPLEVEL_ONLY", FT_BOOLEAN, 32, TFS(&lsa_TrustAttributes_LSA_TRUST_ATTRIBUTE_UPLEVEL_ONLY_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupSids_level,
@@ -15260,8 +15247,6 @@ void proto_register_dcerpc_lsarpc(void)
          { "Handle", "lsarpc.lsa_EnumTrustedDomainsEx.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_AsciiString_length,
          { "Length", "lsarpc.lsa_AsciiString.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_lsarpc_lsa_ForestTrustCollisionFlags_valLSA_FOREST_TRUST_COLLISION_XREF_flags,
-         { "Flags", "lsarpc.lsa_ForestTrustCollisionFlags_valLSA_FOREST_TRUST_COLLISION_XREF.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_EnumAccountRights_sid,
          { "Sid", "lsarpc.lsa_EnumAccountRights.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupSids_sids,
@@ -15282,8 +15267,12 @@ void proto_register_dcerpc_lsarpc(void)
          { "Count", "lsarpc.lsa_TransNameArray.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_RetrievePrivateData_val,
          { "Val", "lsarpc.lsa_RetrievePrivateData.val", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_PolicyInformation_pd,
+         { "Pd", "lsarpc.lsa_PolicyInformation.pd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_TranslatedName2_sid_index,
          { "Sid Index", "lsarpc.lsa_TranslatedName2.sid_index", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_PolicyInformation_auditfullquery,
+         { "Auditfullquery", "lsarpc.lsa_PolicyInformation.auditfullquery", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_ModificationInfo_modified_id,
          { "Modified Id", "lsarpc.lsa_ModificationInfo.modified_id", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_QuerySecret_new_mtime,
@@ -15296,6 +15285,8 @@ void proto_register_dcerpc_lsarpc(void)
          { "Count", "lsarpc.lsa_AuditEventsInfo.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_SetInfoPolicy_level,
          { "Level", "lsarpc.lsa_SetInfoPolicy.level", FT_UINT1632, BASE_DEC, VALS(lsarpc_lsa_PolicyInfo_vals), 0, NULL, HFILL }},
+       { &hf_lsarpc_lsa_TrustedDomainInfo_full_info,
+         { "Full Info", "lsarpc.lsa_TrustedDomainInfo.full_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_CreateTrustedDomainEx_access_mask,
          { "Access Mask", "lsarpc.lsa_CreateTrustedDomainEx.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_lsarpc_lsa_LookupSids3_count,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-misc.c b/bin/default/librpc/gen_ndr/packet-dcerpc-misc.c
index c1b4f7eea760b9f535bb80204bd53a570ad17d54..873f59eb4e09dd48fd0fc7f0127da7e9714d7a0e 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-misc.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-misc.c
@@ -49,20 +49,23 @@ static gint hf_misc_svcctl_ServerType_SV_TYPE_WIN95_PLUS = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_NOVELL = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_TIME_SOURCE = -1;
 static gint hf_misc_GUID_node = -1;
+static gint hf_misc_winreg_Data_string = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_BACKUP_BROWSER = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_DOMAIN_CTRL = -1;
+static gint hf_misc_winreg_Data_data = -1;
+static gint hf_misc_winreg_Data_binary = -1;
 static gint hf_misc_policy_handle_uuid = -1;
 static gint hf_misc_policy_handle_handle_type = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_WORKSTATION = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_DOMAIN_MEMBER = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_SERVER_OSF = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_SERVER_MFPN = -1;
-static gint hf_misc_winreg_Data_valREG_DWORD_BIG_ENDIAN_value = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_DFS_SERVER = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_ALTERNATE_XPORT = -1;
 static gint hf_misc_GUID_time_mid = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_DOMAIN_ENUM = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_DOMAIN_BAKCTRL = -1;
+static gint hf_misc_winreg_Data_value = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_DIALIN_SERVER = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_SQLSERVER = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_POTENTIAL_BROWSER = -1;
@@ -70,22 +73,17 @@ static gint hf_misc_svcctl_ServerType_SV_TYPE_LOCAL_LIST_ONLY = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_WFW = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_SERVER_NT = -1;
 static gint hf_misc_KRB5_EDATA_NTSTATUS_ntstatus = -1;
-static gint hf_misc_winreg_Data_valdefault_data = -1;
-static gint hf_misc_winreg_Data_valREG_BINARY_binary = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_SERVER_UNIX = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_SERVER_VMS = -1;
 static gint hf_misc_KRB5_EDATA_NTSTATUS_unknown1 = -1;
-static gint hf_misc_winreg_Data_valREG_SZ_string = -1;
-static gint hf_misc_winreg_Data_valREG_EXPAND_SZ_string = -1;
-static gint hf_misc_winreg_Data_valREG_DWORD_value = -1;
 static gint hf_misc_ndr_syntax_id_uuid = -1;
 static gint hf_misc_opnum = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_AFP = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_MASTER_BROWSER = -1;
 static gint hf_misc_GUID_clock_seq = -1;
-static gint hf_misc_winreg_Data_valREG_MULTI_SZ_string_array = -1;
 static gint hf_misc_svcctl_ServerType_SV_TYPE_NT = -1;
 static gint hf_misc_ndr_syntax_id_if_version = -1;
+static gint hf_misc_winreg_Data_string_array = -1;
 
 static gint proto_dcerpc_misc = -1;
 /* Version information */
@@ -137,13 +135,13 @@ const value_string misc_winreg_Type_vals[] = {
        { REG_QWORD, "REG_QWORD" },
 { 0, NULL }
 };
-static int misc_dissect_element_winreg_Data_valREG_SZ_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int misc_dissect_element_winreg_Data_valREG_EXPAND_SZ_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int misc_dissect_element_winreg_Data_valREG_BINARY_binary(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int misc_dissect_element_winreg_Data_valREG_DWORD_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int misc_dissect_element_winreg_Data_valREG_DWORD_BIG_ENDIAN_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int misc_dissect_element_winreg_Data_valREG_MULTI_SZ_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int misc_dissect_element_winreg_Data_valdefault_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int misc_dissect_element_winreg_Data_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int misc_dissect_element_winreg_Data_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int misc_dissect_element_winreg_Data_binary(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int misc_dissect_element_winreg_Data_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int misc_dissect_element_winreg_Data_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int misc_dissect_element_winreg_Data_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int misc_dissect_element_winreg_Data_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 const value_string misc_netr_SamDatabaseID_vals[] = {
        { SAM_DATABASE_DOMAIN, "SAM_DATABASE_DOMAIN" },
        { SAM_DATABASE_BUILTIN, "SAM_DATABASE_BUILTIN" },
@@ -612,57 +610,57 @@ misc_dissect_enum_winreg_Type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 /* IDL: } */
 
 static int
-misc_dissect_element_winreg_Data_valREG_SZ_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+misc_dissect_element_winreg_Data_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_null_term_wstring(tvb, offset, pinfo, tree, drep, hf_misc_winreg_Data_valREG_SZ_string , 0);
+       offset = dissect_null_term_wstring(tvb, offset, pinfo, tree, drep, hf_misc_winreg_Data_string , 0);
 
        return offset;
 }
 
 static int
-misc_dissect_element_winreg_Data_valREG_EXPAND_SZ_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+misc_dissect_element_winreg_Data_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_null_term_wstring(tvb, offset, pinfo, tree, drep, hf_misc_winreg_Data_valREG_EXPAND_SZ_string , 0);
+       offset = dissect_null_term_wstring(tvb, offset, pinfo, tree, drep, hf_misc_winreg_Data_string , 0);
 
        return offset;
 }
 
 static int
-misc_dissect_element_winreg_Data_valREG_BINARY_binary(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+misc_dissect_element_winreg_Data_binary(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_misc_winreg_Data_valREG_BINARY_binary, 1);
+       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_misc_winreg_Data_binary, 1);
 
        return offset;
 }
 
 static int
-misc_dissect_element_winreg_Data_valREG_DWORD_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+misc_dissect_element_winreg_Data_value(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_misc_winreg_Data_valREG_DWORD_value, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_misc_winreg_Data_value, 0);
 
        return offset;
 }
 
 static int
-misc_dissect_element_winreg_Data_valREG_DWORD_BIG_ENDIAN_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+misc_dissect_element_winreg_Data_value(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_misc_winreg_Data_valREG_DWORD_BIG_ENDIAN_value, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_misc_winreg_Data_value, 0);
 
        return offset;
 }
 
 static int
-misc_dissect_element_winreg_Data_valREG_MULTI_SZ_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+misc_dissect_element_winreg_Data_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = misc_dissect_struct_string_array(tvb,offset,pinfo,tree,drep,hf_misc_winreg_Data_valREG_MULTI_SZ_string_array,0);
+       offset = misc_dissect_struct_string_array(tvb,offset,pinfo,tree,drep,hf_misc_winreg_Data_string_array,0);
 
        return offset;
 }
 
 static int
-misc_dissect_element_winreg_Data_valdefault_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+misc_dissect_element_winreg_Data_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_misc_winreg_Data_valdefault_data, 1);
+       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_misc_winreg_Data_data, 1);
 
        return offset;
 }
@@ -686,31 +684,31 @@ misc_dissect_winreg_Data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _
                break;
 
                case REG_SZ:
-                       offset = misc_dissect_element_winreg_Data_valREG_SZ_string(tvb, offset, pinfo, tree, drep);
+                       offset = misc_dissect_element_winreg_Data_string(tvb, offset, pinfo, tree, drep);
                break;
 
                case REG_EXPAND_SZ:
-                       offset = misc_dissect_element_winreg_Data_valREG_EXPAND_SZ_string(tvb, offset, pinfo, tree, drep);
+                       offset = misc_dissect_element_winreg_Data_string(tvb, offset, pinfo, tree, drep);
                break;
 
                case REG_BINARY:
-                       offset = misc_dissect_element_winreg_Data_valREG_BINARY_binary(tvb, offset, pinfo, tree, drep);
+                       offset = misc_dissect_element_winreg_Data_binary(tvb, offset, pinfo, tree, drep);
                break;
 
                case REG_DWORD:
-                       offset = misc_dissect_element_winreg_Data_valREG_DWORD_value(tvb, offset, pinfo, tree, drep);
+                       offset = misc_dissect_element_winreg_Data_value(tvb, offset, pinfo, tree, drep);
                break;
 
                case REG_DWORD_BIG_ENDIAN:
-                       offset = misc_dissect_element_winreg_Data_valREG_DWORD_BIG_ENDIAN_value(tvb, offset, pinfo, tree, drep);
+                       offset = misc_dissect_element_winreg_Data_value(tvb, offset, pinfo, tree, drep);
                break;
 
                case REG_MULTI_SZ:
-                       offset = misc_dissect_element_winreg_Data_valREG_MULTI_SZ_string_array(tvb, offset, pinfo, tree, drep);
+                       offset = misc_dissect_element_winreg_Data_string_array(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = misc_dissect_element_winreg_Data_valdefault_data(tvb, offset, pinfo, tree, drep);
+                       offset = misc_dissect_element_winreg_Data_data(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -1041,10 +1039,16 @@ void proto_register_dcerpc_misc(void)
          { "Sv Type Time Source", "misc.svcctl_ServerType.SV_TYPE_TIME_SOURCE", FT_BOOLEAN, 32, TFS(&svcctl_ServerType_SV_TYPE_TIME_SOURCE_tfs), ( 0x00000020 ), NULL, HFILL }},
        { &hf_misc_GUID_node,
          { "Node", "misc.GUID.node", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_misc_winreg_Data_string,
+         { "String", "misc.winreg_Data.string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_misc_svcctl_ServerType_SV_TYPE_BACKUP_BROWSER,
          { "Sv Type Backup Browser", "misc.svcctl_ServerType.SV_TYPE_BACKUP_BROWSER", FT_BOOLEAN, 32, TFS(&svcctl_ServerType_SV_TYPE_BACKUP_BROWSER_tfs), ( 0x00020000 ), NULL, HFILL }},
        { &hf_misc_svcctl_ServerType_SV_TYPE_DOMAIN_CTRL,
          { "Sv Type Domain Ctrl", "misc.svcctl_ServerType.SV_TYPE_DOMAIN_CTRL", FT_BOOLEAN, 32, TFS(&svcctl_ServerType_SV_TYPE_DOMAIN_CTRL_tfs), ( 0x00000008 ), NULL, HFILL }},
+       { &hf_misc_winreg_Data_data,
+         { "Data", "misc.winreg_Data.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_misc_winreg_Data_binary,
+         { "Binary", "misc.winreg_Data.binary", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_misc_policy_handle_uuid,
          { "Uuid", "misc.policy_handle.uuid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_misc_policy_handle_handle_type,
@@ -1057,8 +1061,6 @@ void proto_register_dcerpc_misc(void)
          { "Sv Type Server Osf", "misc.svcctl_ServerType.SV_TYPE_SERVER_OSF", FT_BOOLEAN, 32, TFS(&svcctl_ServerType_SV_TYPE_SERVER_OSF_tfs), ( 0x00100000 ), NULL, HFILL }},
        { &hf_misc_svcctl_ServerType_SV_TYPE_SERVER_MFPN,
          { "Sv Type Server Mfpn", "misc.svcctl_ServerType.SV_TYPE_SERVER_MFPN", FT_BOOLEAN, 32, TFS(&svcctl_ServerType_SV_TYPE_SERVER_MFPN_tfs), ( 0x00004000 ), NULL, HFILL }},
-       { &hf_misc_winreg_Data_valREG_DWORD_BIG_ENDIAN_value,
-         { "Value", "misc.winreg_Data_valREG_DWORD_BIG_ENDIAN.value", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_misc_svcctl_ServerType_SV_TYPE_DFS_SERVER,
          { "Sv Type Dfs Server", "misc.svcctl_ServerType.SV_TYPE_DFS_SERVER", FT_BOOLEAN, 32, TFS(&svcctl_ServerType_SV_TYPE_DFS_SERVER_tfs), ( 0x00800000 ), NULL, HFILL }},
        { &hf_misc_svcctl_ServerType_SV_TYPE_ALTERNATE_XPORT,
@@ -1069,6 +1071,8 @@ void proto_register_dcerpc_misc(void)
          { "Sv Type Domain Enum", "misc.svcctl_ServerType.SV_TYPE_DOMAIN_ENUM", FT_BOOLEAN, 32, TFS(&svcctl_ServerType_SV_TYPE_DOMAIN_ENUM_tfs), ( 0x80000000 ), NULL, HFILL }},
        { &hf_misc_svcctl_ServerType_SV_TYPE_DOMAIN_BAKCTRL,
          { "Sv Type Domain Bakctrl", "misc.svcctl_ServerType.SV_TYPE_DOMAIN_BAKCTRL", FT_BOOLEAN, 32, TFS(&svcctl_ServerType_SV_TYPE_DOMAIN_BAKCTRL_tfs), ( 0x00000010 ), NULL, HFILL }},
+       { &hf_misc_winreg_Data_value,
+         { "Value", "misc.winreg_Data.value", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_misc_svcctl_ServerType_SV_TYPE_DIALIN_SERVER,
          { "Sv Type Dialin Server", "misc.svcctl_ServerType.SV_TYPE_DIALIN_SERVER", FT_BOOLEAN, 32, TFS(&svcctl_ServerType_SV_TYPE_DIALIN_SERVER_tfs), ( 0x00000400 ), NULL, HFILL }},
        { &hf_misc_svcctl_ServerType_SV_TYPE_SQLSERVER,
@@ -1083,22 +1087,12 @@ void proto_register_dcerpc_misc(void)
          { "Sv Type Server Nt", "misc.svcctl_ServerType.SV_TYPE_SERVER_NT", FT_BOOLEAN, 32, TFS(&svcctl_ServerType_SV_TYPE_SERVER_NT_tfs), ( 0x00008000 ), NULL, HFILL }},
        { &hf_misc_KRB5_EDATA_NTSTATUS_ntstatus,
          { "Ntstatus", "misc.KRB5_EDATA_NTSTATUS.ntstatus", FT_UINT32, BASE_DEC, VALS(NT_errors), 0, NULL, HFILL }},
-       { &hf_misc_winreg_Data_valdefault_data,
-         { "Data", "misc.winreg_Data_valdefault.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_misc_winreg_Data_valREG_BINARY_binary,
-         { "Binary", "misc.winreg_Data_valREG_BINARY.binary", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_misc_svcctl_ServerType_SV_TYPE_SERVER_UNIX,
          { "Sv Type Server Unix", "misc.svcctl_ServerType.SV_TYPE_SERVER_UNIX", FT_BOOLEAN, 32, TFS(&svcctl_ServerType_SV_TYPE_SERVER_UNIX_tfs), ( 0x00000800 ), NULL, HFILL }},
        { &hf_misc_svcctl_ServerType_SV_TYPE_SERVER_VMS,
          { "Sv Type Server Vms", "misc.svcctl_ServerType.SV_TYPE_SERVER_VMS", FT_BOOLEAN, 32, TFS(&svcctl_ServerType_SV_TYPE_SERVER_VMS_tfs), ( 0x00200000 ), NULL, HFILL }},
        { &hf_misc_KRB5_EDATA_NTSTATUS_unknown1,
          { "Unknown1", "misc.KRB5_EDATA_NTSTATUS.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_misc_winreg_Data_valREG_SZ_string,
-         { "String", "misc.winreg_Data_valREG_SZ.string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_misc_winreg_Data_valREG_EXPAND_SZ_string,
-         { "String", "misc.winreg_Data_valREG_EXPAND_SZ.string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_misc_winreg_Data_valREG_DWORD_value,
-         { "Value", "misc.winreg_Data_valREG_DWORD.value", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_misc_ndr_syntax_id_uuid,
          { "Uuid", "misc.ndr_syntax_id.uuid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_misc_opnum,
@@ -1109,12 +1103,12 @@ void proto_register_dcerpc_misc(void)
          { "Sv Type Master Browser", "misc.svcctl_ServerType.SV_TYPE_MASTER_BROWSER", FT_BOOLEAN, 32, TFS(&svcctl_ServerType_SV_TYPE_MASTER_BROWSER_tfs), ( 0x00040000 ), NULL, HFILL }},
        { &hf_misc_GUID_clock_seq,
          { "Clock Seq", "misc.GUID.clock_seq", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_misc_winreg_Data_valREG_MULTI_SZ_string_array,
-         { "String Array", "misc.winreg_Data_valREG_MULTI_SZ.string_array", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_misc_svcctl_ServerType_SV_TYPE_NT,
          { "Sv Type Nt", "misc.svcctl_ServerType.SV_TYPE_NT", FT_BOOLEAN, 32, TFS(&svcctl_ServerType_SV_TYPE_NT_tfs), ( 0x00001000 ), NULL, HFILL }},
        { &hf_misc_ndr_syntax_id_if_version,
          { "If Version", "misc.ndr_syntax_id.if_version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_misc_winreg_Data_string_array,
+         { "String Array", "misc.winreg_Data.string_array", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        };
 
 

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-named_pipe_auth.c b/bin/default/librpc/gen_ndr/packet-dcerpc-named_pipe_auth.c
index 27b58665dca4caae4e9a981e53142f68f51d0fb6..00e355e0cc771ba5c2adae379fd0e701c01bc6b0 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-named_pipe_auth.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-named_pipe_auth.c
@@ -43,15 +43,14 @@ static gint hf_named_pipe_auth_named_pipe_auth_req_info4_client_name = -1;
 static gint hf_named_pipe_auth_named_pipe_auth_req_length = -1;
 static gint hf_named_pipe_auth_opnum = -1;
 static gint hf_named_pipe_auth_named_pipe_auth_rep_status = -1;
-static gint hf_named_pipe_auth_named_pipe_auth_rep_info_val4_info4 = -1;
 static gint hf_named_pipe_auth_named_pipe_auth_rep_info4_allocation_size = -1;
 static gint hf_named_pipe_auth_named_pipe_auth_req_info4_client_addr = -1;
 static gint hf_named_pipe_auth_named_pipe_auth_rep_info = -1;
+static gint hf_named_pipe_auth_named_pipe_auth_req_info_info4 = -1;
 static gint hf_named_pipe_auth_named_pipe_auth_req_info = -1;
 static gint hf_named_pipe_auth_named_pipe_auth_req_info4_session_info = -1;
 static gint hf_named_pipe_auth_named_pipe_auth_rep_magic = -1;
 static gint hf_named_pipe_auth_named_pipe_auth_req_magic = -1;
-static gint hf_named_pipe_auth_named_pipe_auth_req_info_val4_info4 = -1;
 static gint hf_named_pipe_auth_named_pipe_auth_rep_level = -1;
 static gint hf_named_pipe_auth_named_pipe_auth_req_info4_server_port = -1;
 static gint hf_named_pipe_auth_named_pipe_auth_rep_info4_file_type = -1;
@@ -59,6 +58,7 @@ static gint hf_named_pipe_auth_named_pipe_auth_req_level = -1;
 static gint hf_named_pipe_auth_named_pipe_auth_req_info4_client_port = -1;
 static gint hf_named_pipe_auth_named_pipe_auth_rep_info4_device_state = -1;
 static gint hf_named_pipe_auth_named_pipe_auth_req_info4_server_addr = -1;
+static gint hf_named_pipe_auth_named_pipe_auth_rep_info_info4 = -1;
 static gint hf_named_pipe_auth_named_pipe_auth_rep_length = -1;
 static gint hf_named_pipe_auth_named_pipe_auth_req_info4_server_name = -1;
 
@@ -84,7 +84,7 @@ static int named_pipe_auth_dissect_element_req_info4_server_addr_(tvbuff_t *tvb
 static int named_pipe_auth_dissect_element_req_info4_server_port(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int named_pipe_auth_dissect_element_req_info4_session_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int named_pipe_auth_dissect_element_req_info4_session_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int named_pipe_auth_dissect_element_req_info_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int named_pipe_auth_dissect_element_req_info_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int named_pipe_auth_dissect_element_req_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int named_pipe_auth_dissect_element_req_magic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int named_pipe_auth_dissect_element_req_magic_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -93,7 +93,7 @@ static int named_pipe_auth_dissect_element_req_info(tvbuff_t *tvb _U_, int offse
 static int named_pipe_auth_dissect_element_rep_info4_file_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int named_pipe_auth_dissect_element_rep_info4_device_state(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int named_pipe_auth_dissect_element_rep_info4_allocation_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int named_pipe_auth_dissect_element_rep_info_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int named_pipe_auth_dissect_element_rep_info_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int named_pipe_auth_dissect_element_rep_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int named_pipe_auth_dissect_element_rep_magic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int named_pipe_auth_dissect_element_rep_magic_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -268,9 +268,9 @@ named_pipe_auth_dissect_struct_req_info4(tvbuff_t *tvb _U_, int offset _U_, pack
 /* IDL: } */
 
 static int
-named_pipe_auth_dissect_element_req_info_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+named_pipe_auth_dissect_element_req_info_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = named_pipe_auth_dissect_struct_req_info4(tvb,offset,pinfo,tree,drep,hf_named_pipe_auth_named_pipe_auth_req_info_val4_info4,0);
+       offset = named_pipe_auth_dissect_struct_req_info4(tvb,offset,pinfo,tree,drep,hf_named_pipe_auth_named_pipe_auth_req_info_info4,0);
 
        return offset;
 }
@@ -294,7 +294,7 @@ named_pipe_auth_dissect_req_info(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
        switch(level) {
                case 4:
-                       offset = named_pipe_auth_dissect_element_req_info_val4_info4(tvb, offset, pinfo, tree, drep);
+                       offset = named_pipe_auth_dissect_element_req_info_info4(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -462,9 +462,9 @@ named_pipe_auth_dissect_struct_rep_info4(tvbuff_t *tvb _U_, int offset _U_, pack
 /* IDL: } */
 
 static int
-named_pipe_auth_dissect_element_rep_info_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+named_pipe_auth_dissect_element_rep_info_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = named_pipe_auth_dissect_struct_rep_info4(tvb,offset,pinfo,tree,drep,hf_named_pipe_auth_named_pipe_auth_rep_info_val4_info4,0);
+       offset = named_pipe_auth_dissect_struct_rep_info4(tvb,offset,pinfo,tree,drep,hf_named_pipe_auth_named_pipe_auth_rep_info_info4,0);
 
        return offset;
 }
@@ -488,7 +488,7 @@ named_pipe_auth_dissect_rep_info(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
        switch(level) {
                case 4:
-                       offset = named_pipe_auth_dissect_element_rep_info_val4_info4(tvb, offset, pinfo, tree, drep);
+                       offset = named_pipe_auth_dissect_element_rep_info_info4(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -612,14 +612,14 @@ void proto_register_dcerpc_named_pipe_auth(void)
          { "Operation", "named_pipe_auth.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_named_pipe_auth_named_pipe_auth_rep_status,
          { "Status", "named_pipe_auth.named_pipe_auth_rep.status", FT_UINT32, BASE_DEC, VALS(NT_errors), 0, NULL, HFILL }},
-       { &hf_named_pipe_auth_named_pipe_auth_rep_info_val4_info4,
-         { "Info4", "named_pipe_auth.named_pipe_auth_rep_info_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_named_pipe_auth_named_pipe_auth_rep_info4_allocation_size,
          { "Allocation Size", "named_pipe_auth.named_pipe_auth_rep_info4.allocation_size", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_named_pipe_auth_named_pipe_auth_req_info4_client_addr,
          { "Client Addr", "named_pipe_auth.named_pipe_auth_req_info4.client_addr", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_named_pipe_auth_named_pipe_auth_rep_info,
          { "Info", "named_pipe_auth.named_pipe_auth_rep.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_named_pipe_auth_named_pipe_auth_req_info_info4,
+         { "Info4", "named_pipe_auth.named_pipe_auth_req_info.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_named_pipe_auth_named_pipe_auth_req_info,
          { "Info", "named_pipe_auth.named_pipe_auth_req.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_named_pipe_auth_named_pipe_auth_req_info4_session_info,
@@ -628,8 +628,6 @@ void proto_register_dcerpc_named_pipe_auth(void)
          { "Magic", "named_pipe_auth.named_pipe_auth_rep.magic", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_named_pipe_auth_named_pipe_auth_req_magic,
          { "Magic", "named_pipe_auth.named_pipe_auth_req.magic", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_named_pipe_auth_named_pipe_auth_req_info_val4_info4,
-         { "Info4", "named_pipe_auth.named_pipe_auth_req_info_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_named_pipe_auth_named_pipe_auth_rep_level,
          { "Level", "named_pipe_auth.named_pipe_auth_rep.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_named_pipe_auth_named_pipe_auth_req_info4_server_port,
@@ -644,6 +642,8 @@ void proto_register_dcerpc_named_pipe_auth(void)
          { "Device State", "named_pipe_auth.named_pipe_auth_rep_info4.device_state", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_named_pipe_auth_named_pipe_auth_req_info4_server_addr,
          { "Server Addr", "named_pipe_auth.named_pipe_auth_req_info4.server_addr", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_named_pipe_auth_named_pipe_auth_rep_info_info4,
+         { "Info4", "named_pipe_auth.named_pipe_auth_rep_info.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_named_pipe_auth_named_pipe_auth_rep_length,
          { "Length", "named_pipe_auth.named_pipe_auth_rep.length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_named_pipe_auth_named_pipe_auth_req_info4_server_name,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-nbt.c b/bin/default/librpc/gen_ndr/packet-dcerpc-nbt.c
index 28fd8d0c69a42bc566fddd4db4698e93f7983a4d..bde344066b30ab5aa80cc6696f0b21dc275ed6ad 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-nbt.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-nbt.c
@@ -83,23 +83,19 @@ static gint ett_nbt_nbt_browse_packet = -1;
 
 /* Header field declarations */
 static gint hf_nbt_nb_flags_NBT_NM_OWNER_TYPE = -1;
-static gint hf_nbt_dgram_data_valDGRAM_BCAST_msg = -1;
 static gint hf_nbt_smb_trans_body_data_count = -1;
-static gint hf_nbt_dgram_data_valDGRAM_ERROR_error = -1;
 static gint hf_nbt_nbt_db_change_info_db_index = -1;
 static gint hf_nbt_dgram_message_offset = -1;
 static gint hf_nbt_nbt_netlogon_query_for_pdc_lmnt_token = -1;
 static gint hf_nbt_dgram_message_body = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_sockaddr = -1;
 static gint hf_nbt_nbt_name_packet_questions = -1;
-static gint hf_nbt_nbt_netlogon_request_valLOGON_REQUEST_logon0 = -1;
 static gint hf_nbt_nbt_name_packet_ancount = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_NT40_lmnt_token = -1;
-static gint hf_nbt_dgram_data_valDGRAM_QUERY_POSITIVE_dest_name = -1;
 static gint hf_nbt_smb_trans_body_opcode = -1;
 static gint hf_nbt_nbt_statistics_number_no_resource_conditions = -1;
-static gint hf_nbt_nbt_browse_payload_valMasterAnnouncement_master_announcement = -1;
 static gint hf_nbt_netlogon_nt_version_flags_NETLOGON_NT_VERSION_IP = -1;
+static gint hf_nbt_nbt_rdata_data = -1;
 static gint hf_nbt_nbt_rdata_status_statistics = -1;
 static gint hf_nbt_netlogon_nt_version_flags_NETLOGON_NT_VERSION_5EX_WITH_IP = -1;
 static gint hf_nbt_nbt_sockaddr_sockaddr_family = -1;
@@ -111,13 +107,13 @@ static gint hf_nbt_nbt_name_name = -1;
 static gint hf_nbt_nbt_res_rec_name = -1;
 static gint hf_nbt_nbt_rdata_netbios_length = -1;
 static gint hf_nbt_dgram_message_source_name = -1;
+static gint hf_nbt_nbt_rdata_status = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_lm20_token = -1;
 static gint hf_nbt_nbt_res_rec_rr_class = -1;
 static gint hf_nbt_nbt_browse_local_master_announcement_Signature = -1;
 static gint hf_nbt_dgram_smb_packet_smb_command = -1;
 static gint hf_nbt_nbt_netlogon_packet_req = -1;
 static gint hf_nbt_nbt_name_question_question_class = -1;
-static gint hf_nbt_nbt_netlogon_request_valNETLOGON_ANNOUNCE_UAS_uas = -1;
 static gint hf_nbt_smb_trans_body_data = -1;
 static gint hf_nbt_nbt_statistics_number_alignment_errors = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_domain_name = -1;
@@ -125,20 +121,23 @@ static gint hf_nbt_nbt_browse_domain_announcement_Periodicity = -1;
 static gint hf_nbt_nbt_netlogon_response_from_pdc_domain_name = -1;
 static gint hf_nbt_nbt_rdata_status_num_names = -1;
 static gint hf_nbt_nbt_browse_local_master_announcement_BroMinorVer = -1;
-static gint hf_nbt_nbt_netlogon_request_valLOGON_SAM_LOGON_REQUEST_logon = -1;
+static gint hf_nbt_dgram_data_dest_name = -1;
+static gint hf_nbt_dgram_message_body_smb = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_next_closest_site = -1;
 static gint hf_nbt_nbt_netlogon_query_for_pdc_nt_version = -1;
 static gint hf_nbt_nbt_db_change_info_serial = -1;
 static gint hf_nbt_smb_trans_body_setup_count = -1;
-static gint hf_nbt_nbt_rdata_valdefault_data = -1;
+static gint hf_nbt_nbt_browse_payload_host_annoucement = -1;
 static gint hf_nbt_netlogon_nt_version_flags_NETLOGON_NT_VERSION_WITH_CLOSEST_SITE = -1;
 static gint hf_nbt_nbt_browse_packet_payload = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_sbz = -1;
 static gint hf_nbt_nbt_dgram_packet_data = -1;
 static gint hf_nbt_dgram_message_dgram_body_type = -1;
 static gint hf_nbt_smb_trans_body_total_param_count = -1;
+static gint hf_nbt_dgram_data_error = -1;
 static gint hf_nbt_nbt_browse_backup_list_response_Token = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_user_name = -1;
+static gint hf_nbt_nbt_netlogon_request_logon0 = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_dns_domain = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_REQUEST__pad = -1;
 static gint hf_nbt_dgram_smb_packet_flags = -1;
@@ -148,6 +147,7 @@ static gint hf_nbt_smb_trans_body_pad2 = -1;
 static gint hf_nbt_nbt_rdata_status_length = -1;
 static gint hf_nbt_NETLOGON_DB_CHANGE_unicode_domain = -1;
 static gint hf_nbt_nbt_rdata_address_ipaddr = -1;
+static gint hf_nbt_nbt_netlogon_request_uas = -1;
 static gint hf_nbt_smb_trans_body_timeout = -1;
 static gint hf_nbt_nbt_statistics_max_total_number_command_blocks = -1;
 static gint hf_nbt_nbt_dgram_packet_flags = -1;
@@ -165,7 +165,6 @@ static gint hf_nbt_nbt_operation_NBT_FLAG_RECURSION_AVAIL = -1;
 static gint hf_nbt_nbt_server_type_NBT_SERVER_DS = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_REQUEST_lm20_token = -1;
 static gint hf_nbt_NETLOGON_DB_CHANGE_unicode_pdc_name = -1;
-static gint hf_nbt_dgram_data_valDGRAM_DIRECT_UNIQUE_msg = -1;
 static gint hf_nbt_nbt_status_name_name = -1;
 static gint hf_nbt_smb_trans_body_param_count = -1;
 static gint hf_nbt_nbt_operation_NBT_FLAG_RECURSION_DESIRED = -1;
@@ -175,7 +174,6 @@ static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_pdc_name = -1;
 static gint hf_nbt_nbt_server_type_NBT_SERVER_IS_DEFAULT_NC = -1;
 static gint hf_nbt_smb_trans_body_param_offset = -1;
 static gint hf_nbt_smb_trans_body_max_param_count = -1;
-static gint hf_nbt_smb_body_valSMB_TRANSACTION_trans = -1;
 static gint hf_nbt_nbt_browse_backup_list_request_Token = -1;
 static gint hf_nbt_nbt_browse_local_master_announcement_BroMajorVer = -1;
 static gint hf_nbt_nbt_server_type_NBT_SERVER_FOREST_ROOT = -1;
@@ -183,7 +181,6 @@ static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_command = -1;
 static gint hf_nbt_nbt_browse_backup_list_response_BackupServerList = -1;
 static gint hf_nbt_nbt_browse_local_master_announcement_ServerType = -1;
 static gint hf_nbt_dgram_message_dest_name = -1;
-static gint hf_nbt_nbt_browse_payload_valBecomeBackup_become_backup = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_REQUEST_acct_control = -1;
 static gint hf_nbt_nbt_browse_election_request_Reserved = -1;
 static gint hf_nbt_nbt_browse_master_announcement_ServerName = -1;
@@ -194,7 +191,6 @@ static gint hf_nbt_nbt_operation_NBT_RCODE = -1;
 static gint hf_nbt_nbt_browse_election_request_ServerName = -1;
 static gint hf_nbt_nbt_browse_election_request_UpTime = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_pdc_name = -1;
-static gint hf_nbt_dgram_message_body_valDGRAM_SMB_smb = -1;
 static gint hf_nbt_dgram_message_length = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_pdc_dns_name = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_server_type = -1;
@@ -231,12 +227,12 @@ static gint hf_nbt_nbt_name_packet_answers = -1;
 static gint hf_nbt_nbt_browse_domain_announcement_UpdateCount = -1;
 static gint hf_nbt_nbt_browse_reset_state_Command = -1;
 static gint hf_nbt_nbt_browse_become_backup_BrowserName = -1;
-static gint hf_nbt_nbt_netlogon_request_valLOGON_PRIMARY_QUERY_pdc = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_forest = -1;
 static gint hf_nbt_nbt_rdata_netbios_addresses = -1;
 static gint hf_nbt_nbt_browse_local_master_announcement_ServerName = -1;
 static gint hf_nbt_nbt_browse_announcement_request_ResponseName = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_NT40_user_name = -1;
+static gint hf_nbt_nbt_browse_payload_election_request = -1;
 static gint hf_nbt_NETLOGON_DB_CHANGE_random = -1;
 static gint hf_nbt_netlogon_nt_version_flags_NETLOGON_NT_VERSION_GC = -1;
 static gint hf_nbt_nbt_browse_local_master_announcement_Comment = -1;
@@ -245,23 +241,25 @@ static gint hf_nbt_dgram_smb_packet_pad = -1;
 static gint hf_nbt_nbt_netlogon_query_for_pdc__pad = -1;
 static gint hf_nbt_smb_trans_body_max_setup_count = -1;
 static gint hf_nbt_nbt_server_type_NBT_SERVER_TIMESERV = -1;
-static gint hf_nbt_nbt_browse_payload_valElection_election_request = -1;
 static gint hf_nbt_nbt_dgram_packet_msg_type = -1;
 static gint hf_nbt_smb_trans_body_mailslot_name = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_domain_name = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_NT40_pdc_name = -1;
 static gint hf_nbt_nbt_rdata_status_names = -1;
+static gint hf_nbt_nbt_netlogon_request_logon = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_nt_version = -1;
 static gint hf_nbt_NETLOGON_DB_CHANGE_db_count = -1;
 static gint hf_nbt_nbt_browse_domain_announcement_ServerType = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_REQUEST_lmnt_token = -1;
 static gint hf_nbt_nbt_statistics_max_number_pending_sessions = -1;
+static gint hf_nbt_nbt_netlogon_request_pdc = -1;
 static gint hf_nbt_nbt_netlogon_query_for_pdc_mailslot_name = -1;
 static gint hf_nbt_nbt_browse_domain_announcement_MysteriousField = -1;
 static gint hf_nbt_nbt_browse_host_announcement_BroMinorVer = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_nt_version = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_NT40_nt_version = -1;
 static gint hf_nbt_nbt_netlogon_response2_lm20_token = -1;
+static gint hf_nbt_dgram_data_msg = -1;
 static gint hf_nbt_nbt_browse_election_request_Criteria = -1;
 static gint hf_nbt_NETLOGON_LOGON_REQUEST_user_name = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_REQUEST_nt_version = -1;
@@ -272,9 +270,9 @@ static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_domain_uuid = -1;
 static gint hf_nbt_nbt_statistics_number_retransmits = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_command = -1;
 static gint hf_nbt_nbt_status_name_type = -1;
-static gint hf_nbt_dgram_data_valDGRAM_QUERY_dest_name = -1;
 static gint hf_nbt_dgram_smb_packet_signature = -1;
 static gint hf_nbt_nbt_netlogon_response2_pdc_name = -1;
+static gint hf_nbt_nbt_browse_payload_local_master_announcement = -1;
 static gint hf_nbt_nbt_browse_domain_announcement_OSMajor = -1;
 static gint hf_nbt_nbt_browse_domain_announcement_Comment = -1;
 static gint hf_nbt_nbt_statistics_number_send_aborts = -1;
@@ -292,16 +290,17 @@ static gint hf_nbt_smb_trans_body_byte_count = -1;
 static gint hf_nbt_nbt_statistics_unit_id = -1;
 static gint hf_nbt_nbt_name_packet_nscount = -1;
 static gint hf_nbt_NETLOGON_DB_CHANGE_pdc_name = -1;
+static gint hf_nbt_nbt_browse_payload_master_announcement = -1;
 static gint hf_nbt_nbt_netlogon_response_from_pdc_command = -1;
 static gint hf_nbt_dgram_smb_packet_body = -1;
 static gint hf_nbt_nbt_name_packet_name_trn_id = -1;
 static gint hf_nbt_nbt_browse_local_master_announcement_OSMinor = -1;
+static gint hf_nbt_nbt_browse_payload_become_backup = -1;
 static gint hf_nbt_NETLOGON_LOGON_REQUEST_mailslot_name = -1;
 static gint hf_nbt_nbt_res_rec_ttl = -1;
 static gint hf_nbt_nbt_server_type_NBT_SERVER_SELECT_SECRET_DOMAIN_6 = -1;
 static gint hf_nbt_dgram_smb_packet_vuid = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_zero_uuid = -1;
-static gint hf_nbt_nbt_browse_payload_valLocalMasterAnnouncement_local_master_announcement = -1;
 static gint hf_nbt_nbt_sockaddr_pdc_ip = -1;
 static gint hf_nbt_dgram_smb_packet_flags2 = -1;
 static gint hf_nbt_opnum = -1;
@@ -309,15 +308,11 @@ static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_lm20_token = -1;
 static gint hf_nbt_nbt_rdata_data_length = -1;
 static gint hf_nbt_NETLOGON_DB_CHANGE_pulse = -1;
 static gint hf_nbt_nbt_statistics_jumpers = -1;
-static gint hf_nbt_nbt_browse_payload_valResetBrowserState_reset_browser_state = -1;
 static gint hf_nbt_nbt_statistics_number_good_sends = -1;
 static gint hf_nbt_dgram_flags_DGRAM_FLAG_NODE_TYPE = -1;
 static gint hf_nbt_nbt_name_packet_qdcount = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_lmnt_token = -1;
-static gint hf_nbt_nbt_rdata_valNBT_QTYPE_STATUS_status = -1;
-static gint hf_nbt_nbt_rdata_valNBT_QTYPE_NETBIOS_netbios = -1;
-static gint hf_nbt_nbt_browse_payload_valGetBackupListResp_backup_list_response = -1;
-static gint hf_nbt_nbt_browse_payload_valHostAnnouncement_host_annoucement = -1;
+static gint hf_nbt_nbt_browse_payload_domain_announcement = -1;
 static gint hf_nbt_nbt_statistics_number_of_crcs = -1;
 static gint hf_nbt_nbt_db_change_info_timestamp = -1;
 static gint hf_nbt_smb_trans_body_total_data_count = -1;
@@ -330,6 +325,7 @@ static gint hf_nbt_nbt_rdata_address_nb_flags = -1;
 static gint hf_nbt_nbt_server_type_NBT_SERVER_HAS_DNS_NAME = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_client_site = -1;
 static gint hf_nbt_NETLOGON_DB_CHANGE_domain = -1;
+static gint hf_nbt_nbt_browse_payload_announcement_request = -1;
 static gint hf_nbt_nbt_operation_NBT_FLAG_BROADCAST = -1;
 static gint hf_nbt_nbt_netlogon_response_from_pdc_nt_version = -1;
 static gint hf_nbt_dgram_smb_packet_pid_high = -1;
@@ -339,7 +335,6 @@ static gint hf_nbt_nbt_operation_NBT_FLAG_REPLY = -1;
 static gint hf_nbt_nbt_server_type_NBT_SERVER_GC = -1;
 static gint hf_nbt_nbt_netlogon_query_for_pdc_unicode_name = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_REQUEST_sid_size = -1;
-static gint hf_nbt_nbt_browse_payload_valGetBackupListReq_backup_list_request = -1;
 static gint hf_nbt_nbt_server_type_NBT_SERVER_NDNC = -1;
 static gint hf_nbt_nbt_server_type_NBT_SERVER_FULL_SECRET_DOMAIN_6 = -1;
 static gint hf_nbt_nbt_netlogon_response_from_pdc_lmnt_token = -1;
@@ -357,6 +352,7 @@ static gint hf_nbt_nbt_server_type_NBT_SERVER_LDAP = -1;
 static gint hf_nbt_nbt_netlogon_query_for_pdc_lm20_token = -1;
 static gint hf_nbt_nbt_netlogon_response_from_pdc_pdc_name = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_pdc_dns_name = -1;
+static gint hf_nbt_nbt_browse_payload_reset_browser_state = -1;
 static gint hf_nbt_nbt_name_packet_additional = -1;
 static gint hf_nbt_nbt_name_packet_arcount = -1;
 static gint hf_nbt_smb_trans_body_max_data_count = -1;
@@ -368,15 +364,14 @@ static gint hf_nbt_NETLOGON_DB_CHANGE_sid = -1;
 static gint hf_nbt_nbt_server_type_NBT_SERVER_ADS_WEB_SERVICE = -1;
 static gint hf_nbt_NETLOGON_DB_CHANGE_message_token = -1;
 static gint hf_nbt_NETLOGON_DB_CHANGE_sid_ = -1;
+static gint hf_nbt_nbt_browse_payload_backup_list_response = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_REQUEST_computer_name = -1;
-static gint hf_nbt_nbt_browse_payload_valAnnouncementRequest_announcement_request = -1;
 static gint hf_nbt_nb_flags_NBT_NM_CONFLICT = -1;
-static gint hf_nbt_dgram_data_valDGRAM_DIRECT_GROUP_msg = -1;
+static gint hf_nbt_nbt_rdata_netbios = -1;
 static gint hf_nbt_nbt_statistics_period_of_statistics = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_pdc_ip = -1;
 static gint hf_nbt_nbt_server_type_NBT_SERVER_WRITABLE = -1;
 static gint hf_nbt_nbt_netlogon_query_for_pdc_computer_name = -1;
-static gint hf_nbt_nbt_browse_payload_valDomainAnnouncement_domain_announcement = -1;
 static gint hf_nbt_nbt_status_name_nb_flags = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_sockaddr_ = -1;
 static gint hf_nbt_dgram_flags_DGRAM_FLAG_MORE = -1;
@@ -386,6 +381,7 @@ static gint hf_nbt_nbt_rdata_data_data = -1;
 static gint hf_nbt_NETLOGON_DB_CHANGE_timestamp = -1;
 static gint hf_nbt_NETLOGON_DB_CHANGE__pad = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_server_type = -1;
+static gint hf_nbt_nbt_browse_payload_backup_list_request = -1;
 static gint hf_nbt_dgram_flags_DGRAM_FLAG_FIRST = -1;
 static gint hf_nbt_smb_trans_body__class = -1;
 static gint hf_nbt_nb_flags_NBT_NM_GROUP = -1;
@@ -399,7 +395,7 @@ static gint hf_nbt_dgram_smb_packet_err_class = -1;
 static gint hf_nbt_nbt_statistics_number_good_receives = -1;
 static gint hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_lmnt_token = -1;
 static gint hf_nbt_nbt_browse_backup_list_response_BackupCount = -1;
-static gint hf_nbt_dgram_data_valDGRAM_QUERY_NEGATIVE_dest_name = -1;
+static gint hf_nbt_smb_body_trans = -1;
 static gint hf_nbt_nbt_netlogon_response_from_pdc_lm20_token = -1;
 
 static gint proto_dcerpc_nbt = -1;
@@ -563,9 +559,9 @@ static int nbt_dissect_element_rdata_status_statistics(tvbuff_t *tvb _U_, int of
 static int nbt_dissect_element_rdata_data_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_rdata_data_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_rdata_data_data_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_rdata_valNBT_QTYPE_NETBIOS_netbios(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_rdata_valNBT_QTYPE_STATUS_status(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_rdata_valdefault_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_rdata_netbios(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_rdata_status(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_rdata_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_res_rec_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_res_rec_rr_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *rr_type);
 static int nbt_dissect_element_res_rec_rr_class(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -641,7 +637,7 @@ static int nbt_dissect_element_smb_trans_body__class(tvbuff_t *tvb _U_, int offs
 static int nbt_dissect_element_smb_trans_body_byte_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_smb_trans_body_mailslot_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_smb_trans_body_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_smb_body_valSMB_TRANSACTION_trans(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_smb_body_trans(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_dgram_smb_packet_smb_command(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint8 *smb_command);
 static int nbt_dissect_element_dgram_smb_packet_err_class(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_dgram_smb_packet_pad(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -657,7 +653,7 @@ static int nbt_dissect_element_dgram_smb_packet_pid(tvbuff_t *tvb _U_, int offse
 static int nbt_dissect_element_dgram_smb_packet_vuid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_dgram_smb_packet_mid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_dgram_smb_packet_body(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint8 *smb_command);
-static int nbt_dissect_element_dgram_message_body_valDGRAM_SMB_smb(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_dgram_message_body_smb(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_dgram_message_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_dgram_message_offset(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_dgram_message_source_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -670,13 +666,13 @@ const value_string nbt_dgram_err_code_vals[] = {
        { DGRAM_ERROR_INVALID_DEST, "DGRAM_ERROR_INVALID_DEST" },
 { 0, NULL }
 };
-static int nbt_dissect_element_dgram_data_valDGRAM_DIRECT_UNIQUE_msg(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_dgram_data_valDGRAM_DIRECT_GROUP_msg(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_dgram_data_valDGRAM_BCAST_msg(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_dgram_data_valDGRAM_ERROR_error(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_dgram_data_valDGRAM_QUERY_dest_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_dgram_data_valDGRAM_QUERY_POSITIVE_dest_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_dgram_data_valDGRAM_QUERY_NEGATIVE_dest_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_dgram_data_msg(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_dgram_data_msg(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_dgram_data_msg(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_dgram_data_error(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_dgram_data_dest_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_dgram_data_dest_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_dgram_data_dest_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_dgram_packet_msg_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint8 *msg_type);
 static int nbt_dissect_element_dgram_packet_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_dgram_packet_dgram_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -901,10 +897,10 @@ static int nbt_dissect_element_NETLOGON_DB_CHANGE_sid(tvbuff_t *tvb _U_, int off
 static int nbt_dissect_element_NETLOGON_DB_CHANGE_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_NETLOGON_DB_CHANGE_message_format_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_NETLOGON_DB_CHANGE_message_token(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_netlogon_request_valLOGON_REQUEST_logon0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_netlogon_request_valLOGON_SAM_LOGON_REQUEST_logon(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_netlogon_request_valLOGON_PRIMARY_QUERY_pdc(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_netlogon_request_valNETLOGON_ANNOUNCE_UAS_uas(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_netlogon_request_logon0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_netlogon_request_logon(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_netlogon_request_pdc(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_netlogon_request_uas(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_netlogon_packet_command(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *command);
 static int nbt_dissect_element_netlogon_packet_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *command);
 const value_string nbt_nbt_browse_opcode_vals[] = {
@@ -967,16 +963,16 @@ static int nbt_dissect_element_browse_local_master_announcement_BroMajorVer(tvbu
 static int nbt_dissect_element_browse_local_master_announcement_BroMinorVer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_browse_local_master_announcement_Signature(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_browse_local_master_announcement_Comment(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_browse_payload_valHostAnnouncement_host_annoucement(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_browse_payload_valAnnouncementRequest_announcement_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_browse_payload_valElection_election_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_browse_payload_valGetBackupListReq_backup_list_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_browse_payload_valGetBackupListResp_backup_list_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_browse_payload_valBecomeBackup_become_backup(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_browse_payload_valDomainAnnouncement_domain_announcement(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_browse_payload_valMasterAnnouncement_master_announcement(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_browse_payload_valResetBrowserState_reset_browser_state(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_browse_payload_valLocalMasterAnnouncement_local_master_announcement(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_browse_payload_host_annoucement(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_browse_payload_announcement_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_browse_payload_election_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_browse_payload_backup_list_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_browse_payload_backup_list_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_browse_payload_become_backup(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_browse_payload_domain_announcement(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_browse_payload_master_announcement(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_browse_payload_reset_browser_state(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int nbt_dissect_element_browse_payload_local_master_announcement(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_browse_packet_opcode(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint8 *opcode);
 static int nbt_dissect_element_browse_packet_payload(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint8 *opcode);
 static int nbt_dissect_element_decode_nbt_netlogon_packet_packet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -2046,25 +2042,25 @@ nbt_dissect_struct_rdata_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 /* IDL: } */
 
 static int
-nbt_dissect_element_rdata_valNBT_QTYPE_NETBIOS_netbios(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_rdata_netbios(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_rdata_netbios(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_rdata_valNBT_QTYPE_NETBIOS_netbios,0);
+       offset = nbt_dissect_struct_rdata_netbios(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_rdata_netbios,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_rdata_valNBT_QTYPE_STATUS_status(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_rdata_status(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_rdata_status(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_rdata_valNBT_QTYPE_STATUS_status,0);
+       offset = nbt_dissect_struct_rdata_status(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_rdata_status,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_rdata_valdefault_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_rdata_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_rdata_data(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_rdata_valdefault_data,0);
+       offset = nbt_dissect_struct_rdata_data(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_rdata_data,0);
 
        return offset;
 }
@@ -2085,15 +2081,15 @@ nbt_dissect_rdata(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, pro
 
        switch(level) {
                case NBT_QTYPE_NETBIOS:
-                       offset = nbt_dissect_element_rdata_valNBT_QTYPE_NETBIOS_netbios(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_rdata_netbios(tvb, offset, pinfo, tree, drep);
                break;
 
                case NBT_QTYPE_STATUS:
-                       offset = nbt_dissect_element_rdata_valNBT_QTYPE_STATUS_status(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_rdata_status(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = nbt_dissect_element_rdata_valdefault_data(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_rdata_data(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -2772,9 +2768,9 @@ nbt_dissect_struct_smb_trans_body(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-nbt_dissect_element_smb_body_valSMB_TRANSACTION_trans(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_smb_body_trans(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_smb_trans_body(tvb,offset,pinfo,tree,drep,hf_nbt_smb_body_valSMB_TRANSACTION_trans,0);
+       offset = nbt_dissect_struct_smb_trans_body(tvb,offset,pinfo,tree,drep,hf_nbt_smb_body_trans,0);
 
        return offset;
 }
@@ -2795,7 +2791,7 @@ nbt_dissect_smb_body(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_,
 
        switch(level) {
                case SMB_TRANSACTION:
-                       offset = nbt_dissect_element_smb_body_valSMB_TRANSACTION_trans(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_smb_body_trans(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -3007,9 +3003,9 @@ nbt_dissect_struct_dgram_smb_packet(tvbuff_t *tvb _U_, int offset _U_, packet_in
 /* IDL: } */
 
 static int
-nbt_dissect_element_dgram_message_body_valDGRAM_SMB_smb(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_dgram_message_body_smb(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_dgram_smb_packet(tvb,offset,pinfo,tree,drep,hf_nbt_dgram_message_body_valDGRAM_SMB_smb,0);
+       offset = nbt_dissect_struct_dgram_smb_packet(tvb,offset,pinfo,tree,drep,hf_nbt_dgram_message_body_smb,0);
 
        return offset;
 }
@@ -3030,7 +3026,7 @@ nbt_dissect_dgram_message_body(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 
        switch(level) {
                case DGRAM_SMB:
-                       offset = nbt_dissect_element_dgram_message_body_valDGRAM_SMB_smb(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_dgram_message_body_smb(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -3171,57 +3167,57 @@ nbt_dissect_enum_dgram_err_code(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 /* IDL: } */
 
 static int
-nbt_dissect_element_dgram_data_valDGRAM_DIRECT_UNIQUE_msg(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_dgram_data_msg(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_dgram_message(tvb,offset,pinfo,tree,drep,hf_nbt_dgram_data_valDGRAM_DIRECT_UNIQUE_msg,0);
+       offset = nbt_dissect_struct_dgram_message(tvb,offset,pinfo,tree,drep,hf_nbt_dgram_data_msg,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_dgram_data_valDGRAM_DIRECT_GROUP_msg(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_dgram_data_msg(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_dgram_message(tvb,offset,pinfo,tree,drep,hf_nbt_dgram_data_valDGRAM_DIRECT_GROUP_msg,0);
+       offset = nbt_dissect_struct_dgram_message(tvb,offset,pinfo,tree,drep,hf_nbt_dgram_data_msg,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_dgram_data_valDGRAM_BCAST_msg(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_dgram_data_msg(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_dgram_message(tvb,offset,pinfo,tree,drep,hf_nbt_dgram_data_valDGRAM_BCAST_msg,0);
+       offset = nbt_dissect_struct_dgram_message(tvb,offset,pinfo,tree,drep,hf_nbt_dgram_data_msg,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_dgram_data_valDGRAM_ERROR_error(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_dgram_data_error(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_enum_dgram_err_code(tvb, offset, pinfo, tree, drep, hf_nbt_dgram_data_valDGRAM_ERROR_error, 0);
+       offset = nbt_dissect_enum_dgram_err_code(tvb, offset, pinfo, tree, drep, hf_nbt_dgram_data_error, 0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_dgram_data_valDGRAM_QUERY_dest_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_dgram_data_dest_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_name(tvb,offset,pinfo,tree,drep,hf_nbt_dgram_data_valDGRAM_QUERY_dest_name,0);
+       offset = nbt_dissect_struct_name(tvb,offset,pinfo,tree,drep,hf_nbt_dgram_data_dest_name,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_dgram_data_valDGRAM_QUERY_POSITIVE_dest_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_dgram_data_dest_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_name(tvb,offset,pinfo,tree,drep,hf_nbt_dgram_data_valDGRAM_QUERY_POSITIVE_dest_name,0);
+       offset = nbt_dissect_struct_name(tvb,offset,pinfo,tree,drep,hf_nbt_dgram_data_dest_name,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_dgram_data_valDGRAM_QUERY_NEGATIVE_dest_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_dgram_data_dest_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_name(tvb,offset,pinfo,tree,drep,hf_nbt_dgram_data_valDGRAM_QUERY_NEGATIVE_dest_name,0);
+       offset = nbt_dissect_struct_name(tvb,offset,pinfo,tree,drep,hf_nbt_dgram_data_dest_name,0);
 
        return offset;
 }
@@ -3242,31 +3238,31 @@ nbt_dissect_dgram_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_
 
        switch(level) {
                case DGRAM_DIRECT_UNIQUE:
-                       offset = nbt_dissect_element_dgram_data_valDGRAM_DIRECT_UNIQUE_msg(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_dgram_data_msg(tvb, offset, pinfo, tree, drep);
                break;
 
                case DGRAM_DIRECT_GROUP:
-                       offset = nbt_dissect_element_dgram_data_valDGRAM_DIRECT_GROUP_msg(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_dgram_data_msg(tvb, offset, pinfo, tree, drep);
                break;
 
                case DGRAM_BCAST:
-                       offset = nbt_dissect_element_dgram_data_valDGRAM_BCAST_msg(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_dgram_data_msg(tvb, offset, pinfo, tree, drep);
                break;
 
                case DGRAM_ERROR:
-                       offset = nbt_dissect_element_dgram_data_valDGRAM_ERROR_error(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_dgram_data_error(tvb, offset, pinfo, tree, drep);
                break;
 
                case DGRAM_QUERY:
-                       offset = nbt_dissect_element_dgram_data_valDGRAM_QUERY_dest_name(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_dgram_data_dest_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case DGRAM_QUERY_POSITIVE:
-                       offset = nbt_dissect_element_dgram_data_valDGRAM_QUERY_POSITIVE_dest_name(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_dgram_data_dest_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case DGRAM_QUERY_NEGATIVE:
-                       offset = nbt_dissect_element_dgram_data_valDGRAM_QUERY_NEGATIVE_dest_name(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_dgram_data_dest_name(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -5170,33 +5166,33 @@ nbt_dissect_struct_NETLOGON_DB_CHANGE(tvbuff_t *tvb _U_, int offset _U_, packet_
 /* IDL: } */
 
 static int
-nbt_dissect_element_netlogon_request_valLOGON_REQUEST_logon0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_netlogon_request_logon0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_NETLOGON_LOGON_REQUEST(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_netlogon_request_valLOGON_REQUEST_logon0,0);
+       offset = nbt_dissect_struct_NETLOGON_LOGON_REQUEST(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_netlogon_request_logon0,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_netlogon_request_valLOGON_SAM_LOGON_REQUEST_logon(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_netlogon_request_logon(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_NETLOGON_SAM_LOGON_REQUEST(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_netlogon_request_valLOGON_SAM_LOGON_REQUEST_logon,0);
+       offset = nbt_dissect_struct_NETLOGON_SAM_LOGON_REQUEST(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_netlogon_request_logon,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_netlogon_request_valLOGON_PRIMARY_QUERY_pdc(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_netlogon_request_pdc(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_netlogon_query_for_pdc(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_netlogon_request_valLOGON_PRIMARY_QUERY_pdc,0);
+       offset = nbt_dissect_struct_netlogon_query_for_pdc(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_netlogon_request_pdc,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_netlogon_request_valNETLOGON_ANNOUNCE_UAS_uas(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_netlogon_request_uas(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_NETLOGON_DB_CHANGE(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_netlogon_request_valNETLOGON_ANNOUNCE_UAS_uas,0);
+       offset = nbt_dissect_struct_NETLOGON_DB_CHANGE(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_netlogon_request_uas,0);
 
        return offset;
 }
@@ -5217,19 +5213,19 @@ nbt_dissect_netlogon_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
 
        switch(level) {
                case LOGON_REQUEST:
-                       offset = nbt_dissect_element_netlogon_request_valLOGON_REQUEST_logon0(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_netlogon_request_logon0(tvb, offset, pinfo, tree, drep);
                break;
 
                case LOGON_SAM_LOGON_REQUEST:
-                       offset = nbt_dissect_element_netlogon_request_valLOGON_SAM_LOGON_REQUEST_logon(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_netlogon_request_logon(tvb, offset, pinfo, tree, drep);
                break;
 
                case LOGON_PRIMARY_QUERY:
-                       offset = nbt_dissect_element_netlogon_request_valLOGON_PRIMARY_QUERY_pdc(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_netlogon_request_pdc(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETLOGON_ANNOUNCE_UAS:
-                       offset = nbt_dissect_element_netlogon_request_valNETLOGON_ANNOUNCE_UAS_uas(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_netlogon_request_uas(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -6195,81 +6191,81 @@ nbt_dissect_struct_browse_local_master_announcement(tvbuff_t *tvb _U_, int offse
 /* IDL: } */
 
 static int
-nbt_dissect_element_browse_payload_valHostAnnouncement_host_annoucement(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_browse_payload_host_annoucement(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_browse_host_announcement(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_valHostAnnouncement_host_annoucement,0);
+       offset = nbt_dissect_struct_browse_host_announcement(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_host_annoucement,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_browse_payload_valAnnouncementRequest_announcement_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_browse_payload_announcement_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_browse_announcement_request(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_valAnnouncementRequest_announcement_request,0);
+       offset = nbt_dissect_struct_browse_announcement_request(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_announcement_request,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_browse_payload_valElection_election_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_browse_payload_election_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_browse_election_request(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_valElection_election_request,0);
+       offset = nbt_dissect_struct_browse_election_request(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_election_request,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_browse_payload_valGetBackupListReq_backup_list_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_browse_payload_backup_list_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_browse_backup_list_request(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_valGetBackupListReq_backup_list_request,0);
+       offset = nbt_dissect_struct_browse_backup_list_request(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_backup_list_request,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_browse_payload_valGetBackupListResp_backup_list_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_browse_payload_backup_list_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_browse_backup_list_response(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_valGetBackupListResp_backup_list_response,0);
+       offset = nbt_dissect_struct_browse_backup_list_response(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_backup_list_response,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_browse_payload_valBecomeBackup_become_backup(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_browse_payload_become_backup(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_browse_become_backup(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_valBecomeBackup_become_backup,0);
+       offset = nbt_dissect_struct_browse_become_backup(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_become_backup,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_browse_payload_valDomainAnnouncement_domain_announcement(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_browse_payload_domain_announcement(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_browse_domain_announcement(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_valDomainAnnouncement_domain_announcement,0);
+       offset = nbt_dissect_struct_browse_domain_announcement(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_domain_announcement,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_browse_payload_valMasterAnnouncement_master_announcement(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_browse_payload_master_announcement(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_browse_master_announcement(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_valMasterAnnouncement_master_announcement,0);
+       offset = nbt_dissect_struct_browse_master_announcement(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_master_announcement,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_browse_payload_valResetBrowserState_reset_browser_state(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_browse_payload_reset_browser_state(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_browse_reset_state(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_valResetBrowserState_reset_browser_state,0);
+       offset = nbt_dissect_struct_browse_reset_state(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_reset_browser_state,0);
 
        return offset;
 }
 
 static int
-nbt_dissect_element_browse_payload_valLocalMasterAnnouncement_local_master_announcement(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+nbt_dissect_element_browse_payload_local_master_announcement(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = nbt_dissect_struct_browse_local_master_announcement(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_valLocalMasterAnnouncement_local_master_announcement,0);
+       offset = nbt_dissect_struct_browse_local_master_announcement(tvb,offset,pinfo,tree,drep,hf_nbt_nbt_browse_payload_local_master_announcement,0);
 
        return offset;
 }
@@ -6290,43 +6286,43 @@ nbt_dissect_browse_payload(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case HostAnnouncement:
-                       offset = nbt_dissect_element_browse_payload_valHostAnnouncement_host_annoucement(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_browse_payload_host_annoucement(tvb, offset, pinfo, tree, drep);
                break;
 
                case AnnouncementRequest:
-                       offset = nbt_dissect_element_browse_payload_valAnnouncementRequest_announcement_request(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_browse_payload_announcement_request(tvb, offset, pinfo, tree, drep);
                break;
 
                case Election:
-                       offset = nbt_dissect_element_browse_payload_valElection_election_request(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_browse_payload_election_request(tvb, offset, pinfo, tree, drep);
                break;
 
                case GetBackupListReq:
-                       offset = nbt_dissect_element_browse_payload_valGetBackupListReq_backup_list_request(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_browse_payload_backup_list_request(tvb, offset, pinfo, tree, drep);
                break;
 
                case GetBackupListResp:
-                       offset = nbt_dissect_element_browse_payload_valGetBackupListResp_backup_list_response(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_browse_payload_backup_list_response(tvb, offset, pinfo, tree, drep);
                break;
 
                case BecomeBackup:
-                       offset = nbt_dissect_element_browse_payload_valBecomeBackup_become_backup(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_browse_payload_become_backup(tvb, offset, pinfo, tree, drep);
                break;
 
                case DomainAnnouncement:
-                       offset = nbt_dissect_element_browse_payload_valDomainAnnouncement_domain_announcement(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_browse_payload_domain_announcement(tvb, offset, pinfo, tree, drep);
                break;
 
                case MasterAnnouncement:
-                       offset = nbt_dissect_element_browse_payload_valMasterAnnouncement_master_announcement(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_browse_payload_master_announcement(tvb, offset, pinfo, tree, drep);
                break;
 
                case ResetBrowserState:
-                       offset = nbt_dissect_element_browse_payload_valResetBrowserState_reset_browser_state(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_browse_payload_reset_browser_state(tvb, offset, pinfo, tree, drep);
                break;
 
                case LocalMasterAnnouncement:
-                       offset = nbt_dissect_element_browse_payload_valLocalMasterAnnouncement_local_master_announcement(tvb, offset, pinfo, tree, drep);
+                       offset = nbt_dissect_element_browse_payload_local_master_announcement(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -6428,12 +6424,8 @@ void proto_register_dcerpc_nbt(void)
        static hf_register_info hf[] = {
        { &hf_nbt_nb_flags_NBT_NM_OWNER_TYPE,
          { "Nbt Nm Owner Type", "nbt.nb_flags.NBT_NM_OWNER_TYPE", FT_BOOLEAN, 16, TFS(&nb_flags_NBT_NM_OWNER_TYPE_tfs), ( 0x6000 ), NULL, HFILL }},
-       { &hf_nbt_dgram_data_valDGRAM_BCAST_msg,
-         { "Msg", "nbt.dgram_data_valDGRAM_BCAST.msg", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_smb_trans_body_data_count,
          { "Data Count", "nbt.smb_trans_body.data_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_dgram_data_valDGRAM_ERROR_error,
-         { "Error", "nbt.dgram_data_valDGRAM_ERROR.error", FT_UINT8, BASE_DEC, VALS(nbt_dgram_err_code_vals), 0, NULL, HFILL }},
        { &hf_nbt_nbt_db_change_info_db_index,
          { "Db Index", "nbt.nbt_db_change_info.db_index", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_dgram_message_offset,
@@ -6446,22 +6438,18 @@ void proto_register_dcerpc_nbt(void)
          { "Sockaddr", "nbt.NETLOGON_SAM_LOGON_RESPONSE_EX.sockaddr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_name_packet_questions,
          { "Questions", "nbt.nbt_name_packet.questions", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_nbt_netlogon_request_valLOGON_REQUEST_logon0,
-         { "Logon0", "nbt.nbt_netlogon_request_valLOGON_REQUEST.logon0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_name_packet_ancount,
          { "Ancount", "nbt.nbt_name_packet.ancount", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_NT40_lmnt_token,
          { "Lmnt Token", "nbt.NETLOGON_SAM_LOGON_RESPONSE_NT40.lmnt_token", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_dgram_data_valDGRAM_QUERY_POSITIVE_dest_name,
-         { "Dest Name", "nbt.dgram_data_valDGRAM_QUERY_POSITIVE.dest_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_smb_trans_body_opcode,
          { "Opcode", "nbt.smb_trans_body.opcode", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_statistics_number_no_resource_conditions,
          { "Number No Resource Conditions", "nbt.nbt_statistics.number_no_resource_conditions", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_nbt_browse_payload_valMasterAnnouncement_master_announcement,
-         { "Master Announcement", "nbt.nbt_browse_payload_valMasterAnnouncement.master_announcement", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_netlogon_nt_version_flags_NETLOGON_NT_VERSION_IP,
          { "Netlogon Nt Version Ip", "nbt.netlogon_nt_version_flags.NETLOGON_NT_VERSION_IP", FT_BOOLEAN, 32, TFS(&netlogon_nt_version_flags_NETLOGON_NT_VERSION_IP_tfs), ( 0x20000000 ), NULL, HFILL }},
+       { &hf_nbt_nbt_rdata_data,
+         { "Data", "nbt.nbt_rdata.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_rdata_status_statistics,
          { "Statistics", "nbt.nbt_rdata_status.statistics", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_netlogon_nt_version_flags_NETLOGON_NT_VERSION_5EX_WITH_IP,
@@ -6484,6 +6472,8 @@ void proto_register_dcerpc_nbt(void)
          { "Length", "nbt.nbt_rdata_netbios.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_dgram_message_source_name,
          { "Source Name", "nbt.dgram_message.source_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_nbt_rdata_status,
+         { "Status", "nbt.nbt_rdata.status", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_lm20_token,
          { "Lm20 Token", "nbt.NETLOGON_SAM_LOGON_RESPONSE_EX.lm20_token", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_res_rec_rr_class,
@@ -6496,8 +6486,6 @@ void proto_register_dcerpc_nbt(void)
          { "Req", "nbt.nbt_netlogon_packet.req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_name_question_question_class,
          { "Question Class", "nbt.nbt_name_question.question_class", FT_UINT16, BASE_DEC, VALS(nbt_nbt_qclass_vals), 0, NULL, HFILL }},
-       { &hf_nbt_nbt_netlogon_request_valNETLOGON_ANNOUNCE_UAS_uas,
-         { "Uas", "nbt.nbt_netlogon_request_valNETLOGON_ANNOUNCE_UAS.uas", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_smb_trans_body_data,
          { "Data", "nbt.smb_trans_body.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_statistics_number_alignment_errors,
@@ -6512,8 +6500,10 @@ void proto_register_dcerpc_nbt(void)
          { "Num Names", "nbt.nbt_rdata_status.num_names", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_browse_local_master_announcement_BroMinorVer,
          { "Brominorver", "nbt.nbt_browse_local_master_announcement.BroMinorVer", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_nbt_netlogon_request_valLOGON_SAM_LOGON_REQUEST_logon,
-         { "Logon", "nbt.nbt_netlogon_request_valLOGON_SAM_LOGON_REQUEST.logon", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_dgram_data_dest_name,
+         { "Dest Name", "nbt.dgram_data.dest_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_dgram_message_body_smb,
+         { "Smb", "nbt.dgram_message_body.smb", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_next_closest_site,
          { "Next Closest Site", "nbt.NETLOGON_SAM_LOGON_RESPONSE_EX.next_closest_site", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_netlogon_query_for_pdc_nt_version,
@@ -6522,8 +6512,8 @@ void proto_register_dcerpc_nbt(void)
          { "Serial", "nbt.nbt_db_change_info.serial", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_smb_trans_body_setup_count,
          { "Setup Count", "nbt.smb_trans_body.setup_count", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_nbt_rdata_valdefault_data,
-         { "Data", "nbt.nbt_rdata_valdefault.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_nbt_browse_payload_host_annoucement,
+         { "Host Annoucement", "nbt.nbt_browse_payload.host_annoucement", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_netlogon_nt_version_flags_NETLOGON_NT_VERSION_WITH_CLOSEST_SITE,
          { "Netlogon Nt Version With Closest Site", "nbt.netlogon_nt_version_flags.NETLOGON_NT_VERSION_WITH_CLOSEST_SITE", FT_BOOLEAN, 32, TFS(&netlogon_nt_version_flags_NETLOGON_NT_VERSION_WITH_CLOSEST_SITE_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_nbt_nbt_browse_packet_payload,
@@ -6536,10 +6526,14 @@ void proto_register_dcerpc_nbt(void)
          { "Dgram Body Type", "nbt.dgram_message.dgram_body_type", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_smb_trans_body_total_param_count,
          { "Total Param Count", "nbt.smb_trans_body.total_param_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_dgram_data_error,
+         { "Error", "nbt.dgram_data.error", FT_UINT8, BASE_DEC, VALS(nbt_dgram_err_code_vals), 0, NULL, HFILL }},
        { &hf_nbt_nbt_browse_backup_list_response_Token,
          { "Token", "nbt.nbt_browse_backup_list_response.Token", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_user_name,
          { "User Name", "nbt.NETLOGON_SAM_LOGON_RESPONSE_EX.user_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_nbt_netlogon_request_logon0,
+         { "Logon0", "nbt.nbt_netlogon_request.logon0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_dns_domain,
          { "Dns Domain", "nbt.NETLOGON_SAM_LOGON_RESPONSE.dns_domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_REQUEST__pad,
@@ -6558,6 +6552,8 @@ void proto_register_dcerpc_nbt(void)
          { "Unicode Domain", "nbt.NETLOGON_DB_CHANGE.unicode_domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_rdata_address_ipaddr,
          { "Ipaddr", "nbt.nbt_rdata_address.ipaddr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_nbt_netlogon_request_uas,
+         { "Uas", "nbt.nbt_netlogon_request.uas", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_smb_trans_body_timeout,
          { "Timeout", "nbt.smb_trans_body.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_statistics_max_total_number_command_blocks,
@@ -6592,8 +6588,6 @@ void proto_register_dcerpc_nbt(void)
          { "Lm20 Token", "nbt.NETLOGON_SAM_LOGON_REQUEST.lm20_token", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_DB_CHANGE_unicode_pdc_name,
          { "Unicode Pdc Name", "nbt.NETLOGON_DB_CHANGE.unicode_pdc_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_dgram_data_valDGRAM_DIRECT_UNIQUE_msg,
-         { "Msg", "nbt.dgram_data_valDGRAM_DIRECT_UNIQUE.msg", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_status_name_name,
          { "Name", "nbt.nbt_status_name.name", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_smb_trans_body_param_count,
@@ -6612,8 +6606,6 @@ void proto_register_dcerpc_nbt(void)
          { "Param Offset", "nbt.smb_trans_body.param_offset", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_smb_trans_body_max_param_count,
          { "Max Param Count", "nbt.smb_trans_body.max_param_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_smb_body_valSMB_TRANSACTION_trans,
-         { "Trans", "nbt.smb_body_valSMB_TRANSACTION.trans", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_browse_backup_list_request_Token,
          { "Token", "nbt.nbt_browse_backup_list_request.Token", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_browse_local_master_announcement_BroMajorVer,
@@ -6628,8 +6620,6 @@ void proto_register_dcerpc_nbt(void)
          { "Servertype", "nbt.nbt_browse_local_master_announcement.ServerType", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_nbt_dgram_message_dest_name,
          { "Dest Name", "nbt.dgram_message.dest_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_nbt_browse_payload_valBecomeBackup_become_backup,
-         { "Become Backup", "nbt.nbt_browse_payload_valBecomeBackup.become_backup", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_REQUEST_acct_control,
          { "Acct Control", "nbt.NETLOGON_SAM_LOGON_REQUEST.acct_control", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_browse_election_request_Reserved,
@@ -6650,8 +6640,6 @@ void proto_register_dcerpc_nbt(void)
          { "Uptime", "nbt.nbt_browse_election_request.UpTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_pdc_name,
          { "Pdc Name", "nbt.NETLOGON_SAM_LOGON_RESPONSE.pdc_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_dgram_message_body_valDGRAM_SMB_smb,
-         { "Smb", "nbt.dgram_message_body_valDGRAM_SMB.smb", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_dgram_message_length,
          { "Length", "nbt.dgram_message.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_pdc_dns_name,
@@ -6724,8 +6712,6 @@ void proto_register_dcerpc_nbt(void)
          { "Command", "nbt.nbt_browse_reset_state.Command", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_browse_become_backup_BrowserName,
          { "Browsername", "nbt.nbt_browse_become_backup.BrowserName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_nbt_netlogon_request_valLOGON_PRIMARY_QUERY_pdc,
-         { "Pdc", "nbt.nbt_netlogon_request_valLOGON_PRIMARY_QUERY.pdc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_forest,
          { "Forest", "nbt.NETLOGON_SAM_LOGON_RESPONSE_EX.forest", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_rdata_netbios_addresses,
@@ -6736,6 +6722,8 @@ void proto_register_dcerpc_nbt(void)
          { "Responsename", "nbt.nbt_browse_announcement_request.ResponseName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_NT40_user_name,
          { "User Name", "nbt.NETLOGON_SAM_LOGON_RESPONSE_NT40.user_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_nbt_browse_payload_election_request,
+         { "Election Request", "nbt.nbt_browse_payload.election_request", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_DB_CHANGE_random,
          { "Random", "nbt.NETLOGON_DB_CHANGE.random", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_netlogon_nt_version_flags_NETLOGON_NT_VERSION_GC,
@@ -6752,8 +6740,6 @@ void proto_register_dcerpc_nbt(void)
          { "Max Setup Count", "nbt.smb_trans_body.max_setup_count", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_server_type_NBT_SERVER_TIMESERV,
          { "Nbt Server Timeserv", "nbt.nbt_server_type.NBT_SERVER_TIMESERV", FT_BOOLEAN, 32, TFS(&nbt_server_type_NBT_SERVER_TIMESERV_tfs), ( 0x00000040 ), NULL, HFILL }},
-       { &hf_nbt_nbt_browse_payload_valElection_election_request,
-         { "Election Request", "nbt.nbt_browse_payload_valElection.election_request", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_dgram_packet_msg_type,
          { "Msg Type", "nbt.nbt_dgram_packet.msg_type", FT_UINT8, BASE_DEC, VALS(nbt_dgram_msg_type_vals), 0, NULL, HFILL }},
        { &hf_nbt_smb_trans_body_mailslot_name,
@@ -6764,6 +6750,8 @@ void proto_register_dcerpc_nbt(void)
          { "Pdc Name", "nbt.NETLOGON_SAM_LOGON_RESPONSE_NT40.pdc_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_rdata_status_names,
          { "Names", "nbt.nbt_rdata_status.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_nbt_netlogon_request_logon,
+         { "Logon", "nbt.nbt_netlogon_request.logon", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_nt_version,
          { "Nt Version", "nbt.NETLOGON_SAM_LOGON_RESPONSE.nt_version", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_DB_CHANGE_db_count,
@@ -6774,6 +6762,8 @@ void proto_register_dcerpc_nbt(void)
          { "Lmnt Token", "nbt.NETLOGON_SAM_LOGON_REQUEST.lmnt_token", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_statistics_max_number_pending_sessions,
          { "Max Number Pending Sessions", "nbt.nbt_statistics.max_number_pending_sessions", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_nbt_netlogon_request_pdc,
+         { "Pdc", "nbt.nbt_netlogon_request.pdc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_netlogon_query_for_pdc_mailslot_name,
          { "Mailslot Name", "nbt.nbt_netlogon_query_for_pdc.mailslot_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_browse_domain_announcement_MysteriousField,
@@ -6786,6 +6776,8 @@ void proto_register_dcerpc_nbt(void)
          { "Nt Version", "nbt.NETLOGON_SAM_LOGON_RESPONSE_NT40.nt_version", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_netlogon_response2_lm20_token,
          { "Lm20 Token", "nbt.nbt_netlogon_response2.lm20_token", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_dgram_data_msg,
+         { "Msg", "nbt.dgram_data.msg", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_browse_election_request_Criteria,
          { "Criteria", "nbt.nbt_browse_election_request.Criteria", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_LOGON_REQUEST_user_name,
@@ -6806,12 +6798,12 @@ void proto_register_dcerpc_nbt(void)
          { "Command", "nbt.NETLOGON_SAM_LOGON_RESPONSE_EX.command", FT_UINT16, BASE_DEC, VALS(nbt_netlogon_command_vals), 0, NULL, HFILL }},
        { &hf_nbt_nbt_status_name_type,
          { "Type", "nbt.nbt_status_name.type", FT_UINT8, BASE_DEC, VALS(nbt_nbt_name_type_vals), 0, NULL, HFILL }},
-       { &hf_nbt_dgram_data_valDGRAM_QUERY_dest_name,
-         { "Dest Name", "nbt.dgram_data_valDGRAM_QUERY.dest_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_dgram_smb_packet_signature,
          { "Signature", "nbt.dgram_smb_packet.signature", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_netlogon_response2_pdc_name,
          { "Pdc Name", "nbt.nbt_netlogon_response2.pdc_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_nbt_browse_payload_local_master_announcement,
+         { "Local Master Announcement", "nbt.nbt_browse_payload.local_master_announcement", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_browse_domain_announcement_OSMajor,
          { "Osmajor", "nbt.nbt_browse_domain_announcement.OSMajor", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_browse_domain_announcement_Comment,
@@ -6846,6 +6838,8 @@ void proto_register_dcerpc_nbt(void)
          { "Nscount", "nbt.nbt_name_packet.nscount", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_DB_CHANGE_pdc_name,
          { "Pdc Name", "nbt.NETLOGON_DB_CHANGE.pdc_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_nbt_browse_payload_master_announcement,
+         { "Master Announcement", "nbt.nbt_browse_payload.master_announcement", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_netlogon_response_from_pdc_command,
          { "Command", "nbt.nbt_netlogon_response_from_pdc.command", FT_UINT16, BASE_DEC, VALS(nbt_netlogon_command_vals), 0, NULL, HFILL }},
        { &hf_nbt_dgram_smb_packet_body,
@@ -6854,6 +6848,8 @@ void proto_register_dcerpc_nbt(void)
          { "Name Trn Id", "nbt.nbt_name_packet.name_trn_id", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_browse_local_master_announcement_OSMinor,
          { "Osminor", "nbt.nbt_browse_local_master_announcement.OSMinor", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_nbt_browse_payload_become_backup,
+         { "Become Backup", "nbt.nbt_browse_payload.become_backup", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_LOGON_REQUEST_mailslot_name,
          { "Mailslot Name", "nbt.NETLOGON_LOGON_REQUEST.mailslot_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_res_rec_ttl,
@@ -6864,8 +6860,6 @@ void proto_register_dcerpc_nbt(void)
          { "Vuid", "nbt.dgram_smb_packet.vuid", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_zero_uuid,
          { "Zero Uuid", "nbt.NETLOGON_SAM_LOGON_RESPONSE.zero_uuid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_nbt_browse_payload_valLocalMasterAnnouncement_local_master_announcement,
-         { "Local Master Announcement", "nbt.nbt_browse_payload_valLocalMasterAnnouncement.local_master_announcement", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_sockaddr_pdc_ip,
          { "Pdc Ip", "nbt.nbt_sockaddr.pdc_ip", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_dgram_smb_packet_flags2,
@@ -6880,8 +6874,6 @@ void proto_register_dcerpc_nbt(void)
          { "Pulse", "nbt.NETLOGON_DB_CHANGE.pulse", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_statistics_jumpers,
          { "Jumpers", "nbt.nbt_statistics.jumpers", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_nbt_browse_payload_valResetBrowserState_reset_browser_state,
-         { "Reset Browser State", "nbt.nbt_browse_payload_valResetBrowserState.reset_browser_state", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_statistics_number_good_sends,
          { "Number Good Sends", "nbt.nbt_statistics.number_good_sends", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_dgram_flags_DGRAM_FLAG_NODE_TYPE,
@@ -6890,14 +6882,8 @@ void proto_register_dcerpc_nbt(void)
          { "Qdcount", "nbt.nbt_name_packet.qdcount", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_lmnt_token,
          { "Lmnt Token", "nbt.NETLOGON_SAM_LOGON_RESPONSE_EX.lmnt_token", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_nbt_rdata_valNBT_QTYPE_STATUS_status,
-         { "Status", "nbt.nbt_rdata_valNBT_QTYPE_STATUS.status", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_nbt_rdata_valNBT_QTYPE_NETBIOS_netbios,
-         { "Netbios", "nbt.nbt_rdata_valNBT_QTYPE_NETBIOS.netbios", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_nbt_browse_payload_valGetBackupListResp_backup_list_response,
-         { "Backup List Response", "nbt.nbt_browse_payload_valGetBackupListResp.backup_list_response", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_nbt_browse_payload_valHostAnnouncement_host_annoucement,
-         { "Host Annoucement", "nbt.nbt_browse_payload_valHostAnnouncement.host_annoucement", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_nbt_browse_payload_domain_announcement,
+         { "Domain Announcement", "nbt.nbt_browse_payload.domain_announcement", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_statistics_number_of_crcs,
          { "Number Of Crcs", "nbt.nbt_statistics.number_of_crcs", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_db_change_info_timestamp,
@@ -6922,6 +6908,8 @@ void proto_register_dcerpc_nbt(void)
          { "Client Site", "nbt.NETLOGON_SAM_LOGON_RESPONSE_EX.client_site", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_DB_CHANGE_domain,
          { "Domain", "nbt.NETLOGON_DB_CHANGE.domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_nbt_browse_payload_announcement_request,
+         { "Announcement Request", "nbt.nbt_browse_payload.announcement_request", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_operation_NBT_FLAG_BROADCAST,
          { "Nbt Flag Broadcast", "nbt.nbt_operation.NBT_FLAG_BROADCAST", FT_BOOLEAN, 16, TFS(&nbt_operation_NBT_FLAG_BROADCAST_tfs), ( 0x0010 ), NULL, HFILL }},
        { &hf_nbt_nbt_netlogon_response_from_pdc_nt_version,
@@ -6940,8 +6928,6 @@ void proto_register_dcerpc_nbt(void)
          { "Unicode Name", "nbt.nbt_netlogon_query_for_pdc.unicode_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_REQUEST_sid_size,
          { "Sid Size", "nbt.NETLOGON_SAM_LOGON_REQUEST.sid_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_nbt_browse_payload_valGetBackupListReq_backup_list_request,
-         { "Backup List Request", "nbt.nbt_browse_payload_valGetBackupListReq.backup_list_request", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_server_type_NBT_SERVER_NDNC,
          { "Nbt Server Ndnc", "nbt.nbt_server_type.NBT_SERVER_NDNC", FT_BOOLEAN, 32, TFS(&nbt_server_type_NBT_SERVER_NDNC_tfs), ( 0x00000400 ), NULL, HFILL }},
        { &hf_nbt_nbt_server_type_NBT_SERVER_FULL_SECRET_DOMAIN_6,
@@ -6976,6 +6962,8 @@ void proto_register_dcerpc_nbt(void)
          { "Pdc Name", "nbt.nbt_netlogon_response_from_pdc.pdc_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_pdc_dns_name,
          { "Pdc Dns Name", "nbt.NETLOGON_SAM_LOGON_RESPONSE.pdc_dns_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_nbt_browse_payload_reset_browser_state,
+         { "Reset Browser State", "nbt.nbt_browse_payload.reset_browser_state", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_name_packet_additional,
          { "Additional", "nbt.nbt_name_packet.additional", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_name_packet_arcount,
@@ -6998,14 +6986,14 @@ void proto_register_dcerpc_nbt(void)
          { "Message Token", "nbt.NETLOGON_DB_CHANGE.message_token", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_DB_CHANGE_sid_,
          { "Subcontext length", "nbt.NETLOGON_DB_CHANGE.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_nbt_browse_payload_backup_list_response,
+         { "Backup List Response", "nbt.nbt_browse_payload.backup_list_response", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_REQUEST_computer_name,
          { "Computer Name", "nbt.NETLOGON_SAM_LOGON_REQUEST.computer_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_nbt_browse_payload_valAnnouncementRequest_announcement_request,
-         { "Announcement Request", "nbt.nbt_browse_payload_valAnnouncementRequest.announcement_request", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nb_flags_NBT_NM_CONFLICT,
          { "Nbt Nm Conflict", "nbt.nb_flags.NBT_NM_CONFLICT", FT_BOOLEAN, 16, TFS(&nb_flags_NBT_NM_CONFLICT_tfs), ( 0x0800 ), NULL, HFILL }},
-       { &hf_nbt_dgram_data_valDGRAM_DIRECT_GROUP_msg,
-         { "Msg", "nbt.dgram_data_valDGRAM_DIRECT_GROUP.msg", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_nbt_rdata_netbios,
+         { "Netbios", "nbt.nbt_rdata.netbios", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_statistics_period_of_statistics,
          { "Period Of Statistics", "nbt.nbt_statistics.period_of_statistics", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_pdc_ip,
@@ -7014,8 +7002,6 @@ void proto_register_dcerpc_nbt(void)
          { "Nbt Server Writable", "nbt.nbt_server_type.NBT_SERVER_WRITABLE", FT_BOOLEAN, 32, TFS(&nbt_server_type_NBT_SERVER_WRITABLE_tfs), ( 0x00000100 ), NULL, HFILL }},
        { &hf_nbt_nbt_netlogon_query_for_pdc_computer_name,
          { "Computer Name", "nbt.nbt_netlogon_query_for_pdc.computer_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_nbt_browse_payload_valDomainAnnouncement_domain_announcement,
-         { "Domain Announcement", "nbt.nbt_browse_payload_valDomainAnnouncement.domain_announcement", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_status_name_nb_flags,
          { "Nb Flags", "nbt.nbt_status_name.nb_flags", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_EX_sockaddr_,
@@ -7034,6 +7020,8 @@ void proto_register_dcerpc_nbt(void)
          { " Pad", "nbt.NETLOGON_DB_CHANGE._pad", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_NETLOGON_SAM_LOGON_RESPONSE_server_type,
          { "Server Type", "nbt.NETLOGON_SAM_LOGON_RESPONSE.server_type", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_nbt_browse_payload_backup_list_request,
+         { "Backup List Request", "nbt.nbt_browse_payload.backup_list_request", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_dgram_flags_DGRAM_FLAG_FIRST,
          { "Dgram Flag First", "nbt.dgram_flags.DGRAM_FLAG_FIRST", FT_BOOLEAN, 8, TFS(&dgram_flags_DGRAM_FLAG_FIRST_tfs), ( 0x02 ), NULL, HFILL }},
        { &hf_nbt_smb_trans_body__class,
@@ -7060,8 +7048,8 @@ void proto_register_dcerpc_nbt(void)
          { "Lmnt Token", "nbt.NETLOGON_SAM_LOGON_RESPONSE.lmnt_token", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_browse_backup_list_response_BackupCount,
          { "Backupcount", "nbt.nbt_browse_backup_list_response.BackupCount", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_nbt_dgram_data_valDGRAM_QUERY_NEGATIVE_dest_name,
-         { "Dest Name", "nbt.dgram_data_valDGRAM_QUERY_NEGATIVE.dest_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_nbt_smb_body_trans,
+         { "Trans", "nbt.smb_body.trans", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_nbt_nbt_netlogon_response_from_pdc_lm20_token,
          { "Lm20 Token", "nbt.nbt_netlogon_response_from_pdc.lm20_token", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        };

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-netlogon.c b/bin/default/librpc/gen_ndr/packet-dcerpc-netlogon.c
index 1293639d6811bd2d57f32956bc62c97b81f29061..f03e65c9b499550f67c7cd9de52833c37c58d61a 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-netlogon.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-netlogon.c
@@ -142,6 +142,7 @@ static gint hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_BLADE = -1;
 static gint hf_netlogon_netr_LogonUasLogoff_account_name = -1;
 static gint hf_netlogon_netr_PasswordHistory_nt_length = -1;
 static gint hf_netlogon_netr_DatabaseSync2_restart_state = -1;
+static gint hf_netlogon_netr_DELTA_UNION_rename_user = -1;
 static gint hf_netlogon_netr_DELTA_ACCOUNT_unknown4 = -1;
 static gint hf_netlogon_netr_DELTA_ALIAS_unknown5 = -1;
 static gint hf_netlogon_netr_LogonUasLogon_account_name = -1;
@@ -171,32 +172,28 @@ static gint hf_netlogon_netr_DsRGetDCNameInfo_dc_address = -1;
 static gint hf_netlogon_netr_SamInfo6_unknown4 = -1;
 static gint hf_netlogon_netr_DsRGetDCNameEx2_mask = -1;
 static gint hf_netlogon_netr_SamInfo6_dns_domainname = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_ALIAS_MEMBER_rid = -1;
 static gint hf_netlogon_netr_DomainInformation_dns_hostname = -1;
 static gint hf_netlogon_netr_DsRGetDCName_flags = -1;
-static gint hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_DELETE_GROUP2_delete_group = -1;
 static gint hf_netlogon_netr_DsRGetDCNameEx2_domain_name = -1;
 static gint hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_TERMINAL = -1;
 static gint hf_netlogon_netr_UserFlags_NETLOGON_GUEST = -1;
 static gint hf_netlogon_netr_DsR_DcFlags_DS_SERVER_CLOSEST = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DOMAIN_rid = -1;
 static gint hf_netlogon_netr_UasInfo_pw_must_change = -1;
 static gint hf_netlogon_netr_TrustFlags_NETR_TRUST_FLAG_OUTBOUND = -1;
 static gint hf_netlogon_netr_DELTA_GROUP_MEMBER_unknown2 = -1;
 static gint hf_netlogon_netr_LogonControl_query = -1;
 static gint hf_netlogon_netr_TrustAttributes_NETR_TRUST_ATTRIBUTE_FOREST_TRANSITIVE = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_GROUP_MEMBER_rid = -1;
 static gint hf_netlogon_netr_LogonGetTrustRid_domain_name = -1;
 static gint hf_netlogon_netr_DELTA_ALIAS_unknown4 = -1;
 static gint hf_netlogon_netr_LogonParameterControl_MSV1_0_ALLOW_FORCE_GUEST = -1;
 static gint hf_netlogon_netr_DatabaseSync_credential = -1;
-static gint hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_ACCOUNT_account = -1;
 static gint hf_netlogon_netr_DomainInformation_dummy_long4 = -1;
 static gint hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_CROSS_FOREST_TRUSTS = -1;
 static gint hf_netlogon_netr_UserFlags_NETLOGON_PROFILE_PATH_RETURNED = -1;
 static gint hf_netlogon_netr_InfoFlags_NETLOGON_FULL_SYNC_REPLICATION = -1;
 static gint hf_netlogon_netr_DomainInformation_supported_enc_types = -1;
 static gint hf_netlogon_netr_DELTA_POLICY_unknown2 = -1;
+static gint hf_netlogon_netr_ChangeLogObject_object_sid = -1;
 static gint hf_netlogon_netr_SamInfo6_sids = -1;
 static gint hf_netlogon_netr_DsR_DcFlags_DS_DNS_FOREST_ROOT = -1;
 static gint hf_netlogon_netr_DomainInformation_dummy_string4 = -1;
@@ -204,11 +201,12 @@ static gint hf_netlogon_netr_trust_extension_flags = -1;
 static gint hf_netlogon_netr_NetrEnumerateTrustedDomainsEx_server_name = -1;
 static gint hf_netlogon_netr_DsRGetDCName_flags_DS_DIRECTORY_SERVICE_6_REQUIRED = -1;
 static gint hf_netlogon_netr_LogonGetCapabilities_capabilities = -1;
+static gint hf_netlogon_netr_DELTA_UNION_alias = -1;
 static gint hf_netlogon_netr_DsrDeregisterDNSHostRecords_domain = -1;
 static gint hf_netlogon_netr_DatabaseDeltas_delta_enum_array = -1;
 static gint hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_STORAGE_SERVER = -1;
-static gint hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_SECRET_secret = -1;
 static gint hf_netlogon_netr_DELTA_USER_logon_hours = -1;
+static gint hf_netlogon_netr_CONTROL_DATA_INFORMATION_user = -1;
 static gint hf_netlogon_netr_ChangeLogEntry_flags = -1;
 static gint hf_netlogon_netr_DsRGetForestTrustInformation_trusted_domain_name = -1;
 static gint hf_netlogon_netr_ServerPasswordSet_account_name = -1;
@@ -222,8 +220,8 @@ static gint hf_netlogon_netr_LogonSamLogonEx_server_name = -1;
 static gint hf_netlogon_netr_ServerAuthenticate2_credentials = -1;
 static gint hf_netlogon_NL_DNS_NAME_INFO_status = -1;
 static gint hf_netlogon_netr_LogonSamLogonWithFlags_flags = -1;
+static gint hf_netlogon_netr_Validation_sam3 = -1;
 static gint hf_netlogon_netr_ChangeLogEntry_object = -1;
-static gint hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_ALIAS_alias = -1;
 static gint hf_netlogon_netr_UAS_INFO_0_timecreated = -1;
 static gint hf_netlogon_netr_SamBaseInfo_domain_sid = -1;
 static gint hf_netlogon_netr_LogonSamLogonEx_authoritative = -1;
@@ -235,15 +233,13 @@ static gint hf_netlogon_netr_SamBaseInfo_logon_time = -1;
 static gint hf_netlogon_netr_ChangeLogEntry_serial_number2 = -1;
 static gint hf_netlogon_netr_DELTA_DOMAIN_unknown6 = -1;
 static gint hf_netlogon_netr_DELTA_SECRET_unknown8 = -1;
-static gint hf_netlogon_netr_LogonLevel_valNetlogonInteractiveTransitiveInformation_password = -1;
 static gint hf_netlogon_netr_DsRGetForestTrustInformation_flags = -1;
 static gint hf_netlogon_netr_LogonGetDomainInfo_credential = -1;
 static gint hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_TRANSITIVE_TRUSTS = -1;
-static gint hf_netlogon_netr_ChangeLogObject_valNETR_CHANGELOG_SID_INCLUDED_object_sid = -1;
+static gint hf_netlogon_netr_DELTA_UNION_trusted_domain = -1;
 static gint hf_netlogon_netr_ServerPasswordSet_return_authenticator = -1;
 static gint hf_netlogon_netr_DELTA_DOMAIN_min_password_length = -1;
 static gint hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_BACKOFFICE = -1;
-static gint hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_VERIFY_domain = -1;
 static gint hf_netlogon_netr_Credential_data = -1;
 static gint hf_netlogon_netr_ServerPasswordGet_return_authenticator = -1;
 static gint hf_netlogon_netr_DELTA_GROUP_MEMBER_unknown3 = -1;
@@ -253,10 +249,10 @@ static gint hf_netlogon_netr_DsRAddressToSitenamesExWCtr_count = -1;
 static gint hf_netlogon_netr_NETLOGON_INFO_4_trusted_dc_name = -1;
 static gint hf_netlogon_netr_DsRAddressToSitenamesExWCtr_sitename = -1;
 static gint hf_netlogon_netr_UserFlags_NETLOGON_SERVER_TRUST_ACCOUNT = -1;
+static gint hf_netlogon_netr_LogonLevel_generic = -1;
 static gint hf_netlogon_netr_DsR_DcFlags_DS_SERVER_WEBSERV = -1;
 static gint hf_netlogon_netr_DsRGetForestTrustInformation_server_name = -1;
 static gint hf_netlogon_netr_ServerTrustPasswordsGet_return_authenticator = -1;
-static gint hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_GROUP_group = -1;
 static gint hf_netlogon_netr_ServerTrustPasswordsGet_password = -1;
 static gint hf_netlogon_netr_USER_KEY16_length = -1;
 static gint hf_netlogon_NL_DNS_NAME_INFO_type = -1;
@@ -275,6 +271,7 @@ static gint hf_netlogon_netr_IdentityInfo_logon_id_high = -1;
 static gint hf_netlogon_netr_PacInfo_logon_domain = -1;
 static gint hf_netlogon_netr_DsR_DcFlags_DS_SERVER_LDAP = -1;
 static gint hf_netlogon_netr_GenericInfo_package_name = -1;
+static gint hf_netlogon_netr_DELTA_UNION_policy = -1;
 static gint hf_netlogon_netr_DELTA_RENAME_unknown7 = -1;
 static gint hf_netlogon_netr_Authenticator_cred = -1;
 static gint hf_netlogon_netr_DELTA_ALIAS_unknown3 = -1;
@@ -290,18 +287,21 @@ static gint hf_netlogon_netr_PasswordHistory_lm_flags = -1;
 static gint hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_MULTIPLE_SIDS = -1;
 static gint hf_netlogon_netr_DELTA_DOMAIN_unknown8 = -1;
 static gint hf_netlogon_netr_LogonControl_logon_server = -1;
+static gint hf_netlogon_netr_DELTA_UNION_delete_user = -1;
 static gint hf_netlogon_netr_LogonControl2_logon_server = -1;
 static gint hf_netlogon_netr_DELTA_POLICY_unknown7 = -1;
 static gint hf_netlogon_netr_LogonSamLogonEx_validation_level = -1;
-static gint hf_netlogon_netr_Validation_valNetlogonValidationSamInfo4_sam6 = -1;
 static gint hf_netlogon_netr_UasLogoffInfo_duration = -1;
+static gint hf_netlogon_netr_LogonLevel_network = -1;
 static gint hf_netlogon_netr_IdentityInfo_parameter_control = -1;
 static gint hf_netlogon_netr_AccountSync_reference = -1;
 static gint hf_netlogon_netr_WorkstationInformation_dummy4 = -1;
 static gint hf_netlogon_netr_SidAttr_sid = -1;
 static gint hf_netlogon_netr_LogonControl2Ex_function_code = -1;
 static gint hf_netlogon_netr_AccountSync_next_reference = -1;
+static gint hf_netlogon_netr_Validation_sam2 = -1;
 static gint hf_netlogon_netr_ServerAuthenticate3_server_name = -1;
+static gint hf_netlogon_netr_DELTA_ID_UNION_rid = -1;
 static gint hf_netlogon_netr_ServerReqChallenge_computer_name = -1;
 static gint hf_netlogon_netr_LogonSamLogonWithFlags_authoritative = -1;
 static gint hf_netlogon_netr_UasInfo_last_logoff = -1;
@@ -309,25 +309,23 @@ static gint hf_netlogon_netr_DsRAddressToSitenamesW_addresses = -1;
 static gint hf_netlogon_netr_OneDomainInfo_dummy_long3 = -1;
 static gint hf_netlogon_netr_DomainTrust_sid = -1;
 static gint hf_netlogon_netr_DsRGetDCNameEx2_client_account = -1;
-static gint hf_netlogon_netr_ChangeLogObject_valNETR_CHANGELOG_NAME_INCLUDED_object_name = -1;
 static gint hf_netlogon_netr_DsRGetDCNameEx_domain_name = -1;
 static gint hf_netlogon_netr_TrustFlags_NETR_TRUST_FLAG_NATIVE = -1;
 static gint hf_netlogon_netr_ServerAuthenticate2_secure_channel_type = -1;
-static gint hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_MODIFY_COUNT_modified_count = -1;
 static gint hf_netlogon_netr_DELTA_DOMAIN_sdbuf = -1;
 static gint hf_netlogon_netr_DELTA_USER_sdbuf = -1;
 static gint hf_netlogon_netr_DomainInformation_dummy_long3 = -1;
 static gint hf_netlogon_netr_DELTA_DOMAIN_min_password_age = -1;
+static gint hf_netlogon_netr_Validation_generic = -1;
 static gint hf_netlogon_opnum = -1;
+static gint hf_netlogon_netr_CONTROL_DATA_INFORMATION_domain = -1;
 static gint hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_EMBEDDEDNT = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ACCOUNT_sid = -1;
 static gint hf_netlogon_netr_DELTA_SECRET_sdbuf = -1;
 static gint hf_netlogon_netr_DELTA_ALIAS_MEMBER_unknown2 = -1;
 static gint hf_netlogon_netr_DELTA_ALIAS_rid = -1;
 static gint hf_netlogon_netr_DELTA_RENAME_unknown1 = -1;
 static gint hf_netlogon_NL_DNS_NAME_INFO_ARRAY_names = -1;
 static gint hf_netlogon_netr_DomainTrust_dns_name = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_ACCOUNT_sid = -1;
 static gint hf_netlogon_netr_DELTA_ALIAS_MEMBER_sids = -1;
 static gint hf_netlogon_netr_ServerAuthenticate_server_name = -1;
 static gint hf_netlogon_netr_ServerAuthenticate_computer_name = -1;
@@ -336,13 +334,14 @@ static gint hf_netlogon_netr_WorkstationInformation_os_name = -1;
 static gint hf_netlogon_netr_UasInfo_account_name = -1;
 static gint hf_netlogon_netr_ChangeLogEntry_serial_number1 = -1;
 static gint hf_netlogon_netr_InfoFlags_NETLOGON_REPLICATION_NEEDED = -1;
+static gint hf_netlogon_netr_DELTA_ID_UNION_sid = -1;
 static gint hf_netlogon_netr_DomainInformation_dummy_string3 = -1;
 static gint hf_netlogon_netr_NetworkInfo_identity_info = -1;
 static gint hf_netlogon_netr_USER_KEYS2_ntpassword = -1;
 static gint hf_netlogon_netr_DELTA_ACCOUNT_privilege_attrib = -1;
 static gint hf_netlogon_netr_DELTA_DOMAIN_account_lockout = -1;
-static gint hf_netlogon_netr_PacInfo_user_session_key = -1;
 static gint hf_netlogon_netr_SamBaseInfo_last_password_change = -1;
+static gint hf_netlogon_netr_PacInfo_user_session_key = -1;
 static gint hf_netlogon_netr_LogonControl2Ex_level = -1;
 static gint hf_netlogon_netr_DatabaseRedo_logon_server = -1;
 static gint hf_netlogon_netr_DsrUpdateReadOnlyServerDnsRecords_dns_names = -1;
@@ -353,12 +352,10 @@ static gint hf_netlogon_netr_ServerReqChallenge_return_credentials = -1;
 static gint hf_netlogon_netr_trust_extension_dummy = -1;
 static gint hf_netlogon_netr_PacInfo_auth_size = -1;
 static gint hf_netlogon_netr_AccountDeltas_total_entries = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_ALIAS_rid = -1;
 static gint hf_netlogon_netr_DELTA_USER_country_code = -1;
 static gint hf_netlogon_netr_DsRGetDCNameEx_flags = -1;
 static gint hf_netlogon_netr_DsRGetDCNameEx_site_name = -1;
 static gint hf_netlogon_netr_DELTA_GROUP_attributes = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_GROUP_rid = -1;
 static gint hf_netlogon_netr_LogonSamLogonEx_validation = -1;
 static gint hf_netlogon_netr_SamBaseInfo_user_flags = -1;
 static gint hf_netlogon_netr_LogonGetCapabilities_server_name = -1;
@@ -373,10 +370,10 @@ static gint hf_netlogon_netr_GetForestTrustInformation_computer_name = -1;
 static gint hf_netlogon_netr_ChangeLogFlags_NETR_CHANGELOG_NAME_INCLUDED = -1;
 static gint hf_netlogon_netr_ServerGetTrustInfo_old_owf_password = -1;
 static gint hf_netlogon_netr_DomainTrustList_array = -1;
-static gint hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_FIND_USER_user = -1;
 static gint hf_netlogon_netr_NETLOGON_INFO_1_flags = -1;
 static gint hf_netlogon_netr_LogonGetDomainInfo_info = -1;
 static gint hf_netlogon_netr_TrustInfo_data = -1;
+static gint hf_netlogon_netr_DomainInfo_lsa_policy_info = -1;
 static gint hf_netlogon_netr_SamBaseInfo_kickoff_time = -1;
 static gint hf_netlogon_netr_DsrUpdateReadOnlyServerDnsRecords_dns_ttl = -1;
 static gint hf_netlogon_netr_DsRGetDCNameEx_info = -1;
@@ -388,7 +385,6 @@ static gint hf_netlogon_netr_DELTA_ACCOUNT_privilege_control = -1;
 static gint hf_netlogon_netr_PasswordHistory_lm_length = -1;
 static gint hf_netlogon_netr_DELTA_DOMAIN_sequence_num = -1;
 static gint hf_netlogon_netr_SamBaseInfo_acct_flags = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_TRUST_sid = -1;
 static gint hf_netlogon_netr_NETLOGON_INFO_3_unknown2 = -1;
 static gint hf_netlogon_netr_DomainInformation_dummy_string2 = -1;
 static gint hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_SMALLBUSINESS_RESTRICTED = -1;
@@ -403,18 +399,14 @@ static gint hf_netlogon_netr_DELTA_ENUM_delta_type = -1;
 static gint hf_netlogon_netr_DsRAddressToSitenamesExW_count = -1;
 static gint hf_netlogon_NL_DNS_NAME_INFO_dns_domain_info_type = -1;
 static gint hf_netlogon_netr_CIPHER_VALUE_cipher_data = -1;
-static gint hf_netlogon_netr_Validation_val4_pac = -1;
 static gint hf_netlogon_netr_SamBaseInfo_logon_server = -1;
-static gint hf_netlogon_netr_CONTROL_QUERY_INFORMATION_val1_info1 = -1;
 static gint hf_netlogon_netr_ServerGetTrustInfo_server_name = -1;
 static gint hf_netlogon_netr_DELTA_POLICY_auditingmode = -1;
-static gint hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TRANSPORT_NOTIFY_domain = -1;
 static gint hf_netlogon_netr_ServerPasswordSet_new_password = -1;
-static gint hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_ALIAS_MEMBER_alias_member = -1;
 static gint hf_netlogon_netr_LogonParameterControl_MSV1_0_DONT_TRY_GUEST_ACCOUNT = -1;
-static gint hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_USER_user = -1;
 static gint hf_netlogon_netr_TrustAttributes_NETR_TRUST_ATTRIBUTE_CROSS_ORGANIZATION = -1;
 static gint hf_netlogon_netr_AccountSync_computername = -1;
+static gint hf_netlogon_netr_Validation_pac = -1;
 static gint hf_netlogon_netr_DsRGetDCName_flags_DS_IS_DNS_NAME = -1;
 static gint hf_netlogon_netr_DELTA_TRUSTED_DOMAIN_unknown2 = -1;
 static gint hf_netlogon_netr_DELTA_POLICY_maxlogsize = -1;
@@ -422,7 +414,6 @@ static gint hf_netlogon_netr_ServerTrustPasswordsGet_password2 = -1;
 static gint hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_SMALLBUSINESS = -1;
 static gint hf_netlogon_netr_DsRGetDCName_flags_DS_GOOD_TIMESERV_PREFERRED = -1;
 static gint hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_AVOID_ACCOUNT_DB_REPL = -1;
-static gint hf_netlogon_netr_LogonLevel_valNetlogonInteractiveInformation_password = -1;
 static gint hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_SUPPORTS_AES_SHA2 = -1;
 static gint hf_netlogon_netr_UserFlags_NETLOGON_SUBAUTH_SESSION_KEY = -1;
 static gint hf_netlogon_NL_PASSWORD_VERSION_PasswordVersionPresent = -1;
@@ -431,6 +422,7 @@ static gint hf_netlogon_netr_SamInfo3_sidcount = -1;
 static gint hf_netlogon_netr_DsRGetDCName_flags_DS_IS_FLAT_NAME = -1;
 static gint hf_netlogon_netr_UasInfo_logoff_time = -1;
 static gint hf_netlogon_netr_PacInfo_unknown3 = -1;
+static gint hf_netlogon_netr_DELTA_UNION_user = -1;
 static gint hf_netlogon_netr_DomainInformation_lsa_policy = -1;
 static gint hf_netlogon_netr_LogonSamLogonWithFlags_logon_level = -1;
 static gint hf_netlogon_status = -1;
@@ -443,7 +435,6 @@ static gint hf_netlogon_netr_DsrEnumerateDomainTrusts_trust_flags = -1;
 static gint hf_netlogon_netr_AccountDeltas_recordid = -1;
 static gint hf_netlogon_netr_DsR_DcFlags_DS_SERVER_PDC = -1;
 static gint hf_netlogon_netr_NETLOGON_INFO_2_trusted_dc_name = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_USER_rid = -1;
 static gint hf_netlogon_netr_LogonSamLogonEx_logon_level = -1;
 static gint hf_netlogon_netr_DsRGetDCNameEx2_flags = -1;
 static gint hf_netlogon_netr_LogonSamLogoff_return_authenticator = -1;
@@ -471,11 +462,9 @@ static gint hf_netlogon_netr_DELTA_DELETE_USER_unknown1 = -1;
 static gint hf_netlogon_netr_ServerAuthenticate_secure_channel_type = -1;
 static gint hf_netlogon_netr_UasLogoffInfo_logon_count = -1;
 static gint hf_netlogon_netr_LogonControl2Ex_logon_server = -1;
-static gint hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_DELETE_USER2_delete_user = -1;
 static gint hf_netlogon_NL_DNS_NAME_INFO_priority = -1;
 static gint hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_AUTHENTICATED_RPC_LSASS = -1;
 static gint hf_netlogon_netr_DatabaseSync_database_id = -1;
-static gint hf_netlogon_netr_Validation_valNetlogonValidationSamInfo_sam2 = -1;
 static gint hf_netlogon_netr_DELTA_USER_rid = -1;
 static gint hf_netlogon_netr_DELTA_SECRET_unknown6 = -1;
 static gint hf_netlogon_netr_DsRGetDCNameEx_server_unc = -1;
@@ -483,14 +472,11 @@ static gint hf_netlogon_netr_IdentityInfo_domain_name = -1;
 static gint hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_DATACENTER = -1;
 static gint hf_netlogon_netr_DELTA_SECRET_unknown3 = -1;
 static gint hf_netlogon_netr_LogonGetTrustRid_server_name = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_ALIAS_rid = -1;
 static gint hf_netlogon_netr_DELTA_GROUP_group_name = -1;
 static gint hf_netlogon_netr_ServerPasswordGet_computer_name = -1;
 static gint hf_netlogon_netr_DsR_DcFlags_DS_SERVER_NDNC = -1;
 static gint hf_netlogon_netr_LogonSamLogonEx_logon = -1;
 static gint hf_netlogon_netr_DsRGetDCNameInfo_forest_name = -1;
-static gint hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_REDISCOVER_domain = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_SECRET_name = -1;
 static gint hf_netlogon_netr_WorkstationInformation_sitename = -1;
 static gint hf_netlogon_netr_UserFlags_NETLOGON_RESOURCE_GROUPS = -1;
 static gint hf_netlogon_netr_OneDomainInfo_dummy_long1 = -1;
@@ -498,14 +484,11 @@ static gint hf_netlogon_netr_ServerPasswordGet_secure_channel_type = -1;
 static gint hf_netlogon_netr_LogonGetDomainInfo_level = -1;
 static gint hf_netlogon_netr_DsRGetDCName_flags_DS_IP_REQUIRED = -1;
 static gint hf_netlogon_netr_SamBaseInfo_rid = -1;
-static gint hf_netlogon_netr_Validation_valNetlogonValidationGenericInfo2_generic = -1;
-static gint hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_QUERY_domain = -1;
 static gint hf_netlogon_netr_trust_extension_container_length = -1;
 static gint hf_netlogon_netr_DELTA_ACCOUNT_system_flags = -1;
 static gint hf_netlogon_netr_DELTA_POLICY_unknown4 = -1;
 static gint hf_netlogon_netr_PacInfo_logon_server = -1;
 static gint hf_netlogon_netr_ServerAuthenticate2_computer_name = -1;
-static gint hf_netlogon_netr_Capabilities_val1_server_capabilities = -1;
 static gint hf_netlogon_netr_DELTA_RENAME_NewName = -1;
 static gint hf_netlogon_netr_LogonUasLogoff_workstation = -1;
 static gint hf_netlogon_netr_DELTA_POLICY_SecurityInformation = -1;
@@ -535,37 +518,33 @@ static gint hf_netlogon_netr_LsaPolicyInformation_policy = -1;
 static gint hf_netlogon_netr_AccountDeltas_uas = -1;
 static gint hf_netlogon_netr_GetDcName_logon_server = -1;
 static gint hf_netlogon_netr_AccountSync_total_entries = -1;
-static gint hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_CHANGE_PASSWORD_domain = -1;
-static gint hf_netlogon_netr_DELTA_GROUP_MEMBER_attribs = -1;
 static gint hf_netlogon_netr_DELTA_USER_account_name = -1;
+static gint hf_netlogon_netr_DELTA_GROUP_MEMBER_attribs = -1;
 static gint hf_netlogon_netr_DELTA_TRUSTED_DOMAIN_unknown4 = -1;
 static gint hf_netlogon_netr_DELTA_RENAME_unknown4 = -1;
 static gint hf_netlogon_netr_DELTA_TRUSTED_DOMAIN_unknown3 = -1;
 static gint hf_netlogon_netr_NETLOGON_INFO_3_logon_attempts = -1;
 static gint hf_netlogon_netr_DELTA_USER_home_directory = -1;
-static gint hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_POLICY_policy = -1;
 static gint hf_netlogon_netr_PasswordInfo_identity_info = -1;
-static gint hf_netlogon_netr_DomainInfo_val1_domain_info = -1;
 static gint hf_netlogon_netr_LogonGetCapabilities_query_level = -1;
 static gint hf_netlogon_netr_DELTA_RENAME_unknown5 = -1;
 static gint hf_netlogon_netr_ServerPasswordGet_account_name = -1;
+static gint hf_netlogon_netr_DELTA_UNION_rename_group = -1;
 static gint hf_netlogon_netr_DELTA_GROUP_unknown2 = -1;
+static gint hf_netlogon_netr_LogonLevel_password = -1;
 static gint hf_netlogon_netr_DELTA_ENUM_ARRAY_num_deltas = -1;
 static gint hf_netlogon_netr_PacInfo_unknown2 = -1;
 static gint hf_netlogon_netr_WorkstationFlags_NETR_WS_FLAG_HANDLES_INBOUND_TRUSTS = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ALIAS_rid = -1;
+static gint hf_netlogon_netr_DELTA_UNION_modified_count = -1;
 static gint hf_netlogon_netr_ServerPasswordSet2_credential = -1;
 static gint hf_netlogon_netr_AcctLockStr_lockout_duration = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_USER_rid = -1;
 static gint hf_netlogon_netr_DsRAddressToSitenamesW_ctr = -1;
 static gint hf_netlogon_netr_DsRGetDCNameInfo_domain_guid = -1;
 static gint hf_netlogon_netr_ServerPasswordSet_server_name = -1;
 static gint hf_netlogon_netr_LogonSamLogon_logon = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_GROUP_rid = -1;
+static gint hf_netlogon_netr_DELTA_UNION_rename_alias = -1;
 static gint hf_netlogon_netr_DELTA_POLICY_unknown1 = -1;
 static gint hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_STRONG_KEYS = -1;
-static gint hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_SET_DBFLAG_debug_level = -1;
-static gint hf_netlogon_netr_DomainInfo_val2_lsa_policy_info = -1;
 static gint hf_netlogon_netr_NETLOGON_INFO_2_tc_connection_status = -1;
 static gint hf_netlogon_netr_DomainInformation_workstation_flags = -1;
 static gint hf_netlogon_netr_USER_PRIVATE_INFO_SensitiveData = -1;
@@ -606,8 +585,8 @@ static gint hf_netlogon_netr_AccountDeltas_count_returned = -1;
 static gint hf_netlogon_netr_DELTA_POLICY_primary_domain_name = -1;
 static gint hf_netlogon_netr_DsrUpdateReadOnlyServerDnsRecords_site_name = -1;
 static gint hf_netlogon_netr_SamBaseInfo_full_name = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_SECRET_name = -1;
 static gint hf_netlogon_netr_ServerAuthenticate3_return_credentials = -1;
+static gint hf_netlogon_netr_CONTROL_DATA_INFORMATION_debug_level = -1;
 static gint hf_netlogon_netr_LogonControl2_function_code = -1;
 static gint hf_netlogon_NL_DNS_NAME_INFO_dns_register = -1;
 static gint hf_netlogon_netr_DELTA_DELETE_USER_unknown6 = -1;
@@ -624,18 +603,17 @@ static gint hf_netlogon_netr_ServerPasswordSet2_new_password = -1;
 static gint hf_netlogon_netr_PacInfo_unknown1 = -1;
 static gint hf_netlogon_netr_LogonSamLogoff_logon_level = -1;
 static gint hf_netlogon_netr_OsVersion_os = -1;
-static gint hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_GROUP_MEMBER_group_member = -1;
 static gint hf_netlogon_netr_SupportedEncTypes_ENC_RSA_MD5 = -1;
 static gint hf_netlogon_netr_DsRGetDCNameInfo_dc_address_type = -1;
 static gint hf_netlogon_DcSitesCtr_num_sites = -1;
 static gint hf_netlogon_netr_DELTA_USER_parameters = -1;
-static gint hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_DOMAIN_domain = -1;
 static gint hf_netlogon_netr_AccountDeltas_buffersize = -1;
 static gint hf_netlogon_netr_DomainTrust_trust_flags = -1;
 static gint hf_netlogon_netr_DsrDeregisterDNSHostRecords_domain_guid = -1;
 static gint hf_netlogon_netr_SamBaseInfo_logon_domain = -1;
 static gint hf_netlogon_netr_DatabaseSync_computername = -1;
 static gint hf_netlogon_NL_PASSWORD_VERSION_ReservedField = -1;
+static gint hf_netlogon_netr_Validation_sam6 = -1;
 static gint hf_netlogon_netr_DELTA_ACCOUNT_unknown1 = -1;
 static gint hf_netlogon_netr_ServerPasswordSet_credential = -1;
 static gint hf_netlogon_netr_UserFlags_NETLOGON_NTLMV2_ENABLED = -1;
@@ -659,6 +637,7 @@ static gint hf_netlogon_netr_DsRAddressToSitenamesWCtr_count = -1;
 static gint hf_netlogon_netr_ServerAuthenticate3_negotiate_flags = -1;
 static gint hf_netlogon_netr_LogonControl2_query = -1;
 static gint hf_netlogon_netr_SamBaseInfo_force_password_change = -1;
+static gint hf_netlogon_netr_DomainInfo_domain_info = -1;
 static gint hf_netlogon_netr_DatabaseSync_delta_enum_array = -1;
 static gint hf_netlogon_netr_SamBaseInfo_home_drive = -1;
 static gint hf_netlogon_netr_DatabaseDeltas_sequence_num = -1;
@@ -669,17 +648,20 @@ static gint hf_netlogon_netr_DatabaseSync_sync_context = -1;
 static gint hf_netlogon_netr_CryptPassword_length = -1;
 static gint hf_netlogon_netr_UasInfo_script_path = -1;
 static gint hf_netlogon_netr_QUOTA_LIMITS_minimumworkingsetsize = -1;
+static gint hf_netlogon_netr_CONTROL_QUERY_INFORMATION_info3 = -1;
 static gint hf_netlogon_netr_ServerAuthenticate2_negotiate_flags = -1;
 static gint hf_netlogon_netr_GenericInfo_data = -1;
 static gint hf_netlogon_netr_WorkstationInformation_dummy_string4 = -1;
 static gint hf_netlogon_netr_DsRGetDCName_info = -1;
 static gint hf_netlogon_netr_AcctLockStr_dummy = -1;
 static gint hf_netlogon_netr_DELTA_ACCOUNT_unknown7 = -1;
+static gint hf_netlogon_netr_CONTROL_QUERY_INFORMATION_info4 = -1;
 static gint hf_netlogon_netr_LogonSamLogon_validation_level = -1;
+static gint hf_netlogon_netr_DELTA_UNION_group = -1;
 static gint hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_PERSISTENT_SAMREPL = -1;
-static gint hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_ENTERPRISE = -1;
 static gint hf_netlogon_netr_PacInfo_pac = -1;
 static gint hf_netlogon_netr_DELTA_ENUM_delta_id_union = -1;
+static gint hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_ENTERPRISE = -1;
 static gint hf_netlogon_netr_ProductType_NETR_VER_NT_WORKSTATION = -1;
 static gint hf_netlogon_netr_AccountSync_credential = -1;
 static gint hf_netlogon_netr_UasInfo_computer = -1;
@@ -695,7 +677,6 @@ static gint hf_netlogon_netr_DELTA_DELETE_USER_unknown7 = -1;
 static gint hf_netlogon_netr_DELTA_GROUP_MEMBER_rids = -1;
 static gint hf_netlogon_netr_DELTA_ACCOUNT_sdbuf = -1;
 static gint hf_netlogon_netr_LogonParameterControl_MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT = -1;
-static gint hf_netlogon_netr_CONTROL_QUERY_INFORMATION_val2_info2 = -1;
 static gint hf_netlogon_netr_DatabaseDeltas_computername = -1;
 static gint hf_netlogon_netr_LogonSamLogoff_computer_name = -1;
 static gint hf_netlogon_netr_TrustInfo_entry_count = -1;
@@ -706,7 +687,6 @@ static gint hf_netlogon_netr_NETLOGON_INFO_4_trusted_domain_name = -1;
 static gint hf_netlogon_netr_NetworkInfo_nt = -1;
 static gint hf_netlogon_netr_OsVersionInfoEx_OSVersionInfoSize = -1;
 static gint hf_netlogon_netr_ServerPasswordSet_computer_name = -1;
-static gint hf_netlogon_netr_LogonLevel_valNetlogonNetworkTransitiveInformation_network = -1;
 static gint hf_netlogon_netr_ServerAuthenticate2_account_name = -1;
 static gint hf_netlogon_netr_DsRGetDCNameEx2_info = -1;
 static gint hf_netlogon_DcSitesCtr_sites = -1;
@@ -731,7 +711,6 @@ static gint hf_netlogon_netr_DsR_DcFlags_DS_SERVER_SELECT_SECRET_DOMAIN_6 = -1;
 static gint hf_netlogon_netr_SidAttr_attributes = -1;
 static gint hf_netlogon_netr_ChangeLogEntry_object_rid = -1;
 static gint hf_netlogon_netr_SamBaseInfo_last_successful_logon = -1;
-static gint hf_netlogon_netr_LogonLevel_valNetlogonServiceInformation_password = -1;
 static gint hf_netlogon_netr_LogonParameterControl_MSV1_0_RETURN_PASSWORD_EXPIRY = -1;
 static gint hf_netlogon_netr_DELTA_POLICY_sdbuf = -1;
 static gint hf_netlogon_netr_DELTA_USER_home_drive = -1;
@@ -751,7 +730,6 @@ static gint hf_netlogon_netr_UasInfo_logon_count = -1;
 static gint hf_netlogon_netr_LogonParameterControl_MSV1_0_RETURN_PROFILE_PATH = -1;
 static gint hf_netlogon_netr_LogonParameterControl_MSV1_0_DISABLE_PERSONAL_FALLBACK = -1;
 static gint hf_netlogon_netr_DELTA_ACCOUNT_unknown8 = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_GROUP2_rid = -1;
 static gint hf_netlogon_netr_DsrEnumerateDomainTrusts_trusts = -1;
 static gint hf_netlogon_netr_USER_KEYS2_history = -1;
 static gint hf_netlogon_netr_SupportedEncTypes_ENC_CRC32 = -1;
@@ -765,7 +743,6 @@ static gint hf_netlogon_netr_WorkstationInformation_dummy1 = -1;
 static gint hf_netlogon_netr_LsaPolicyInformation_policy_size = -1;
 static gint hf_netlogon_netr_LogonParameterControl_MSV1_0_CHECK_LOGONHOURS_FOR_S4U = -1;
 static gint hf_netlogon_netr_DsRAddressToSitenamesW_count = -1;
-static gint hf_netlogon_netr_CONTROL_QUERY_INFORMATION_val3_info3 = -1;
 static gint hf_netlogon_netr_DomainTrust_trust_attributes = -1;
 static gint hf_netlogon_netr_PacInfo_expansionroom = -1;
 static gint hf_netlogon_netr_LogonSamLogon_server_name = -1;
@@ -796,7 +773,6 @@ static gint hf_netlogon_netr_LogonSamLogonWithFlags_credential = -1;
 static gint hf_netlogon_netr_DELTA_DELETE_USER_unknown4 = -1;
 static gint hf_netlogon_netr_USER_PRIVATE_INFO_SensitiveDataFlag = -1;
 static gint hf_netlogon_netr_GetForestTrustInformation_return_authenticator = -1;
-static gint hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_TRUSTED_DOMAIN_trusted_domain = -1;
 static gint hf_netlogon_werror = -1;
 static gint hf_netlogon_netr_USER_KEYS_version = -1;
 static gint hf_netlogon_netr_LogonGetDomainInfo_computer_name = -1;
@@ -808,21 +784,19 @@ static gint hf_netlogon_netr_DELTA_GROUP_SecurityInformation = -1;
 static gint hf_netlogon_netr_DELTA_TRUSTED_DOMAIN_unknown1 = -1;
 static gint hf_netlogon_netr_DELTA_POLICY_unknown3 = -1;
 static gint hf_netlogon_netr_OsVersionInfoEx_Reserved = -1;
-static gint hf_netlogon_netr_WorkstationInfo_val2_lsa_policy_info = -1;
 static gint hf_netlogon_netr_ChangeLogEntry_db_index = -1;
 static gint hf_netlogon_netr_WorkstationInformation_os_version = -1;
 static gint hf_netlogon_netr_AccountBuffer_blob = -1;
 static gint hf_netlogon_netr_OsVersionInfoEx_CSDVersion_ = -1;
 static gint hf_netlogon_netr_DsRGetDCName_flags_DS_WEB_SERVICE_REQUIRED = -1;
 static gint hf_netlogon_netr_DsRGetDCName_domain_name = -1;
-static gint hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_RENAME_ALIAS_rename_alias = -1;
+static gint hf_netlogon_netr_DELTA_UNION_group_member = -1;
 static gint hf_netlogon_netr_DsR_DcFlags_DS_SERVER_DS = -1;
 static gint hf_netlogon_NL_DNS_NAME_INFO_ARRAY_count = -1;
 static gint hf_netlogon_netr_ServerGetTrustInfo_credential = -1;
 static gint hf_netlogon_netr_TrustAttributes_NETR_TRUST_ATTRIBUTE_NON_TRANSITIVE = -1;
 static gint hf_netlogon_netr_DELTA_POLICY_sid = -1;
 static gint hf_netlogon_netr_ServerAuthenticate2_return_credentials = -1;
-static gint hf_netlogon_netr_LogonLevel_valNetlogonServiceTransitiveInformation_password = -1;
 static gint hf_netlogon_netr_InfoFlags_NETLOGON_DNS_UPDATE_FAILURE = -1;
 static gint hf_netlogon_netr_DsrGetDcSiteCoverageW_ctr = -1;
 static gint hf_netlogon_netr_ServerAuthenticate2_server_name = -1;
@@ -832,7 +806,6 @@ static gint hf_netlogon_netr_DELTA_ALIAS_MEMBER_unknown3 = -1;
 static gint hf_netlogon_netr_PasswordHistory_lm_size = -1;
 static gint hf_netlogon_netr_LogonSamLogonWithFlags_computer_name = -1;
 static gint hf_netlogon_netr_AccountSync_recordid = -1;
-static gint hf_netlogon_netr_WorkstationInfo_val1_workstation_info = -1;
 static gint hf_netlogon_netr_DsrEnumerateDomainTrusts_server_name = -1;
 static gint hf_netlogon_netr_DELTA_SECRET_unknown7 = -1;
 static gint hf_netlogon_netr_UasInfo_unknown = -1;
@@ -845,34 +818,32 @@ static gint hf_netlogon_netr_DatabaseSync2_sync_context = -1;
 static gint hf_netlogon_netr_DsRGetDCName_flags_DS_PDC_REQUIRED = -1;
 static gint hf_netlogon_netr_DatabaseRedo_credential = -1;
 static gint hf_netlogon_netr_PacInfo_pac_size = -1;
+static gint hf_netlogon_netr_CONTROL_QUERY_INFORMATION_info1 = -1;
 static gint hf_netlogon_netr_DsRAddressToSitenamesExW_ctr = -1;
 static gint hf_netlogon_netr_OneDomainInfo_dummy_string4 = -1;
 static gint hf_netlogon_netr_DELTA_DOMAIN_unknown3 = -1;
-static gint hf_netlogon_netr_LogonLevel_valNetlogonGenericInformation_generic = -1;
 static gint hf_netlogon_netr_DELTA_ACCOUNT_unknown2 = -1;
 static gint hf_netlogon_netr_DsRGetSiteName_computer_name = -1;
 static gint hf_netlogon_netr_DsRGetDCName_domain_guid = -1;
-static gint hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_RENAME_USER_rename_user = -1;
 static gint hf_netlogon_netr_SamBaseInfo_allow_password_change = -1;
 static gint hf_netlogon_netr_DsRGetDCName_flags_DS_DIRECTORY_SERVICE_REQUIRED = -1;
 static gint hf_netlogon_netr_LogonControl2_data = -1;
 static gint hf_netlogon_netr_ServerPasswordGet_credential = -1;
+static gint hf_netlogon_netr_WorkstationInfo_lsa_policy_info = -1;
 static gint hf_netlogon_netr_ChangeLogFlags_NETR_CHANGELOG_FIRST_PROMOTION_OBJ = -1;
 static gint hf_netlogon_netr_AccountSync_buffer_ = -1;
 static gint hf_netlogon_netr_ServerAuthenticate_account_name = -1;
+static gint hf_netlogon_netr_DELTA_UNION_account = -1;
 static gint hf_netlogon_netr_AccountSync_buffer = -1;
 static gint hf_netlogon_netr_InfoFlags_NETLOGON_VERIFY_STATUS_RETURNED = -1;
 static gint hf_netlogon_netr_ServerAuthenticate3_credentials = -1;
 static gint hf_netlogon_netr_DELTA_USER_primary_gid = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_GROUP_rid = -1;
 static gint hf_netlogon_netr_GetDcName_dcname = -1;
 static gint hf_netlogon_netr_DELTA_USER_unknown6 = -1;
 static gint hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_AUTHENTICATED_RPC = -1;
 static gint hf_netlogon_netr_SamInfo6_principle = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_POLICY_sid = -1;
 static gint hf_netlogon_netr_TrustFlags_NETR_TRUST_FLAG_MIT_KRB5 = -1;
 static gint hf_netlogon_netr_DatabaseSync2_credential = -1;
-static gint hf_netlogon_netr_LogonLevel_valNetlogonNetworkInformation_network = -1;
 static gint hf_netlogon_netr_DsRGetDCName_flags_DS_TRY_NEXTCLOSEST_SITE = -1;
 static gint hf_netlogon_netr_USER_KEYS2_lmpassword = -1;
 static gint hf_netlogon_netr_PacInfo_auth = -1;
@@ -884,12 +855,12 @@ static gint hf_netlogon_netr_DELTA_GROUP_unknown7 = -1;
 static gint hf_netlogon_netr_DELTA_SECRET_unknown1 = -1;
 static gint hf_netlogon_netr_NETLOGON_INFO_3_unknown5 = -1;
 static gint hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_CONCURRENT_RPC = -1;
-static gint hf_netlogon_netr_TrustFlags_NETR_TRUST_FLAG_AES = -1;
 static gint hf_netlogon_netr_DELTA_ALIAS_alias_name = -1;
+static gint hf_netlogon_netr_TrustFlags_NETR_TRUST_FLAG_AES = -1;
 static gint hf_netlogon_netr_OsVersion_dummy = -1;
 static gint hf_netlogon_netr_DELTA_GROUP_description = -1;
 static gint hf_netlogon_netr_DomainInformation_trusted_domains = -1;
-static gint hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_RENAME_GROUP_rename_group = -1;
+static gint hf_netlogon_netr_WorkstationInfo_workstation_info = -1;
 static gint hf_netlogon_netr_LogonSamLogoff_server_name = -1;
 static gint hf_netlogon_netr_LogonParameterControl_MSV1_0_TRY_SPECIFIED_DOMAIN_ONLY = -1;
 static gint hf_netlogon_netr_DsrUpdateReadOnlyServerDnsRecords_computer_name = -1;
@@ -909,13 +880,13 @@ static gint hf_netlogon_netr_DELTA_POLICY_auditretentionperiod = -1;
 static gint hf_netlogon_netr_OneDomainInfo_domainname = -1;
 static gint hf_netlogon_netr_ServerGetTrustInfo_trust_info = -1;
 static gint hf_netlogon_NL_PASSWORD_VERSION_PasswordVersionNumber = -1;
-static gint hf_netlogon_netr_Validation_valNetlogonValidationSamInfo2_sam3 = -1;
 static gint hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_SINGLEUSERTS = -1;
 static gint hf_netlogon_netr_CryptPassword_data = -1;
 static gint hf_netlogon_netr_WorkstationInformation_workstation_flags = -1;
 static gint hf_netlogon_netr_SamBaseInfo_last_failed_logon = -1;
 static gint hf_netlogon_netr_GenericInfo_identity_info = -1;
 static gint hf_netlogon_netr_DELTA_TRUSTED_DOMAIN_unknown6 = -1;
+static gint hf_netlogon_netr_Capabilities_server_capabilities = -1;
 static gint hf_netlogon_netr_GetForestTrustInformation_server_name = -1;
 static gint hf_netlogon_netr_DELTA_USER_comment = -1;
 static gint hf_netlogon_netr_ChallengeResponse_data = -1;
@@ -935,17 +906,18 @@ static gint hf_netlogon_netr_QUOTA_LIMITS_pagedpoollimit = -1;
 static gint hf_netlogon_netr_DELTA_ENUM_ARRAY_delta_enum = -1;
 static gint hf_netlogon_netr_DomainTrust_trust_type = -1;
 static gint hf_netlogon_netr_DELTA_SECRET_old_cipher_set_time = -1;
-static gint hf_netlogon_netr_DsRGetDCNameInfo_domain_name = -1;
 static gint hf_netlogon_netr_GenericInfo2_data = -1;
 static gint hf_netlogon_netr_UserFlags_NETLOGON_USED_LM_PASSWORD = -1;
+static gint hf_netlogon_netr_DsRGetDCNameInfo_domain_name = -1;
 static gint hf_netlogon_netr_OsVersion_length = -1;
+static gint hf_netlogon_netr_DELTA_UNION_alias_member = -1;
 static gint hf_netlogon_netr_USER_KEY16_flags = -1;
 static gint hf_netlogon_netr_DELTA_POLICY_eventauditoptions = -1;
 static gint hf_netlogon_netr_ServerTrustPasswordsGet_computer_name = -1;
 static gint hf_netlogon_netr_DELTA_USER_unknown5 = -1;
-static gint hf_netlogon_netr_TrustFlags_NETR_TRUST_FLAG_INBOUND = -1;
-static gint hf_netlogon_netr_DsRGetDCNameInfo_dc_site_name = -1;
 static gint hf_netlogon_netr_LogonParameterControl_MSV1_0_UPDATE_LOGON_STATISTICS = -1;
+static gint hf_netlogon_netr_DsRGetDCNameInfo_dc_site_name = -1;
+static gint hf_netlogon_netr_TrustFlags_NETR_TRUST_FLAG_INBOUND = -1;
 static gint hf_netlogon_netr_DatabaseSync2_computername = -1;
 static gint hf_netlogon_netr_PasswordInfo_lmpassword = -1;
 static gint hf_netlogon_netr_DsrUpdateReadOnlyServerDnsRecords_credential = -1;
@@ -961,13 +933,13 @@ static gint hf_netlogon_netr_UasInfo_last_logon = -1;
 static gint hf_netlogon_netr_DsR_DcFlags_DS_SERVER_WRITABLE = -1;
 static gint hf_netlogon_netr_DELTA_DOMAIN_unknown2 = -1;
 static gint hf_netlogon_netr_DELTA_ACCOUNT_unknown3 = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_TRUSTED_DOMAIN_sid = -1;
 static gint hf_netlogon_netr_AccountDeltas_buffer_ = -1;
 static gint hf_netlogon_netr_DsRGetDCName_flags_DS_BACKGROUND_ONLY = -1;
 static gint hf_netlogon_netr_QUOTA_LIMITS_timelimit = -1;
 static gint hf_netlogon_netr_SupportedEncTypes_ENC_RC4_HMAC_MD5 = -1;
 static gint hf_netlogon_netr_ServerAuthenticate3_computer_name = -1;
 static gint hf_netlogon_netr_DELTA_DELETE_USER_unknown8 = -1;
+static gint hf_netlogon_netr_DELTA_UNION_delete_group = -1;
 static gint hf_netlogon_netr_ChangeLogFlags_NETR_CHANGELOG_SID_INCLUDED = -1;
 static gint hf_netlogon_netr_AccountDeltas_level = -1;
 static gint hf_netlogon_netr_trust_extension_parent_index = -1;
@@ -994,10 +966,10 @@ static gint hf_netlogon_netr_SupportedEncTypes_ENC_HMAC_SHA1_96_AES128 = -1;
 static gint hf_netlogon_netr_DsR_DcFlags_DS_SERVER_KDC = -1;
 static gint hf_netlogon_netr_NetrEnumerateTrustedDomainsEx_dom_trust_list = -1;
 static gint hf_netlogon_netr_TrustAttributes_NETR_TRUST_ATTRIBUTE_UPLEVEL_ONLY = -1;
+static gint hf_netlogon_netr_ChangeLogObject_object_name = -1;
 static gint hf_netlogon_netr_DsRAddress_buffer = -1;
 static gint hf_netlogon_netr_LogonSamLogonEx_computer_name = -1;
 static gint hf_netlogon_netr_SamInfo3_sids = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_USER_rid = -1;
 static gint hf_netlogon_netr_DELTA_ALIAS_unknown2 = -1;
 static gint hf_netlogon_netr_LogonGetDomainInfo_query = -1;
 static gint hf_netlogon_netr_ServerAuthenticate_credentials = -1;
@@ -1013,6 +985,7 @@ static gint hf_netlogon_netr_DELTA_USER_description = -1;
 static gint hf_netlogon_netr_DELTA_GROUP_unknown6 = -1;
 static gint hf_netlogon_netr_UasInfo_bad_pw_count = -1;
 static gint hf_netlogon_netr_NETLOGON_INFO_1_pdc_connection_status = -1;
+static gint hf_netlogon_netr_CONTROL_QUERY_INFORMATION_info2 = -1;
 static gint hf_netlogon_netr_SamBaseInfo_LMSessKey = -1;
 static gint hf_netlogon_netr_DELTA_ALIAS_sdbuf = -1;
 static gint hf_netlogon_netr_GetForestTrustInformation_credential = -1;
@@ -1020,6 +993,7 @@ static gint hf_netlogon_netr_LogonSamLogoff_logon = -1;
 static gint hf_netlogon_netr_ChangeLogEntry_delta_type = -1;
 static gint hf_netlogon_netr_GetForestTrustInformation_forest_trust_info = -1;
 static gint hf_netlogon_netr_WorkstationInformation_dummy3 = -1;
+static gint hf_netlogon_netr_DELTA_UNION_secret = -1;
 static gint hf_netlogon_netr_DELTA_TRUSTED_DOMAIN_unknown7 = -1;
 static gint hf_netlogon_netr_DomainTrust_guid = -1;
 static gint hf_netlogon_netr_IdentityInfo_account_name = -1;
@@ -1036,6 +1010,7 @@ static gint hf_netlogon_netr_USER_KEY16_size = -1;
 static gint hf_netlogon_netr_ServerPasswordGet_password = -1;
 static gint hf_netlogon_netr_TrustInfo_entries = -1;
 static gint hf_netlogon_netr_LogonParameterControl_MSV1_0_CLEARTEXT_PASSWORD_SUPPLIED = -1;
+static gint hf_netlogon_netr_DELTA_ID_UNION_name = -1;
 static gint hf_netlogon_netr_DatabaseRedo_change_log_entry_size = -1;
 static gint hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_GETDOMAININFO = -1;
 static gint hf_netlogon_netr_OsVersionInfoEx_SuiteMask = -1;
@@ -1045,7 +1020,7 @@ static gint hf_netlogon_netr_UasInfo_auth_flags = -1;
 static gint hf_netlogon_netr_LogonGetCapabilities_credential = -1;
 static gint hf_netlogon_netr_DsRGetDCName_site_guid = -1;
 static gint hf_netlogon_netr_DsR_DcFlags_DS_SERVER_TIMESERV = -1;
-static gint hf_netlogon_netr_CONTROL_QUERY_INFORMATION_val4_info4 = -1;
+static gint hf_netlogon_netr_DELTA_UNION_domain = -1;
 static gint hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_GENERIC_PASSTHROUGH = -1;
 static gint hf_netlogon_netr_SamBaseInfo_sub_auth_status = -1;
 static gint hf_netlogon_netr_UAS_INFO_0_computer_name = -1;
@@ -1054,7 +1029,6 @@ static gint hf_netlogon_netr_DsrDeregisterDNSHostRecords_server_name = -1;
 static gint hf_netlogon_netr_IdentityInfo_logon_id_low = -1;
 static gint hf_netlogon_netr_AcctLockStr_reset_count = -1;
 static gint hf_netlogon_netr_UserFlags_NETLOGON_CACHED_ACCOUNT = -1;
-static gint hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_USER2_rid = -1;
 static gint hf_netlogon_netr_DatabaseSync2_logon_server = -1;
 static gint hf_netlogon_netr_trust_extension_length = -1;
 static gint hf_netlogon_netr_DELTA_TRUSTED_DOMAIN_sdbuf = -1;
@@ -1215,20 +1189,20 @@ const value_string netlogon_netr_LogonInfoClass_vals[] = {
        { NetlogonServiceTransitiveInformation, "NetlogonServiceTransitiveInformation" },
 { 0, NULL }
 };
-static int netlogon_dissect_element_netr_LogonLevel_valNetlogonInteractiveInformation_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_LogonLevel_valNetlogonInteractiveInformation_password_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_LogonLevel_valNetlogonNetworkInformation_network(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_LogonLevel_valNetlogonNetworkInformation_network_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_LogonLevel_valNetlogonServiceInformation_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_LogonLevel_valNetlogonServiceInformation_password_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_LogonLevel_valNetlogonGenericInformation_generic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_LogonLevel_valNetlogonGenericInformation_generic_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_LogonLevel_valNetlogonInteractiveTransitiveInformation_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_LogonLevel_valNetlogonInteractiveTransitiveInformation_password_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_LogonLevel_valNetlogonNetworkTransitiveInformation_network(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_LogonLevel_valNetlogonNetworkTransitiveInformation_network_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_LogonLevel_valNetlogonServiceTransitiveInformation_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_LogonLevel_valNetlogonServiceTransitiveInformation_password_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_LogonLevel_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_LogonLevel_password_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_LogonLevel_network(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_LogonLevel_network_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_LogonLevel_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_LogonLevel_password_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_LogonLevel_generic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_LogonLevel_generic_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_LogonLevel_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_LogonLevel_password_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_LogonLevel_network(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_LogonLevel_network_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_LogonLevel_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_LogonLevel_password_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_UserSessionKey_key(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_UserSessionKey_key_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_LMSessionKey_key(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1355,16 +1329,16 @@ const value_string netlogon_netr_ValidationInfoClass_vals[] = {
        { NetlogonValidationSamInfo4, "NetlogonValidationSamInfo4" },
 { 0, NULL }
 };
-static int netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo_sam2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo_sam2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo2_sam3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo2_sam3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_Validation_val4_pac(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_Validation_val4_pac_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_Validation_valNetlogonValidationGenericInfo2_generic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_Validation_valNetlogonValidationGenericInfo2_generic_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo4_sam6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo4_sam6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_Validation_sam2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_Validation_sam2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_Validation_sam3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_Validation_sam3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_Validation_pac(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_Validation_pac_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_Validation_generic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_Validation_generic_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_Validation_sam6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_Validation_sam6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_Credential_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_Credential_data_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_Authenticator_cred(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1626,66 +1600,66 @@ const value_string netlogon_netr_DeltaEnum_vals[] = {
        { NETR_DELTA_MODIFY_COUNT, "NETR_DELTA_MODIFY_COUNT" },
 { 0, NULL }
 };
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DOMAIN_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DOMAIN_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_GROUP_group(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_GROUP_group_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_GROUP_rename_group(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_GROUP_rename_group_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_USER_user(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_USER_user_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_USER_rename_user(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_USER_rename_user_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_GROUP_MEMBER_group_member(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_GROUP_MEMBER_group_member_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ALIAS_alias(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ALIAS_alias_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_ALIAS_rename_alias(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_ALIAS_rename_alias_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ALIAS_MEMBER_alias_member(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ALIAS_MEMBER_alias_member_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_POLICY_policy(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_POLICY_policy_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_TRUSTED_DOMAIN_trusted_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_TRUSTED_DOMAIN_trusted_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ACCOUNT_account(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ACCOUNT_account_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_SECRET_secret(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_SECRET_secret_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DELETE_GROUP2_delete_group(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DELETE_GROUP2_delete_group_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DELETE_USER2_delete_user(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DELETE_USER2_delete_user_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_MODIFY_COUNT_modified_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_MODIFY_COUNT_modified_count_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DOMAIN_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_GROUP_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_GROUP_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_GROUP_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_USER_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_USER_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_USER_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_GROUP_MEMBER_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_ALIAS_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ALIAS_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_ALIAS_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_ALIAS_MEMBER_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_POLICY_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_POLICY_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_TRUSTED_DOMAIN_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_TRUSTED_DOMAIN_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_TRUST_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_TRUST_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_ACCOUNT_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_ACCOUNT_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ACCOUNT_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ACCOUNT_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_SECRET_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_SECRET_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_SECRET_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_SECRET_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_GROUP2_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_USER2_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_group(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_group_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_rename_group(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_rename_group_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_user(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_user_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_rename_user(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_rename_user_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_group_member(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_group_member_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_alias(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_alias_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_rename_alias(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_rename_alias_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_alias_member(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_alias_member_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_policy(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_policy_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_trusted_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_trusted_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_account(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_account_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_secret(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_secret_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_delete_group(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_delete_group_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_delete_user(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_delete_user_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_modified_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_UNION_modified_count_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_DELTA_ENUM_delta_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *delta_type);
 static int netlogon_dissect_element_netr_DELTA_ENUM_delta_id_union(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *delta_type);
 static int netlogon_dissect_element_netr_DELTA_ENUM_delta_union(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *delta_type);
@@ -1748,14 +1722,14 @@ static int netlogon_dissect_element_netr_NETLOGON_INFO_4_trusted_dc_name(tvbuff_
 static int netlogon_dissect_element_netr_NETLOGON_INFO_4_trusted_dc_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_NETLOGON_INFO_4_trusted_domain_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_NETLOGON_INFO_4_trusted_domain_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 const value_string netlogon_netr_LogonControlCode_vals[] = {
        { NETLOGON_CONTROL_QUERY, "NETLOGON_CONTROL_QUERY" },
        { NETLOGON_CONTROL_REPLICATE, "NETLOGON_CONTROL_REPLICATE" },
@@ -1775,19 +1749,19 @@ const value_string netlogon_netr_LogonControlCode_vals[] = {
        { NETLOGON_CONTROL_BREAKPOINT, "NETLOGON_CONTROL_BREAKPOINT" },
 { 0, NULL }
 };
-static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_REDISCOVER_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_REDISCOVER_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_QUERY_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_QUERY_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TRANSPORT_NOTIFY_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TRANSPORT_NOTIFY_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_CHANGE_PASSWORD_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_CHANGE_PASSWORD_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_VERIFY_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_VERIFY_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_FIND_USER_user(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_FIND_USER_user_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_SET_DBFLAG_debug_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_user(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_user_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_debug_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static const true_false_string netr_NegotiateFlags_NETLOGON_NEG_ACCOUNT_LOCKOUT_tfs = {
    "NETLOGON_NEG_ACCOUNT_LOCKOUT is SET",
    "NETLOGON_NEG_ACCOUNT_LOCKOUT is NOT SET",
@@ -1924,8 +1898,8 @@ static const true_false_string netr_ChangeLogFlags_NETR_CHANGELOG_FIRST_PROMOTIO
    "NETR_CHANGELOG_FIRST_PROMOTION_OBJ is SET",
    "NETR_CHANGELOG_FIRST_PROMOTION_OBJ is NOT SET",
 };
-static int netlogon_dissect_element_netr_ChangeLogObject_valNETR_CHANGELOG_SID_INCLUDED_object_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_ChangeLogObject_valNETR_CHANGELOG_NAME_INCLUDED_object_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_ChangeLogObject_object_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_ChangeLogObject_object_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_ChangeLogEntry_serial_number1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_ChangeLogEntry_serial_number2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_ChangeLogEntry_object_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -2101,7 +2075,7 @@ static int netlogon_dissect_element_netr_DsRGetDCNameInfo_dc_site_name(tvbuff_t
 static int netlogon_dissect_element_netr_DsRGetDCNameInfo_dc_site_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_DsRGetDCNameInfo_client_site_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_DsRGetDCNameInfo_client_site_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_Capabilities_val1_server_capabilities(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_Capabilities_server_capabilities(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static const true_false_string netr_TrustFlags_NETR_TRUST_FLAG_IN_FOREST_tfs = {
    "NETR_TRUST_FLAG_IN_FOREST is SET",
    "NETR_TRUST_FLAG_IN_FOREST is NOT SET",
@@ -2251,10 +2225,10 @@ static int netlogon_dissect_element_netr_WorkstationInformation_workstation_flag
 static int netlogon_dissect_element_netr_WorkstationInformation_dummy_long2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_WorkstationInformation_dummy_long3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_WorkstationInformation_dummy_long4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_WorkstationInfo_val1_workstation_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_WorkstationInfo_val1_workstation_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_WorkstationInfo_val2_lsa_policy_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_WorkstationInfo_val2_lsa_policy_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_WorkstationInfo_workstation_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_WorkstationInfo_workstation_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_WorkstationInfo_lsa_policy_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_WorkstationInfo_lsa_policy_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_trust_extension_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_trust_extension_dummy(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_trust_extension_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -2314,10 +2288,10 @@ static int netlogon_dissect_element_netr_DomainInformation_workstation_flags(tvb
 static int netlogon_dissect_element_netr_DomainInformation_supported_enc_types(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_DomainInformation_dummy_long3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_DomainInformation_dummy_long4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DomainInfo_val1_domain_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DomainInfo_val1_domain_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DomainInfo_val2_lsa_policy_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_DomainInfo_val2_lsa_policy_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DomainInfo_domain_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DomainInfo_domain_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DomainInfo_lsa_policy_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int netlogon_dissect_element_netr_DomainInfo_lsa_policy_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_NL_PASSWORD_VERSION_ReservedField(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_NL_PASSWORD_VERSION_PasswordVersionNumber(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_NL_PASSWORD_VERSION_PasswordVersionPresent(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -4063,113 +4037,113 @@ netlogon_dissect_enum_netr_LogonInfoClass(tvbuff_t *tvb _U_, int offset _U_, pac
 /* IDL: } */
 
 static int
-netlogon_dissect_element_netr_LogonLevel_valNetlogonInteractiveInformation_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_LogonLevel_password(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, netlogon_dissect_element_netr_LogonLevel_valNetlogonInteractiveInformation_password_, NDR_POINTER_UNIQUE, "Pointer to Password (netr_PasswordInfo)",hf_netlogon_netr_LogonLevel_valNetlogonInteractiveInformation_password);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_LogonLevel_password_, NDR_POINTER_UNIQUE, "Pointer to Password (netr_PasswordInfo)",hf_netlogon_netr_LogonLevel_password);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_LogonLevel_valNetlogonInteractiveInformation_password_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_LogonLevel_password_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_PasswordInfo(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_LogonLevel_valNetlogonInteractiveInformation_password,0);
+       offset = netlogon_dissect_struct_netr_PasswordInfo(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_LogonLevel_password,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_LogonLevel_valNetlogonNetworkInformation_network(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_LogonLevel_network(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, netlogon_dissect_element_netr_LogonLevel_valNetlogonNetworkInformation_network_, NDR_POINTER_UNIQUE, "Pointer to Network (netr_NetworkInfo)",hf_netlogon_netr_LogonLevel_valNetlogonNetworkInformation_network);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_LogonLevel_network_, NDR_POINTER_UNIQUE, "Pointer to Network (netr_NetworkInfo)",hf_netlogon_netr_LogonLevel_network);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_LogonLevel_valNetlogonNetworkInformation_network_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_LogonLevel_network_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_NetworkInfo(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_LogonLevel_valNetlogonNetworkInformation_network,0);
+       offset = netlogon_dissect_struct_netr_NetworkInfo(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_LogonLevel_network,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_LogonLevel_valNetlogonServiceInformation_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_LogonLevel_password(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, netlogon_dissect_element_netr_LogonLevel_valNetlogonServiceInformation_password_, NDR_POINTER_UNIQUE, "Pointer to Password (netr_PasswordInfo)",hf_netlogon_netr_LogonLevel_valNetlogonServiceInformation_password);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_LogonLevel_password_, NDR_POINTER_UNIQUE, "Pointer to Password (netr_PasswordInfo)",hf_netlogon_netr_LogonLevel_password);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_LogonLevel_valNetlogonServiceInformation_password_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_LogonLevel_password_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_PasswordInfo(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_LogonLevel_valNetlogonServiceInformation_password,0);
+       offset = netlogon_dissect_struct_netr_PasswordInfo(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_LogonLevel_password,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_LogonLevel_valNetlogonGenericInformation_generic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_LogonLevel_generic(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, netlogon_dissect_element_netr_LogonLevel_valNetlogonGenericInformation_generic_, NDR_POINTER_UNIQUE, "Pointer to Generic (netr_GenericInfo)",hf_netlogon_netr_LogonLevel_valNetlogonGenericInformation_generic);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_LogonLevel_generic_, NDR_POINTER_UNIQUE, "Pointer to Generic (netr_GenericInfo)",hf_netlogon_netr_LogonLevel_generic);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_LogonLevel_valNetlogonGenericInformation_generic_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_LogonLevel_generic_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_GenericInfo(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_LogonLevel_valNetlogonGenericInformation_generic,0);
+       offset = netlogon_dissect_struct_netr_GenericInfo(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_LogonLevel_generic,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_LogonLevel_valNetlogonInteractiveTransitiveInformation_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_LogonLevel_password(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, netlogon_dissect_element_netr_LogonLevel_valNetlogonInteractiveTransitiveInformation_password_, NDR_POINTER_UNIQUE, "Pointer to Password (netr_PasswordInfo)",hf_netlogon_netr_LogonLevel_valNetlogonInteractiveTransitiveInformation_password);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_LogonLevel_password_, NDR_POINTER_UNIQUE, "Pointer to Password (netr_PasswordInfo)",hf_netlogon_netr_LogonLevel_password);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_LogonLevel_valNetlogonInteractiveTransitiveInformation_password_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_LogonLevel_password_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_PasswordInfo(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_LogonLevel_valNetlogonInteractiveTransitiveInformation_password,0);
+       offset = netlogon_dissect_struct_netr_PasswordInfo(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_LogonLevel_password,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_LogonLevel_valNetlogonNetworkTransitiveInformation_network(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_LogonLevel_network(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, netlogon_dissect_element_netr_LogonLevel_valNetlogonNetworkTransitiveInformation_network_, NDR_POINTER_UNIQUE, "Pointer to Network (netr_NetworkInfo)",hf_netlogon_netr_LogonLevel_valNetlogonNetworkTransitiveInformation_network);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_LogonLevel_network_, NDR_POINTER_UNIQUE, "Pointer to Network (netr_NetworkInfo)",hf_netlogon_netr_LogonLevel_network);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_LogonLevel_valNetlogonNetworkTransitiveInformation_network_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_LogonLevel_network_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_NetworkInfo(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_LogonLevel_valNetlogonNetworkTransitiveInformation_network,0);
+       offset = netlogon_dissect_struct_netr_NetworkInfo(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_LogonLevel_network,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_LogonLevel_valNetlogonServiceTransitiveInformation_password(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_LogonLevel_password(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, netlogon_dissect_element_netr_LogonLevel_valNetlogonServiceTransitiveInformation_password_, NDR_POINTER_UNIQUE, "Pointer to Password (netr_PasswordInfo)",hf_netlogon_netr_LogonLevel_valNetlogonServiceTransitiveInformation_password);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_LogonLevel_password_, NDR_POINTER_UNIQUE, "Pointer to Password (netr_PasswordInfo)",hf_netlogon_netr_LogonLevel_password);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_LogonLevel_valNetlogonServiceTransitiveInformation_password_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_LogonLevel_password_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_PasswordInfo(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_LogonLevel_valNetlogonServiceTransitiveInformation_password,0);
+       offset = netlogon_dissect_struct_netr_PasswordInfo(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_LogonLevel_password,0);
 
        return offset;
 }
@@ -4193,31 +4167,31 @@ netlogon_dissect_netr_LogonLevel(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
        switch(level) {
                case NetlogonInteractiveInformation:
-                       offset = netlogon_dissect_element_netr_LogonLevel_valNetlogonInteractiveInformation_password(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_LogonLevel_password(tvb, offset, pinfo, tree, drep);
                break;
 
                case NetlogonNetworkInformation:
-                       offset = netlogon_dissect_element_netr_LogonLevel_valNetlogonNetworkInformation_network(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_LogonLevel_network(tvb, offset, pinfo, tree, drep);
                break;
 
                case NetlogonServiceInformation:
-                       offset = netlogon_dissect_element_netr_LogonLevel_valNetlogonServiceInformation_password(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_LogonLevel_password(tvb, offset, pinfo, tree, drep);
                break;
 
                case NetlogonGenericInformation:
-                       offset = netlogon_dissect_element_netr_LogonLevel_valNetlogonGenericInformation_generic(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_LogonLevel_generic(tvb, offset, pinfo, tree, drep);
                break;
 
                case NetlogonInteractiveTransitiveInformation:
-                       offset = netlogon_dissect_element_netr_LogonLevel_valNetlogonInteractiveTransitiveInformation_password(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_LogonLevel_password(tvb, offset, pinfo, tree, drep);
                break;
 
                case NetlogonNetworkTransitiveInformation:
-                       offset = netlogon_dissect_element_netr_LogonLevel_valNetlogonNetworkTransitiveInformation_network(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_LogonLevel_network(tvb, offset, pinfo, tree, drep);
                break;
 
                case NetlogonServiceTransitiveInformation:
-                       offset = netlogon_dissect_element_netr_LogonLevel_valNetlogonServiceTransitiveInformation_password(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_LogonLevel_password(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -5450,81 +5424,81 @@ netlogon_dissect_enum_netr_ValidationInfoClass(tvbuff_t *tvb _U_, int offset _U_
 /* IDL: } */
 
 static int
-netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo_sam2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_Validation_sam2(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, netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo_sam2_, NDR_POINTER_UNIQUE, "Pointer to Sam2 (netr_SamInfo2)",hf_netlogon_netr_Validation_valNetlogonValidationSamInfo_sam2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_Validation_sam2_, NDR_POINTER_UNIQUE, "Pointer to Sam2 (netr_SamInfo2)",hf_netlogon_netr_Validation_sam2);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo_sam2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_Validation_sam2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_SamInfo2(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_Validation_valNetlogonValidationSamInfo_sam2,0);
+       offset = netlogon_dissect_struct_netr_SamInfo2(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_Validation_sam2,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo2_sam3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_Validation_sam3(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, netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo2_sam3_, NDR_POINTER_UNIQUE, "Pointer to Sam3 (netr_SamInfo3)",hf_netlogon_netr_Validation_valNetlogonValidationSamInfo2_sam3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_Validation_sam3_, NDR_POINTER_UNIQUE, "Pointer to Sam3 (netr_SamInfo3)",hf_netlogon_netr_Validation_sam3);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo2_sam3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_Validation_sam3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_SamInfo3(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_Validation_valNetlogonValidationSamInfo2_sam3,0);
+       offset = netlogon_dissect_struct_netr_SamInfo3(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_Validation_sam3,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_Validation_val4_pac(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_Validation_pac(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, netlogon_dissect_element_netr_Validation_val4_pac_, NDR_POINTER_UNIQUE, "Pointer to Pac (netr_PacInfo)",hf_netlogon_netr_Validation_val4_pac);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_Validation_pac_, NDR_POINTER_UNIQUE, "Pointer to Pac (netr_PacInfo)",hf_netlogon_netr_Validation_pac);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_Validation_val4_pac_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_Validation_pac_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_PacInfo(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_Validation_val4_pac,0);
+       offset = netlogon_dissect_struct_netr_PacInfo(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_Validation_pac,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_Validation_valNetlogonValidationGenericInfo2_generic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_Validation_generic(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, netlogon_dissect_element_netr_Validation_valNetlogonValidationGenericInfo2_generic_, NDR_POINTER_UNIQUE, "Pointer to Generic (netr_GenericInfo2)",hf_netlogon_netr_Validation_valNetlogonValidationGenericInfo2_generic);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_Validation_generic_, NDR_POINTER_UNIQUE, "Pointer to Generic (netr_GenericInfo2)",hf_netlogon_netr_Validation_generic);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_Validation_valNetlogonValidationGenericInfo2_generic_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_Validation_generic_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_GenericInfo2(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_Validation_valNetlogonValidationGenericInfo2_generic,0);
+       offset = netlogon_dissect_struct_netr_GenericInfo2(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_Validation_generic,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo4_sam6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_Validation_sam6(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, netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo4_sam6_, NDR_POINTER_UNIQUE, "Pointer to Sam6 (netr_SamInfo6)",hf_netlogon_netr_Validation_valNetlogonValidationSamInfo4_sam6);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_Validation_sam6_, NDR_POINTER_UNIQUE, "Pointer to Sam6 (netr_SamInfo6)",hf_netlogon_netr_Validation_sam6);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo4_sam6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_Validation_sam6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_SamInfo6(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_Validation_valNetlogonValidationSamInfo4_sam6,0);
+       offset = netlogon_dissect_struct_netr_SamInfo6(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_Validation_sam6,0);
 
        return offset;
 }
@@ -5548,23 +5522,23 @@ netlogon_dissect_netr_Validation(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
        switch(level) {
                case NetlogonValidationSamInfo:
-                       offset = netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo_sam2(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_Validation_sam2(tvb, offset, pinfo, tree, drep);
                break;
 
                case NetlogonValidationSamInfo2:
-                       offset = netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo2_sam3(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_Validation_sam3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = netlogon_dissect_element_netr_Validation_val4_pac(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_Validation_pac(tvb, offset, pinfo, tree, drep);
                break;
 
                case NetlogonValidationGenericInfo2:
-                       offset = netlogon_dissect_element_netr_Validation_valNetlogonValidationGenericInfo2_generic(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_Validation_generic(tvb, offset, pinfo, tree, drep);
                break;
 
                case NetlogonValidationSamInfo4:
-                       offset = netlogon_dissect_element_netr_Validation_valNetlogonValidationSamInfo4_sam6(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_Validation_sam6(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -8849,257 +8823,257 @@ netlogon_dissect_enum_netr_DeltaEnum(tvbuff_t *tvb _U_, int offset _U_, packet_i
 /* IDL: } */
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DOMAIN_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_domain(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, netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DOMAIN_domain_, NDR_POINTER_UNIQUE, "Pointer to Domain (netr_DELTA_DOMAIN)",hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_DOMAIN_domain);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_UNION_domain_, NDR_POINTER_UNIQUE, "Pointer to Domain (netr_DELTA_DOMAIN)",hf_netlogon_netr_DELTA_UNION_domain);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DOMAIN_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_DELTA_DOMAIN(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_DOMAIN_domain,0);
+       offset = netlogon_dissect_struct_netr_DELTA_DOMAIN(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_domain,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_GROUP_group(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_group(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, netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_GROUP_group_, NDR_POINTER_UNIQUE, "Pointer to Group (netr_DELTA_GROUP)",hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_GROUP_group);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_UNION_group_, NDR_POINTER_UNIQUE, "Pointer to Group (netr_DELTA_GROUP)",hf_netlogon_netr_DELTA_UNION_group);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_GROUP_group_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_group_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_DELTA_GROUP(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_GROUP_group,0);
+       offset = netlogon_dissect_struct_netr_DELTA_GROUP(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_group,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_GROUP_rename_group(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_rename_group(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, netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_GROUP_rename_group_, NDR_POINTER_UNIQUE, "Pointer to Rename Group (netr_DELTA_RENAME)",hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_RENAME_GROUP_rename_group);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_UNION_rename_group_, NDR_POINTER_UNIQUE, "Pointer to Rename Group (netr_DELTA_RENAME)",hf_netlogon_netr_DELTA_UNION_rename_group);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_GROUP_rename_group_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_rename_group_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_DELTA_RENAME(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_RENAME_GROUP_rename_group,0);
+       offset = netlogon_dissect_struct_netr_DELTA_RENAME(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_rename_group,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_USER_user(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_user(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, netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_USER_user_, NDR_POINTER_UNIQUE, "Pointer to User (netr_DELTA_USER)",hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_USER_user);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_UNION_user_, NDR_POINTER_UNIQUE, "Pointer to User (netr_DELTA_USER)",hf_netlogon_netr_DELTA_UNION_user);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_USER_user_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_user_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_DELTA_USER(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_USER_user,0);
+       offset = netlogon_dissect_struct_netr_DELTA_USER(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_user,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_USER_rename_user(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_rename_user(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, netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_USER_rename_user_, NDR_POINTER_UNIQUE, "Pointer to Rename User (netr_DELTA_RENAME)",hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_RENAME_USER_rename_user);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_UNION_rename_user_, NDR_POINTER_UNIQUE, "Pointer to Rename User (netr_DELTA_RENAME)",hf_netlogon_netr_DELTA_UNION_rename_user);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_USER_rename_user_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_rename_user_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_DELTA_RENAME(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_RENAME_USER_rename_user,0);
+       offset = netlogon_dissect_struct_netr_DELTA_RENAME(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_rename_user,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_GROUP_MEMBER_group_member(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_group_member(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, netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_GROUP_MEMBER_group_member_, NDR_POINTER_UNIQUE, "Pointer to Group Member (netr_DELTA_GROUP_MEMBER)",hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_GROUP_MEMBER_group_member);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_UNION_group_member_, NDR_POINTER_UNIQUE, "Pointer to Group Member (netr_DELTA_GROUP_MEMBER)",hf_netlogon_netr_DELTA_UNION_group_member);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_GROUP_MEMBER_group_member_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_group_member_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_DELTA_GROUP_MEMBER(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_GROUP_MEMBER_group_member,0);
+       offset = netlogon_dissect_struct_netr_DELTA_GROUP_MEMBER(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_group_member,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ALIAS_alias(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_alias(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, netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ALIAS_alias_, NDR_POINTER_UNIQUE, "Pointer to Alias (netr_DELTA_ALIAS)",hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_ALIAS_alias);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_UNION_alias_, NDR_POINTER_UNIQUE, "Pointer to Alias (netr_DELTA_ALIAS)",hf_netlogon_netr_DELTA_UNION_alias);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ALIAS_alias_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_alias_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_DELTA_ALIAS(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_ALIAS_alias,0);
+       offset = netlogon_dissect_struct_netr_DELTA_ALIAS(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_alias,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_ALIAS_rename_alias(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_rename_alias(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, netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_ALIAS_rename_alias_, NDR_POINTER_UNIQUE, "Pointer to Rename Alias (netr_DELTA_RENAME)",hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_RENAME_ALIAS_rename_alias);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_UNION_rename_alias_, NDR_POINTER_UNIQUE, "Pointer to Rename Alias (netr_DELTA_RENAME)",hf_netlogon_netr_DELTA_UNION_rename_alias);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_ALIAS_rename_alias_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_rename_alias_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_DELTA_RENAME(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_RENAME_ALIAS_rename_alias,0);
+       offset = netlogon_dissect_struct_netr_DELTA_RENAME(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_rename_alias,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ALIAS_MEMBER_alias_member(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_alias_member(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, netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ALIAS_MEMBER_alias_member_, NDR_POINTER_UNIQUE, "Pointer to Alias Member (netr_DELTA_ALIAS_MEMBER)",hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_ALIAS_MEMBER_alias_member);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_UNION_alias_member_, NDR_POINTER_UNIQUE, "Pointer to Alias Member (netr_DELTA_ALIAS_MEMBER)",hf_netlogon_netr_DELTA_UNION_alias_member);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ALIAS_MEMBER_alias_member_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_alias_member_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_DELTA_ALIAS_MEMBER(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_ALIAS_MEMBER_alias_member,0);
+       offset = netlogon_dissect_struct_netr_DELTA_ALIAS_MEMBER(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_alias_member,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_POLICY_policy(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_policy(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, netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_POLICY_policy_, NDR_POINTER_UNIQUE, "Pointer to Policy (netr_DELTA_POLICY)",hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_POLICY_policy);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_UNION_policy_, NDR_POINTER_UNIQUE, "Pointer to Policy (netr_DELTA_POLICY)",hf_netlogon_netr_DELTA_UNION_policy);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_POLICY_policy_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_policy_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_DELTA_POLICY(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_POLICY_policy,0);
+       offset = netlogon_dissect_struct_netr_DELTA_POLICY(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_policy,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_TRUSTED_DOMAIN_trusted_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_trusted_domain(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, netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_TRUSTED_DOMAIN_trusted_domain_, NDR_POINTER_UNIQUE, "Pointer to Trusted Domain (netr_DELTA_TRUSTED_DOMAIN)",hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_TRUSTED_DOMAIN_trusted_domain);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_UNION_trusted_domain_, NDR_POINTER_UNIQUE, "Pointer to Trusted Domain (netr_DELTA_TRUSTED_DOMAIN)",hf_netlogon_netr_DELTA_UNION_trusted_domain);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_TRUSTED_DOMAIN_trusted_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_trusted_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_DELTA_TRUSTED_DOMAIN(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_TRUSTED_DOMAIN_trusted_domain,0);
+       offset = netlogon_dissect_struct_netr_DELTA_TRUSTED_DOMAIN(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_trusted_domain,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ACCOUNT_account(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_account(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, netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ACCOUNT_account_, NDR_POINTER_UNIQUE, "Pointer to Account (netr_DELTA_ACCOUNT)",hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_ACCOUNT_account);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_UNION_account_, NDR_POINTER_UNIQUE, "Pointer to Account (netr_DELTA_ACCOUNT)",hf_netlogon_netr_DELTA_UNION_account);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ACCOUNT_account_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_account_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_DELTA_ACCOUNT(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_ACCOUNT_account,0);
+       offset = netlogon_dissect_struct_netr_DELTA_ACCOUNT(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_account,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_SECRET_secret(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_secret(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, netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_SECRET_secret_, NDR_POINTER_UNIQUE, "Pointer to Secret (netr_DELTA_SECRET)",hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_SECRET_secret);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_UNION_secret_, NDR_POINTER_UNIQUE, "Pointer to Secret (netr_DELTA_SECRET)",hf_netlogon_netr_DELTA_UNION_secret);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_SECRET_secret_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_secret_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_DELTA_SECRET(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_SECRET_secret,0);
+       offset = netlogon_dissect_struct_netr_DELTA_SECRET(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_secret,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DELETE_GROUP2_delete_group(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_delete_group(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, netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DELETE_GROUP2_delete_group_, NDR_POINTER_UNIQUE, "Pointer to Delete Group (netr_DELTA_DELETE_USER)",hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_DELETE_GROUP2_delete_group);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_UNION_delete_group_, NDR_POINTER_UNIQUE, "Pointer to Delete Group (netr_DELTA_DELETE_USER)",hf_netlogon_netr_DELTA_UNION_delete_group);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DELETE_GROUP2_delete_group_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_delete_group_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_DELTA_DELETE_USER(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_DELETE_GROUP2_delete_group,0);
+       offset = netlogon_dissect_struct_netr_DELTA_DELETE_USER(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_delete_group,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DELETE_USER2_delete_user(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_delete_user(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, netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DELETE_USER2_delete_user_, NDR_POINTER_UNIQUE, "Pointer to Delete User (netr_DELTA_DELETE_USER)",hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_DELETE_USER2_delete_user);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_UNION_delete_user_, NDR_POINTER_UNIQUE, "Pointer to Delete User (netr_DELTA_DELETE_USER)",hf_netlogon_netr_DELTA_UNION_delete_user);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DELETE_USER2_delete_user_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_delete_user_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_DELTA_DELETE_USER(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_DELETE_USER2_delete_user,0);
+       offset = netlogon_dissect_struct_netr_DELTA_DELETE_USER(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_UNION_delete_user,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_MODIFY_COUNT_modified_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_modified_count(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, netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_MODIFY_COUNT_modified_count_, NDR_POINTER_UNIQUE, "Pointer to Modified Count (udlong)",hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_MODIFY_COUNT_modified_count);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_UNION_modified_count_, NDR_POINTER_UNIQUE, "Pointer to Modified Count (udlong)",hf_netlogon_netr_DELTA_UNION_modified_count);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_MODIFY_COUNT_modified_count_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_UNION_modified_count_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_duint32(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_MODIFY_COUNT_modified_count, NULL);
+       offset = dissect_ndr_duint32(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_DELTA_UNION_modified_count, NULL);
 
        return offset;
 }
@@ -9123,85 +9097,85 @@ netlogon_dissect_netr_DELTA_UNION(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
        switch(level) {
                case NETR_DELTA_DOMAIN:
-                       offset = netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DOMAIN_domain(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_UNION_domain(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_GROUP:
-                       offset = netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_GROUP_group(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_UNION_group(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_DELETE_GROUP:
                break;
 
                case NETR_DELTA_RENAME_GROUP:
-                       offset = netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_GROUP_rename_group(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_UNION_rename_group(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_USER:
-                       offset = netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_USER_user(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_UNION_user(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_DELETE_USER:
                break;
 
                case NETR_DELTA_RENAME_USER:
-                       offset = netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_USER_rename_user(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_UNION_rename_user(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_GROUP_MEMBER:
-                       offset = netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_GROUP_MEMBER_group_member(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_UNION_group_member(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_ALIAS:
-                       offset = netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ALIAS_alias(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_UNION_alias(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_DELETE_ALIAS:
                break;
 
                case NETR_DELTA_RENAME_ALIAS:
-                       offset = netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_RENAME_ALIAS_rename_alias(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_UNION_rename_alias(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_ALIAS_MEMBER:
-                       offset = netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ALIAS_MEMBER_alias_member(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_UNION_alias_member(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_POLICY:
-                       offset = netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_POLICY_policy(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_UNION_policy(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_TRUSTED_DOMAIN:
-                       offset = netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_TRUSTED_DOMAIN_trusted_domain(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_UNION_trusted_domain(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_DELETE_TRUST:
                break;
 
                case NETR_DELTA_ACCOUNT:
-                       offset = netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_ACCOUNT_account(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_UNION_account(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_DELETE_ACCOUNT:
                break;
 
                case NETR_DELTA_SECRET:
-                       offset = netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_SECRET_secret(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_UNION_secret(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_DELETE_SECRET:
                break;
 
                case NETR_DELTA_DELETE_GROUP2:
-                       offset = netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DELETE_GROUP2_delete_group(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_UNION_delete_group(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_DELETE_USER2:
-                       offset = netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_DELETE_USER2_delete_user(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_UNION_delete_user(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_MODIFY_COUNT:
-                       offset = netlogon_dissect_element_netr_DELTA_UNION_valNETR_DELTA_MODIFY_COUNT_modified_count(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_UNION_modified_count(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -9240,231 +9214,231 @@ netlogon_dissect_netr_DELTA_UNION(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DOMAIN_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_rid(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_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DOMAIN_rid, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_DELTA_ID_UNION_rid, 0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_GROUP_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_rid(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_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_GROUP_rid, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_DELTA_ID_UNION_rid, 0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_GROUP_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_rid(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_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_GROUP_rid, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_DELTA_ID_UNION_rid, 0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_GROUP_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_rid(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_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_GROUP_rid, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_DELTA_ID_UNION_rid, 0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_USER_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_rid(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_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_USER_rid, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_DELTA_ID_UNION_rid, 0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_USER_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_rid(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_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_USER_rid, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_DELTA_ID_UNION_rid, 0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_USER_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_rid(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_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_USER_rid, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_DELTA_ID_UNION_rid, 0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_GROUP_MEMBER_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_rid(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_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_GROUP_MEMBER_rid, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_DELTA_ID_UNION_rid, 0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_ALIAS_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_rid(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_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_ALIAS_rid, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_DELTA_ID_UNION_rid, 0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ALIAS_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_rid(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_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ALIAS_rid, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_DELTA_ID_UNION_rid, 0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_ALIAS_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_rid(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_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_ALIAS_rid, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_DELTA_ID_UNION_rid, 0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_ALIAS_MEMBER_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_rid(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_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_ALIAS_MEMBER_rid, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_DELTA_ID_UNION_rid, 0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_POLICY_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_sid(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, netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_POLICY_sid_, NDR_POINTER_UNIQUE, "Pointer to Sid (dom_sid2)",hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_POLICY_sid);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_ID_UNION_sid_, NDR_POINTER_UNIQUE, "Pointer to Sid (dom_sid2)",hf_netlogon_netr_DELTA_ID_UNION_sid);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_POLICY_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_dom_sid2(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_POLICY_sid,0);
+       offset = netlogon_dissect_struct_dom_sid2(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_ID_UNION_sid,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_TRUSTED_DOMAIN_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_sid(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, netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_TRUSTED_DOMAIN_sid_, NDR_POINTER_UNIQUE, "Pointer to Sid (dom_sid2)",hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_TRUSTED_DOMAIN_sid);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_ID_UNION_sid_, NDR_POINTER_UNIQUE, "Pointer to Sid (dom_sid2)",hf_netlogon_netr_DELTA_ID_UNION_sid);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_TRUSTED_DOMAIN_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_dom_sid2(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_TRUSTED_DOMAIN_sid,0);
+       offset = netlogon_dissect_struct_dom_sid2(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_ID_UNION_sid,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_TRUST_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_sid(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, netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_TRUST_sid_, NDR_POINTER_UNIQUE, "Pointer to Sid (dom_sid2)",hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_TRUST_sid);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_ID_UNION_sid_, NDR_POINTER_UNIQUE, "Pointer to Sid (dom_sid2)",hf_netlogon_netr_DELTA_ID_UNION_sid);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_TRUST_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_dom_sid2(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_TRUST_sid,0);
+       offset = netlogon_dissect_struct_dom_sid2(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_ID_UNION_sid,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_ACCOUNT_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_sid(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, netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_ACCOUNT_sid_, NDR_POINTER_UNIQUE, "Pointer to Sid (dom_sid2)",hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_ACCOUNT_sid);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_ID_UNION_sid_, NDR_POINTER_UNIQUE, "Pointer to Sid (dom_sid2)",hf_netlogon_netr_DELTA_ID_UNION_sid);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_ACCOUNT_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_dom_sid2(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_ACCOUNT_sid,0);
+       offset = netlogon_dissect_struct_dom_sid2(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_ID_UNION_sid,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ACCOUNT_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_sid(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, netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ACCOUNT_sid_, NDR_POINTER_UNIQUE, "Pointer to Sid (dom_sid2)",hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ACCOUNT_sid);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_ID_UNION_sid_, NDR_POINTER_UNIQUE, "Pointer to Sid (dom_sid2)",hf_netlogon_netr_DELTA_ID_UNION_sid);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ACCOUNT_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_sid_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_dom_sid2(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ACCOUNT_sid,0);
+       offset = netlogon_dissect_struct_dom_sid2(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DELTA_ID_UNION_sid,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_SECRET_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_name(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, netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_SECRET_name_, NDR_POINTER_UNIQUE, "Pointer to Name (uint16)",hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_SECRET_name);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_ID_UNION_name_, NDR_POINTER_UNIQUE, "Pointer to Name (uint16)",hf_netlogon_netr_DELTA_ID_UNION_name);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_SECRET_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_name_(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_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_SECRET_name, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_netlogon_netr_DELTA_ID_UNION_name, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_SECRET_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_name(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, netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_SECRET_name_, NDR_POINTER_UNIQUE, "Pointer to Name (uint16)",hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_SECRET_name);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DELTA_ID_UNION_name_, NDR_POINTER_UNIQUE, "Pointer to Name (uint16)",hf_netlogon_netr_DELTA_ID_UNION_name);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_SECRET_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_name_(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_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_SECRET_name, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_netlogon_netr_DELTA_ID_UNION_name, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_GROUP2_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_rid(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_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_GROUP2_rid, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_DELTA_ID_UNION_rid, 0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_USER2_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DELTA_ID_UNION_rid(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_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_USER2_rid, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_DELTA_ID_UNION_rid, 0);
 
        return offset;
 }
@@ -9488,87 +9462,87 @@ netlogon_dissect_netr_DELTA_ID_UNION(tvbuff_t *tvb _U_, int offset _U_, packet_i
 
        switch(level) {
                case NETR_DELTA_DOMAIN:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DOMAIN_rid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_GROUP:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_GROUP_rid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_DELETE_GROUP:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_GROUP_rid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_RENAME_GROUP:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_GROUP_rid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_USER:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_USER_rid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_DELETE_USER:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_USER_rid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_RENAME_USER:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_USER_rid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_GROUP_MEMBER:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_GROUP_MEMBER_rid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_ALIAS:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_ALIAS_rid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_DELETE_ALIAS:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ALIAS_rid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_RENAME_ALIAS:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_ALIAS_rid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_ALIAS_MEMBER:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_ALIAS_MEMBER_rid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_POLICY:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_POLICY_sid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_sid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_TRUSTED_DOMAIN:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_TRUSTED_DOMAIN_sid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_sid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_DELETE_TRUST:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_TRUST_sid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_sid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_ACCOUNT:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_ACCOUNT_sid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_sid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_DELETE_ACCOUNT:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ACCOUNT_sid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_sid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_SECRET:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_SECRET_name(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_DELETE_SECRET:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_SECRET_name(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_name(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_DELETE_GROUP2:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_GROUP2_rid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_DELETE_USER2:
-                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_USER2_rid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DELTA_ID_UNION_rid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_DELTA_MODIFY_COUNT:
@@ -10277,65 +10251,65 @@ netlogon_dissect_struct_netr_NETLOGON_INFO_4(tvbuff_t *tvb _U_, int offset _U_,
 /* IDL: } */
 
 static int
-netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info1(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, netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (netr_NETLOGON_INFO_1)",hf_netlogon_netr_CONTROL_QUERY_INFORMATION_val1_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (netr_NETLOGON_INFO_1)",hf_netlogon_netr_CONTROL_QUERY_INFORMATION_info1);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_NETLOGON_INFO_1(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_CONTROL_QUERY_INFORMATION_val1_info1,0);
+       offset = netlogon_dissect_struct_netr_NETLOGON_INFO_1(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_CONTROL_QUERY_INFORMATION_info1,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info2(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, netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (netr_NETLOGON_INFO_2)",hf_netlogon_netr_CONTROL_QUERY_INFORMATION_val2_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (netr_NETLOGON_INFO_2)",hf_netlogon_netr_CONTROL_QUERY_INFORMATION_info2);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_NETLOGON_INFO_2(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_CONTROL_QUERY_INFORMATION_val2_info2,0);
+       offset = netlogon_dissect_struct_netr_NETLOGON_INFO_2(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_CONTROL_QUERY_INFORMATION_info2,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info3(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, netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val3_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (netr_NETLOGON_INFO_3)",hf_netlogon_netr_CONTROL_QUERY_INFORMATION_val3_info3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (netr_NETLOGON_INFO_3)",hf_netlogon_netr_CONTROL_QUERY_INFORMATION_info3);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_NETLOGON_INFO_3(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_CONTROL_QUERY_INFORMATION_val3_info3,0);
+       offset = netlogon_dissect_struct_netr_NETLOGON_INFO_3(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_CONTROL_QUERY_INFORMATION_info3,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info4(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, netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val4_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (netr_NETLOGON_INFO_4)",hf_netlogon_netr_CONTROL_QUERY_INFORMATION_val4_info4);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (netr_NETLOGON_INFO_4)",hf_netlogon_netr_CONTROL_QUERY_INFORMATION_info4);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_NETLOGON_INFO_4(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_CONTROL_QUERY_INFORMATION_val4_info4,0);
+       offset = netlogon_dissect_struct_netr_NETLOGON_INFO_4(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_CONTROL_QUERY_INFORMATION_info4,0);
 
        return offset;
 }
@@ -10359,19 +10333,19 @@ netlogon_dissect_netr_CONTROL_QUERY_INFORMATION(tvbuff_t *tvb _U_, int offset _U
 
        switch(level) {
                case 1:
-                       offset = netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val3_info3(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_val4_info4(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_CONTROL_QUERY_INFORMATION_info4(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -10429,123 +10403,123 @@ netlogon_dissect_enum_netr_LogonControlCode(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_REDISCOVER_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain(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, netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_REDISCOVER_domain_, NDR_POINTER_UNIQUE, "Pointer to Domain (uint16)",hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_REDISCOVER_domain);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain_, NDR_POINTER_UNIQUE, "Pointer to Domain (uint16)",hf_netlogon_netr_CONTROL_DATA_INFORMATION_domain);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_REDISCOVER_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain_(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_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_REDISCOVER_domain, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_netlogon_netr_CONTROL_DATA_INFORMATION_domain, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_QUERY_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain(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, netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_QUERY_domain_, NDR_POINTER_UNIQUE, "Pointer to Domain (uint16)",hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_QUERY_domain);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain_, NDR_POINTER_UNIQUE, "Pointer to Domain (uint16)",hf_netlogon_netr_CONTROL_DATA_INFORMATION_domain);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_QUERY_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain_(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_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_QUERY_domain, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_netlogon_netr_CONTROL_DATA_INFORMATION_domain, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TRANSPORT_NOTIFY_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain(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, netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TRANSPORT_NOTIFY_domain_, NDR_POINTER_UNIQUE, "Pointer to Domain (uint16)",hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TRANSPORT_NOTIFY_domain);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain_, NDR_POINTER_UNIQUE, "Pointer to Domain (uint16)",hf_netlogon_netr_CONTROL_DATA_INFORMATION_domain);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TRANSPORT_NOTIFY_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain_(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_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TRANSPORT_NOTIFY_domain, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_netlogon_netr_CONTROL_DATA_INFORMATION_domain, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_CHANGE_PASSWORD_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain(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, netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_CHANGE_PASSWORD_domain_, NDR_POINTER_UNIQUE, "Pointer to Domain (uint16)",hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_CHANGE_PASSWORD_domain);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain_, NDR_POINTER_UNIQUE, "Pointer to Domain (uint16)",hf_netlogon_netr_CONTROL_DATA_INFORMATION_domain);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_CHANGE_PASSWORD_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain_(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_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_CHANGE_PASSWORD_domain, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_netlogon_netr_CONTROL_DATA_INFORMATION_domain, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_VERIFY_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain(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, netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_VERIFY_domain_, NDR_POINTER_UNIQUE, "Pointer to Domain (uint16)",hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_VERIFY_domain);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain_, NDR_POINTER_UNIQUE, "Pointer to Domain (uint16)",hf_netlogon_netr_CONTROL_DATA_INFORMATION_domain);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_VERIFY_domain_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain_(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_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_VERIFY_domain, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_netlogon_netr_CONTROL_DATA_INFORMATION_domain, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_FIND_USER_user(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_user(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, netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_FIND_USER_user_, NDR_POINTER_UNIQUE, "Pointer to User (uint16)",hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_FIND_USER_user);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_user_, NDR_POINTER_UNIQUE, "Pointer to User (uint16)",hf_netlogon_netr_CONTROL_DATA_INFORMATION_user);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_FIND_USER_user_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_user_(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_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_FIND_USER_user, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_netlogon_netr_CONTROL_DATA_INFORMATION_user, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_SET_DBFLAG_debug_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_debug_level(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_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_SET_DBFLAG_debug_level, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_CONTROL_DATA_INFORMATION_debug_level, 0);
 
        return offset;
 }
@@ -10569,31 +10543,31 @@ netlogon_dissect_netr_CONTROL_DATA_INFORMATION(tvbuff_t *tvb _U_, int offset _U_
 
        switch(level) {
                case NETLOGON_CONTROL_REDISCOVER:
-                       offset = netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_REDISCOVER_domain(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETLOGON_CONTROL_TC_QUERY:
-                       offset = netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_QUERY_domain(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETLOGON_CONTROL_TRANSPORT_NOTIFY:
-                       offset = netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TRANSPORT_NOTIFY_domain(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETLOGON_CONTROL_CHANGE_PASSWORD:
-                       offset = netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_CHANGE_PASSWORD_domain(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETLOGON_CONTROL_TC_VERIFY:
-                       offset = netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_VERIFY_domain(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_domain(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETLOGON_CONTROL_FIND_USER:
-                       offset = netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_FIND_USER_user(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_user(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETLOGON_CONTROL_SET_DBFLAG:
-                       offset = netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_SET_DBFLAG_debug_level(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_CONTROL_DATA_INFORMATION_debug_level(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -10980,17 +10954,17 @@ netlogon_dissect_bitmap_netr_ChangeLogFlags(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-netlogon_dissect_element_netr_ChangeLogObject_valNETR_CHANGELOG_SID_INCLUDED_object_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_ChangeLogObject_object_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_dom_sid(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_ChangeLogObject_valNETR_CHANGELOG_SID_INCLUDED_object_sid,0);
+       offset = netlogon_dissect_struct_dom_sid(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_ChangeLogObject_object_sid,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_ChangeLogObject_valNETR_CHANGELOG_NAME_INCLUDED_object_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_ChangeLogObject_object_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_null_term_wstring(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_ChangeLogObject_valNETR_CHANGELOG_NAME_INCLUDED_object_name , 0);
+       offset = dissect_null_term_wstring(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_ChangeLogObject_object_name , 0);
 
        return offset;
 }
@@ -11011,11 +10985,11 @@ netlogon_dissect_netr_ChangeLogObject(tvbuff_t *tvb _U_, int offset _U_, packet_
 
        switch(level) {
                case NETR_CHANGELOG_SID_INCLUDED:
-                       offset = netlogon_dissect_element_netr_ChangeLogObject_valNETR_CHANGELOG_SID_INCLUDED_object_sid(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_ChangeLogObject_object_sid(tvb, offset, pinfo, tree, drep);
                break;
 
                case NETR_CHANGELOG_NAME_INCLUDED:
-                       offset = netlogon_dissect_element_netr_ChangeLogObject_valNETR_CHANGELOG_NAME_INCLUDED_object_name(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_ChangeLogObject_object_name(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -11815,9 +11789,9 @@ netlogon_dissect_struct_netr_DsRGetDCNameInfo(tvbuff_t *tvb _U_, int offset _U_,
 /* IDL: } */
 
 static int
-netlogon_dissect_element_netr_Capabilities_val1_server_capabilities(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_Capabilities_server_capabilities(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_bitmap_netr_NegotiateFlags(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_Capabilities_val1_server_capabilities, 0);
+       offset = netlogon_dissect_bitmap_netr_NegotiateFlags(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_Capabilities_server_capabilities, 0);
 
        return offset;
 }
@@ -11841,7 +11815,7 @@ netlogon_dissect_netr_Capabilities(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 
        switch(level) {
                case 1:
-                       offset = netlogon_dissect_element_netr_Capabilities_val1_server_capabilities(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_Capabilities_server_capabilities(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -12869,33 +12843,33 @@ netlogon_dissect_struct_netr_WorkstationInformation(tvbuff_t *tvb _U_, int offse
 /* IDL: } */
 
 static int
-netlogon_dissect_element_netr_WorkstationInfo_val1_workstation_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_WorkstationInfo_workstation_info(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, netlogon_dissect_element_netr_WorkstationInfo_val1_workstation_info_, NDR_POINTER_UNIQUE, "Pointer to Workstation Info (netr_WorkstationInformation)",hf_netlogon_netr_WorkstationInfo_val1_workstation_info);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_WorkstationInfo_workstation_info_, NDR_POINTER_UNIQUE, "Pointer to Workstation Info (netr_WorkstationInformation)",hf_netlogon_netr_WorkstationInfo_workstation_info);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_WorkstationInfo_val1_workstation_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_WorkstationInfo_workstation_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_WorkstationInformation(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_WorkstationInfo_val1_workstation_info,0);
+       offset = netlogon_dissect_struct_netr_WorkstationInformation(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_WorkstationInfo_workstation_info,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_WorkstationInfo_val2_lsa_policy_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_WorkstationInfo_lsa_policy_info(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, netlogon_dissect_element_netr_WorkstationInfo_val2_lsa_policy_info_, NDR_POINTER_UNIQUE, "Pointer to Lsa Policy Info (netr_WorkstationInformation)",hf_netlogon_netr_WorkstationInfo_val2_lsa_policy_info);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_WorkstationInfo_lsa_policy_info_, NDR_POINTER_UNIQUE, "Pointer to Lsa Policy Info (netr_WorkstationInformation)",hf_netlogon_netr_WorkstationInfo_lsa_policy_info);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_WorkstationInfo_val2_lsa_policy_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_WorkstationInfo_lsa_policy_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_WorkstationInformation(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_WorkstationInfo_val2_lsa_policy_info,0);
+       offset = netlogon_dissect_struct_netr_WorkstationInformation(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_WorkstationInfo_lsa_policy_info,0);
 
        return offset;
 }
@@ -12919,11 +12893,11 @@ netlogon_dissect_netr_WorkstationInfo(tvbuff_t *tvb _U_, int offset _U_, packet_
 
        switch(level) {
                case 1:
-                       offset = netlogon_dissect_element_netr_WorkstationInfo_val1_workstation_info(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_WorkstationInfo_workstation_info(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = netlogon_dissect_element_netr_WorkstationInfo_val2_lsa_policy_info(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_WorkstationInfo_lsa_policy_info(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -13559,33 +13533,33 @@ netlogon_dissect_struct_netr_DomainInformation(tvbuff_t *tvb _U_, int offset _U_
 /* IDL: } */
 
 static int
-netlogon_dissect_element_netr_DomainInfo_val1_domain_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DomainInfo_domain_info(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, netlogon_dissect_element_netr_DomainInfo_val1_domain_info_, NDR_POINTER_UNIQUE, "Pointer to Domain Info (netr_DomainInformation)",hf_netlogon_netr_DomainInfo_val1_domain_info);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DomainInfo_domain_info_, NDR_POINTER_UNIQUE, "Pointer to Domain Info (netr_DomainInformation)",hf_netlogon_netr_DomainInfo_domain_info);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DomainInfo_val1_domain_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DomainInfo_domain_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_DomainInformation(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DomainInfo_val1_domain_info,0);
+       offset = netlogon_dissect_struct_netr_DomainInformation(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DomainInfo_domain_info,0);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DomainInfo_val2_lsa_policy_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DomainInfo_lsa_policy_info(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, netlogon_dissect_element_netr_DomainInfo_val2_lsa_policy_info_, NDR_POINTER_UNIQUE, "Pointer to Lsa Policy Info (netr_LsaPolicyInformation)",hf_netlogon_netr_DomainInfo_val2_lsa_policy_info);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_netr_DomainInfo_lsa_policy_info_, NDR_POINTER_UNIQUE, "Pointer to Lsa Policy Info (netr_LsaPolicyInformation)",hf_netlogon_netr_DomainInfo_lsa_policy_info);
 
        return offset;
 }
 
 static int
-netlogon_dissect_element_netr_DomainInfo_val2_lsa_policy_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+netlogon_dissect_element_netr_DomainInfo_lsa_policy_info_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = netlogon_dissect_struct_netr_LsaPolicyInformation(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DomainInfo_val2_lsa_policy_info,0);
+       offset = netlogon_dissect_struct_netr_LsaPolicyInformation(tvb,offset,pinfo,tree,drep,hf_netlogon_netr_DomainInfo_lsa_policy_info,0);
 
        return offset;
 }
@@ -13609,11 +13583,11 @@ netlogon_dissect_netr_DomainInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
        switch(level) {
                case 1:
-                       offset = netlogon_dissect_element_netr_DomainInfo_val1_domain_info(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DomainInfo_domain_info(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = netlogon_dissect_element_netr_DomainInfo_val2_lsa_policy_info(tvb, offset, pinfo, tree, drep);
+                       offset = netlogon_dissect_element_netr_DomainInfo_lsa_policy_info(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -21152,6 +21126,8 @@ void proto_register_dcerpc_netlogon(void)
          { "Nt Length", "netlogon.netr_PasswordHistory.nt_length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DatabaseSync2_restart_state,
          { "Restart State", "netlogon.netr_DatabaseSync2.restart_state", FT_UINT1632, BASE_DEC, VALS(netlogon_SyncStateEnum_vals), 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_UNION_rename_user,
+         { "Rename User", "netlogon.netr_DELTA_UNION.rename_user", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_ACCOUNT_unknown4,
          { "Unknown4", "netlogon.netr_DELTA_ACCOUNT.unknown4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_ALIAS_unknown5,
@@ -21210,14 +21186,10 @@ void proto_register_dcerpc_netlogon(void)
          { "Mask", "netlogon.netr_DsRGetDCNameEx2.mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SamInfo6_dns_domainname,
          { "Dns Domainname", "netlogon.netr_SamInfo6.dns_domainname", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_ALIAS_MEMBER_rid,
-         { "Rid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_ALIAS_MEMBER.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DomainInformation_dns_hostname,
          { "Dns Hostname", "netlogon.netr_DomainInformation.dns_hostname", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetDCName_flags,
          { "Flags", "netlogon.netr_DsRGetDCName.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_DELETE_GROUP2_delete_group,
-         { "Delete Group", "netlogon.netr_DELTA_UNION_valNETR_DELTA_DELETE_GROUP2.delete_group", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetDCNameEx2_domain_name,
          { "Domain Name", "netlogon.netr_DsRGetDCNameEx2.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_TERMINAL,
@@ -21226,8 +21198,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Netlogon Guest", "netlogon.netr_UserFlags.NETLOGON_GUEST", FT_BOOLEAN, 32, TFS(&netr_UserFlags_NETLOGON_GUEST_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_netlogon_netr_DsR_DcFlags_DS_SERVER_CLOSEST,
          { "Ds Server Closest", "netlogon.netr_DsR_DcFlags.DS_SERVER_CLOSEST", FT_BOOLEAN, 32, TFS(&netr_DsR_DcFlags_DS_SERVER_CLOSEST_tfs), ( 0x00000080 ), NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DOMAIN_rid,
-         { "Rid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_DOMAIN.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_UasInfo_pw_must_change,
          { "Pw Must Change", "netlogon.netr_UasInfo.pw_must_change", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_TrustFlags_NETR_TRUST_FLAG_OUTBOUND,
@@ -21238,8 +21208,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Query", "netlogon.netr_LogonControl.query", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_TrustAttributes_NETR_TRUST_ATTRIBUTE_FOREST_TRANSITIVE,
          { "Netr Trust Attribute Forest Transitive", "netlogon.netr_TrustAttributes.NETR_TRUST_ATTRIBUTE_FOREST_TRANSITIVE", FT_BOOLEAN, 32, TFS(&netr_TrustAttributes_NETR_TRUST_ATTRIBUTE_FOREST_TRANSITIVE_tfs), ( 0x00000008 ), NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_GROUP_MEMBER_rid,
-         { "Rid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_GROUP_MEMBER.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonGetTrustRid_domain_name,
          { "Domain Name", "netlogon.netr_LogonGetTrustRid.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_ALIAS_unknown4,
@@ -21248,8 +21216,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Msv1 0 Allow Force Guest", "netlogon.netr_LogonParameterControl.MSV1_0_ALLOW_FORCE_GUEST", FT_BOOLEAN, 32, TFS(&netr_LogonParameterControl_MSV1_0_ALLOW_FORCE_GUEST_tfs), ( 0x00002000 ), NULL, HFILL }},
        { &hf_netlogon_netr_DatabaseSync_credential,
          { "Credential", "netlogon.netr_DatabaseSync.credential", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_ACCOUNT_account,
-         { "Account", "netlogon.netr_DELTA_UNION_valNETR_DELTA_ACCOUNT.account", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DomainInformation_dummy_long4,
          { "Dummy Long4", "netlogon.netr_DomainInformation.dummy_long4", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_CROSS_FOREST_TRUSTS,
@@ -21262,6 +21228,8 @@ void proto_register_dcerpc_netlogon(void)
          { "Supported Enc Types", "netlogon.netr_DomainInformation.supported_enc_types", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_POLICY_unknown2,
          { "Unknown2", "netlogon.netr_DELTA_POLICY.unknown2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_ChangeLogObject_object_sid,
+         { "Object Sid", "netlogon.netr_ChangeLogObject.object_sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SamInfo6_sids,
          { "Sids", "netlogon.netr_SamInfo6.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsR_DcFlags_DS_DNS_FOREST_ROOT,
@@ -21276,16 +21244,18 @@ void proto_register_dcerpc_netlogon(void)
          { "Ds Directory Service 6 Required", "netlogon.netr_DsRGetDCName_flags.DS_DIRECTORY_SERVICE_6_REQUIRED", FT_BOOLEAN, 32, TFS(&netr_DsRGetDCName_flags_DS_DIRECTORY_SERVICE_6_REQUIRED_tfs), ( 0x00080000 ), NULL, HFILL }},
        { &hf_netlogon_netr_LogonGetCapabilities_capabilities,
          { "Capabilities", "netlogon.netr_LogonGetCapabilities.capabilities", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_UNION_alias,
+         { "Alias", "netlogon.netr_DELTA_UNION.alias", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsrDeregisterDNSHostRecords_domain,
          { "Domain", "netlogon.netr_DsrDeregisterDNSHostRecords.domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DatabaseDeltas_delta_enum_array,
          { "Delta Enum Array", "netlogon.netr_DatabaseDeltas.delta_enum_array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_STORAGE_SERVER,
          { "Netr Ver Suite Storage Server", "netlogon.netr_SuiteMask.NETR_VER_SUITE_STORAGE_SERVER", FT_BOOLEAN, 16, TFS(&netr_SuiteMask_NETR_VER_SUITE_STORAGE_SERVER_tfs), ( 0x2000 ), NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_SECRET_secret,
-         { "Secret", "netlogon.netr_DELTA_UNION_valNETR_DELTA_SECRET.secret", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_USER_logon_hours,
          { "Logon Hours", "netlogon.netr_DELTA_USER.logon_hours", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_CONTROL_DATA_INFORMATION_user,
+         { "User", "netlogon.netr_CONTROL_DATA_INFORMATION.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ChangeLogEntry_flags,
          { "Flags", "netlogon.netr_ChangeLogEntry.flags", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetForestTrustInformation_trusted_domain_name,
@@ -21312,10 +21282,10 @@ void proto_register_dcerpc_netlogon(void)
          { "Status", "netlogon.NL_DNS_NAME_INFO.status", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonSamLogonWithFlags_flags,
          { "Flags", "netlogon.netr_LogonSamLogonWithFlags.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_Validation_sam3,
+         { "Sam3", "netlogon.netr_Validation.sam3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ChangeLogEntry_object,
          { "Object", "netlogon.netr_ChangeLogEntry.object", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_ALIAS_alias,
-         { "Alias", "netlogon.netr_DELTA_UNION_valNETR_DELTA_ALIAS.alias", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_UAS_INFO_0_timecreated,
          { "Timecreated", "netlogon.netr_UAS_INFO_0.timecreated", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SamBaseInfo_domain_sid,
@@ -21338,24 +21308,20 @@ void proto_register_dcerpc_netlogon(void)
          { "Unknown6", "netlogon.netr_DELTA_DOMAIN.unknown6", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_SECRET_unknown8,
          { "Unknown8", "netlogon.netr_DELTA_SECRET.unknown8", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_LogonLevel_valNetlogonInteractiveTransitiveInformation_password,
-         { "Password", "netlogon.netr_LogonLevel_valNetlogonInteractiveTransitiveInformation.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetForestTrustInformation_flags,
          { "Flags", "netlogon.netr_DsRGetForestTrustInformation.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonGetDomainInfo_credential,
          { "Credential", "netlogon.netr_LogonGetDomainInfo.credential", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_TRANSITIVE_TRUSTS,
          { "Netlogon Neg Transitive Trusts", "netlogon.netr_NegotiateFlags.NETLOGON_NEG_TRANSITIVE_TRUSTS", FT_BOOLEAN, 32, TFS(&netr_NegotiateFlags_NETLOGON_NEG_TRANSITIVE_TRUSTS_tfs), ( 0x00008000 ), NULL, HFILL }},
-       { &hf_netlogon_netr_ChangeLogObject_valNETR_CHANGELOG_SID_INCLUDED_object_sid,
-         { "Object Sid", "netlogon.netr_ChangeLogObject_valNETR_CHANGELOG_SID_INCLUDED.object_sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_UNION_trusted_domain,
+         { "Trusted Domain", "netlogon.netr_DELTA_UNION.trusted_domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerPasswordSet_return_authenticator,
          { "Return Authenticator", "netlogon.netr_ServerPasswordSet.return_authenticator", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_DOMAIN_min_password_length,
          { "Min Password Length", "netlogon.netr_DELTA_DOMAIN.min_password_length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_BACKOFFICE,
          { "Netr Ver Suite Backoffice", "netlogon.netr_SuiteMask.NETR_VER_SUITE_BACKOFFICE", FT_BOOLEAN, 16, TFS(&netr_SuiteMask_NETR_VER_SUITE_BACKOFFICE_tfs), ( 0x0004 ), NULL, HFILL }},
-       { &hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_VERIFY_domain,
-         { "Domain", "netlogon.netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_VERIFY.domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_Credential_data,
          { "Data", "netlogon.netr_Credential.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerPasswordGet_return_authenticator,
@@ -21374,14 +21340,14 @@ void proto_register_dcerpc_netlogon(void)
          { "Sitename", "netlogon.netr_DsRAddressToSitenamesExWCtr.sitename", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_UserFlags_NETLOGON_SERVER_TRUST_ACCOUNT,
          { "Netlogon Server Trust Account", "netlogon.netr_UserFlags.NETLOGON_SERVER_TRUST_ACCOUNT", FT_BOOLEAN, 32, TFS(&netr_UserFlags_NETLOGON_SERVER_TRUST_ACCOUNT_tfs), ( 0x00000080 ), NULL, HFILL }},
+       { &hf_netlogon_netr_LogonLevel_generic,
+         { "Generic", "netlogon.netr_LogonLevel.generic", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsR_DcFlags_DS_SERVER_WEBSERV,
          { "Ds Server Webserv", "netlogon.netr_DsR_DcFlags.DS_SERVER_WEBSERV", FT_BOOLEAN, 32, TFS(&netr_DsR_DcFlags_DS_SERVER_WEBSERV_tfs), ( 0x00002000 ), NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetForestTrustInformation_server_name,
          { "Server Name", "netlogon.netr_DsRGetForestTrustInformation.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerTrustPasswordsGet_return_authenticator,
          { "Return Authenticator", "netlogon.netr_ServerTrustPasswordsGet.return_authenticator", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_GROUP_group,
-         { "Group", "netlogon.netr_DELTA_UNION_valNETR_DELTA_GROUP.group", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerTrustPasswordsGet_password,
          { "Password", "netlogon.netr_ServerTrustPasswordsGet.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_USER_KEY16_length,
@@ -21418,6 +21384,8 @@ void proto_register_dcerpc_netlogon(void)
          { "Ds Server Ldap", "netlogon.netr_DsR_DcFlags.DS_SERVER_LDAP", FT_BOOLEAN, 32, TFS(&netr_DsR_DcFlags_DS_SERVER_LDAP_tfs), ( 0x00000008 ), NULL, HFILL }},
        { &hf_netlogon_netr_GenericInfo_package_name,
          { "Package Name", "netlogon.netr_GenericInfo.package_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_UNION_policy,
+         { "Policy", "netlogon.netr_DELTA_UNION.policy", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_RENAME_unknown7,
          { "Unknown7", "netlogon.netr_DELTA_RENAME.unknown7", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_Authenticator_cred,
@@ -21448,16 +21416,18 @@ void proto_register_dcerpc_netlogon(void)
          { "Unknown8", "netlogon.netr_DELTA_DOMAIN.unknown8", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonControl_logon_server,
          { "Logon Server", "netlogon.netr_LogonControl.logon_server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_UNION_delete_user,
+         { "Delete User", "netlogon.netr_DELTA_UNION.delete_user", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonControl2_logon_server,
          { "Logon Server", "netlogon.netr_LogonControl2.logon_server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_POLICY_unknown7,
          { "Unknown7", "netlogon.netr_DELTA_POLICY.unknown7", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonSamLogonEx_validation_level,
          { "Validation Level", "netlogon.netr_LogonSamLogonEx.validation_level", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_Validation_valNetlogonValidationSamInfo4_sam6,
-         { "Sam6", "netlogon.netr_Validation_valNetlogonValidationSamInfo4.sam6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_UasLogoffInfo_duration,
          { "Duration", "netlogon.netr_UasLogoffInfo.duration", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_LogonLevel_network,
+         { "Network", "netlogon.netr_LogonLevel.network", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_IdentityInfo_parameter_control,
          { "Parameter Control", "netlogon.netr_IdentityInfo.parameter_control", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_AccountSync_reference,
@@ -21470,8 +21440,12 @@ void proto_register_dcerpc_netlogon(void)
          { "Function Code", "netlogon.netr_LogonControl2Ex.function_code", FT_UINT32, BASE_DEC, VALS(netlogon_netr_LogonControlCode_vals), 0, NULL, HFILL }},
        { &hf_netlogon_netr_AccountSync_next_reference,
          { "Next Reference", "netlogon.netr_AccountSync.next_reference", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_Validation_sam2,
+         { "Sam2", "netlogon.netr_Validation.sam2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerAuthenticate3_server_name,
          { "Server Name", "netlogon.netr_ServerAuthenticate3.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_ID_UNION_rid,
+         { "Rid", "netlogon.netr_DELTA_ID_UNION.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerReqChallenge_computer_name,
          { "Computer Name", "netlogon.netr_ServerReqChallenge.computer_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonSamLogonWithFlags_authoritative,
@@ -21486,16 +21460,12 @@ void proto_register_dcerpc_netlogon(void)
          { "Sid", "netlogon.netr_DomainTrust.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetDCNameEx2_client_account,
          { "Client Account", "netlogon.netr_DsRGetDCNameEx2.client_account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_ChangeLogObject_valNETR_CHANGELOG_NAME_INCLUDED_object_name,
-         { "Object Name", "netlogon.netr_ChangeLogObject_valNETR_CHANGELOG_NAME_INCLUDED.object_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetDCNameEx_domain_name,
          { "Domain Name", "netlogon.netr_DsRGetDCNameEx.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_TrustFlags_NETR_TRUST_FLAG_NATIVE,
          { "Netr Trust Flag Native", "netlogon.netr_TrustFlags.NETR_TRUST_FLAG_NATIVE", FT_BOOLEAN, 32, TFS(&netr_TrustFlags_NETR_TRUST_FLAG_NATIVE_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_netlogon_netr_ServerAuthenticate2_secure_channel_type,
          { "Secure Channel Type", "netlogon.netr_ServerAuthenticate2.secure_channel_type", FT_UINT1632, BASE_DEC, VALS(netlogon_netr_SchannelType_vals), 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_MODIFY_COUNT_modified_count,
-         { "Modified Count", "netlogon.netr_DELTA_UNION_valNETR_DELTA_MODIFY_COUNT.modified_count", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_DOMAIN_sdbuf,
          { "Sdbuf", "netlogon.netr_DELTA_DOMAIN.sdbuf", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_USER_sdbuf,
@@ -21504,12 +21474,14 @@ void proto_register_dcerpc_netlogon(void)
          { "Dummy Long3", "netlogon.netr_DomainInformation.dummy_long3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_DOMAIN_min_password_age,
          { "Min Password Age", "netlogon.netr_DELTA_DOMAIN.min_password_age", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_Validation_generic,
+         { "Generic", "netlogon.netr_Validation.generic", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_opnum,
          { "Operation", "netlogon.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_CONTROL_DATA_INFORMATION_domain,
+         { "Domain", "netlogon.netr_CONTROL_DATA_INFORMATION.domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_EMBEDDEDNT,
          { "Netr Ver Suite Embeddednt", "netlogon.netr_SuiteMask.NETR_VER_SUITE_EMBEDDEDNT", FT_BOOLEAN, 16, TFS(&netr_SuiteMask_NETR_VER_SUITE_EMBEDDEDNT_tfs), ( 0x0040 ), NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ACCOUNT_sid,
-         { "Sid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ACCOUNT.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_SECRET_sdbuf,
          { "Sdbuf", "netlogon.netr_DELTA_SECRET.sdbuf", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_ALIAS_MEMBER_unknown2,
@@ -21522,8 +21494,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Names", "netlogon.NL_DNS_NAME_INFO_ARRAY.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DomainTrust_dns_name,
          { "Dns Name", "netlogon.netr_DomainTrust.dns_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_ACCOUNT_sid,
-         { "Sid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_ACCOUNT.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_ALIAS_MEMBER_sids,
          { "Sids", "netlogon.netr_DELTA_ALIAS_MEMBER.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerAuthenticate_server_name,
@@ -21540,6 +21510,8 @@ void proto_register_dcerpc_netlogon(void)
          { "Serial Number1", "netlogon.netr_ChangeLogEntry.serial_number1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_InfoFlags_NETLOGON_REPLICATION_NEEDED,
          { "Netlogon Replication Needed", "netlogon.netr_InfoFlags.NETLOGON_REPLICATION_NEEDED", FT_BOOLEAN, 32, TFS(&netr_InfoFlags_NETLOGON_REPLICATION_NEEDED_tfs), ( 0x00000001 ), NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_ID_UNION_sid,
+         { "Sid", "netlogon.netr_DELTA_ID_UNION.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DomainInformation_dummy_string3,
          { "Dummy String3", "netlogon.netr_DomainInformation.dummy_string3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_NetworkInfo_identity_info,
@@ -21550,10 +21522,10 @@ void proto_register_dcerpc_netlogon(void)
          { "Privilege Attrib", "netlogon.netr_DELTA_ACCOUNT.privilege_attrib", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_DOMAIN_account_lockout,
          { "Account Lockout", "netlogon.netr_DELTA_DOMAIN.account_lockout", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_PacInfo_user_session_key,
-         { "User Session Key", "netlogon.netr_PacInfo.user_session_key", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SamBaseInfo_last_password_change,
          { "Last Password Change", "netlogon.netr_SamBaseInfo.last_password_change", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_PacInfo_user_session_key,
+         { "User Session Key", "netlogon.netr_PacInfo.user_session_key", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonControl2Ex_level,
          { "Level", "netlogon.netr_LogonControl2Ex.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DatabaseRedo_logon_server,
@@ -21574,8 +21546,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Auth Size", "netlogon.netr_PacInfo.auth_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_AccountDeltas_total_entries,
          { "Total Entries", "netlogon.netr_AccountDeltas.total_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_ALIAS_rid,
-         { "Rid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_ALIAS.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_USER_country_code,
          { "Country Code", "netlogon.netr_DELTA_USER.country_code", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetDCNameEx_flags,
@@ -21584,8 +21554,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Site Name", "netlogon.netr_DsRGetDCNameEx.site_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_GROUP_attributes,
          { "Attributes", "netlogon.netr_DELTA_GROUP.attributes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_GROUP_rid,
-         { "Rid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_GROUP.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonSamLogonEx_validation,
          { "Validation", "netlogon.netr_LogonSamLogonEx.validation", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SamBaseInfo_user_flags,
@@ -21614,14 +21582,14 @@ void proto_register_dcerpc_netlogon(void)
          { "Old Owf Password", "netlogon.netr_ServerGetTrustInfo.old_owf_password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DomainTrustList_array,
          { "Array", "netlogon.netr_DomainTrustList.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_FIND_USER_user,
-         { "User", "netlogon.netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_FIND_USER.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_NETLOGON_INFO_1_flags,
          { "Flags", "netlogon.netr_NETLOGON_INFO_1.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonGetDomainInfo_info,
          { "Info", "netlogon.netr_LogonGetDomainInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_TrustInfo_data,
          { "Data", "netlogon.netr_TrustInfo.data", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DomainInfo_lsa_policy_info,
+         { "Lsa Policy Info", "netlogon.netr_DomainInfo.lsa_policy_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SamBaseInfo_kickoff_time,
          { "Kickoff Time", "netlogon.netr_SamBaseInfo.kickoff_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsrUpdateReadOnlyServerDnsRecords_dns_ttl,
@@ -21644,8 +21612,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Sequence Num", "netlogon.netr_DELTA_DOMAIN.sequence_num", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SamBaseInfo_acct_flags,
          { "Acct Flags", "netlogon.netr_SamBaseInfo.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_TRUST_sid,
-         { "Sid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_TRUST.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_NETLOGON_INFO_3_unknown2,
          { "Unknown2", "netlogon.netr_NETLOGON_INFO_3.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DomainInformation_dummy_string2,
@@ -21674,30 +21640,22 @@ void proto_register_dcerpc_netlogon(void)
          { "Dns Domain Info Type", "netlogon.NL_DNS_NAME_INFO.dns_domain_info_type", FT_UINT1632, BASE_DEC, VALS(netlogon_netr_DnsDomainInfoType_vals), 0, NULL, HFILL }},
        { &hf_netlogon_netr_CIPHER_VALUE_cipher_data,
          { "Cipher Data", "netlogon.netr_CIPHER_VALUE.cipher_data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_Validation_val4_pac,
-         { "Pac", "netlogon.netr_Validation_val4.pac", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SamBaseInfo_logon_server,
          { "Logon Server", "netlogon.netr_SamBaseInfo.logon_server", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_CONTROL_QUERY_INFORMATION_val1_info1,
-         { "Info1", "netlogon.netr_CONTROL_QUERY_INFORMATION_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerGetTrustInfo_server_name,
          { "Server Name", "netlogon.netr_ServerGetTrustInfo.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_POLICY_auditingmode,
          { "Auditingmode", "netlogon.netr_DELTA_POLICY.auditingmode", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TRANSPORT_NOTIFY_domain,
-         { "Domain", "netlogon.netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TRANSPORT_NOTIFY.domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerPasswordSet_new_password,
          { "New Password", "netlogon.netr_ServerPasswordSet.new_password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_ALIAS_MEMBER_alias_member,
-         { "Alias Member", "netlogon.netr_DELTA_UNION_valNETR_DELTA_ALIAS_MEMBER.alias_member", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonParameterControl_MSV1_0_DONT_TRY_GUEST_ACCOUNT,
          { "Msv1 0 Dont Try Guest Account", "netlogon.netr_LogonParameterControl.MSV1_0_DONT_TRY_GUEST_ACCOUNT", FT_BOOLEAN, 32, TFS(&netr_LogonParameterControl_MSV1_0_DONT_TRY_GUEST_ACCOUNT_tfs), ( 0x00000010 ), NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_USER_user,
-         { "User", "netlogon.netr_DELTA_UNION_valNETR_DELTA_USER.user", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_TrustAttributes_NETR_TRUST_ATTRIBUTE_CROSS_ORGANIZATION,
          { "Netr Trust Attribute Cross Organization", "netlogon.netr_TrustAttributes.NETR_TRUST_ATTRIBUTE_CROSS_ORGANIZATION", FT_BOOLEAN, 32, TFS(&netr_TrustAttributes_NETR_TRUST_ATTRIBUTE_CROSS_ORGANIZATION_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_netlogon_netr_AccountSync_computername,
          { "Computername", "netlogon.netr_AccountSync.computername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_Validation_pac,
+         { "Pac", "netlogon.netr_Validation.pac", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetDCName_flags_DS_IS_DNS_NAME,
          { "Ds Is Dns Name", "netlogon.netr_DsRGetDCName_flags.DS_IS_DNS_NAME", FT_BOOLEAN, 32, TFS(&netr_DsRGetDCName_flags_DS_IS_DNS_NAME_tfs), ( 0x00020000 ), NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_TRUSTED_DOMAIN_unknown2,
@@ -21712,8 +21670,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Ds Good Timeserv Preferred", "netlogon.netr_DsRGetDCName_flags.DS_GOOD_TIMESERV_PREFERRED", FT_BOOLEAN, 32, TFS(&netr_DsRGetDCName_flags_DS_GOOD_TIMESERV_PREFERRED_tfs), ( 0x00002000 ), NULL, HFILL }},
        { &hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_AVOID_ACCOUNT_DB_REPL,
          { "Netlogon Neg Avoid Account Db Repl", "netlogon.netr_NegotiateFlags.NETLOGON_NEG_AVOID_ACCOUNT_DB_REPL", FT_BOOLEAN, 32, TFS(&netr_NegotiateFlags_NETLOGON_NEG_AVOID_ACCOUNT_DB_REPL_tfs), ( 0x00001000 ), NULL, HFILL }},
-       { &hf_netlogon_netr_LogonLevel_valNetlogonInteractiveInformation_password,
-         { "Password", "netlogon.netr_LogonLevel_valNetlogonInteractiveInformation.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_SUPPORTS_AES_SHA2,
          { "Netlogon Neg Supports Aes Sha2", "netlogon.netr_NegotiateFlags.NETLOGON_NEG_SUPPORTS_AES_SHA2", FT_BOOLEAN, 32, TFS(&netr_NegotiateFlags_NETLOGON_NEG_SUPPORTS_AES_SHA2_tfs), ( 0x00400000 ), NULL, HFILL }},
        { &hf_netlogon_netr_UserFlags_NETLOGON_SUBAUTH_SESSION_KEY,
@@ -21730,6 +21686,8 @@ void proto_register_dcerpc_netlogon(void)
          { "Logoff Time", "netlogon.netr_UasInfo.logoff_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_PacInfo_unknown3,
          { "Unknown3", "netlogon.netr_PacInfo.unknown3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_UNION_user,
+         { "User", "netlogon.netr_DELTA_UNION.user", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DomainInformation_lsa_policy,
          { "Lsa Policy", "netlogon.netr_DomainInformation.lsa_policy", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonSamLogonWithFlags_logon_level,
@@ -21754,8 +21712,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Ds Server Pdc", "netlogon.netr_DsR_DcFlags.DS_SERVER_PDC", FT_BOOLEAN, 32, TFS(&netr_DsR_DcFlags_DS_SERVER_PDC_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_netlogon_netr_NETLOGON_INFO_2_trusted_dc_name,
          { "Trusted Dc Name", "netlogon.netr_NETLOGON_INFO_2.trusted_dc_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_USER_rid,
-         { "Rid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_USER.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonSamLogonEx_logon_level,
          { "Logon Level", "netlogon.netr_LogonSamLogonEx.logon_level", FT_UINT1632, BASE_DEC, VALS(netlogon_netr_LogonInfoClass_vals), 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetDCNameEx2_flags,
@@ -21810,16 +21766,12 @@ void proto_register_dcerpc_netlogon(void)
          { "Logon Count", "netlogon.netr_UasLogoffInfo.logon_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonControl2Ex_logon_server,
          { "Logon Server", "netlogon.netr_LogonControl2Ex.logon_server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_DELETE_USER2_delete_user,
-         { "Delete User", "netlogon.netr_DELTA_UNION_valNETR_DELTA_DELETE_USER2.delete_user", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_NL_DNS_NAME_INFO_priority,
          { "Priority", "netlogon.NL_DNS_NAME_INFO.priority", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_AUTHENTICATED_RPC_LSASS,
          { "Netlogon Neg Authenticated Rpc Lsass", "netlogon.netr_NegotiateFlags.NETLOGON_NEG_AUTHENTICATED_RPC_LSASS", FT_BOOLEAN, 32, TFS(&netr_NegotiateFlags_NETLOGON_NEG_AUTHENTICATED_RPC_LSASS_tfs), ( 0x20000000 ), NULL, HFILL }},
        { &hf_netlogon_netr_DatabaseSync_database_id,
          { "Database Id", "netlogon.netr_DatabaseSync.database_id", FT_UINT1632, BASE_DEC, VALS(netlogon_netr_SamDatabaseID_vals), 0, NULL, HFILL }},
-       { &hf_netlogon_netr_Validation_valNetlogonValidationSamInfo_sam2,
-         { "Sam2", "netlogon.netr_Validation_valNetlogonValidationSamInfo.sam2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_USER_rid,
          { "Rid", "netlogon.netr_DELTA_USER.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_SECRET_unknown6,
@@ -21834,8 +21786,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Unknown3", "netlogon.netr_DELTA_SECRET.unknown3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonGetTrustRid_server_name,
          { "Server Name", "netlogon.netr_LogonGetTrustRid.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_ALIAS_rid,
-         { "Rid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_ALIAS.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_GROUP_group_name,
          { "Group Name", "netlogon.netr_DELTA_GROUP.group_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerPasswordGet_computer_name,
@@ -21846,10 +21796,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Logon", "netlogon.netr_LogonSamLogonEx.logon", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetDCNameInfo_forest_name,
          { "Forest Name", "netlogon.netr_DsRGetDCNameInfo.forest_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_REDISCOVER_domain,
-         { "Domain", "netlogon.netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_REDISCOVER.domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_SECRET_name,
-         { "Name", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_SECRET.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_WorkstationInformation_sitename,
          { "Sitename", "netlogon.netr_WorkstationInformation.sitename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_UserFlags_NETLOGON_RESOURCE_GROUPS,
@@ -21864,10 +21810,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Ds Ip Required", "netlogon.netr_DsRGetDCName_flags.DS_IP_REQUIRED", FT_BOOLEAN, 32, TFS(&netr_DsRGetDCName_flags_DS_IP_REQUIRED_tfs), ( 0x00000200 ), NULL, HFILL }},
        { &hf_netlogon_netr_SamBaseInfo_rid,
          { "Rid", "netlogon.netr_SamBaseInfo.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_Validation_valNetlogonValidationGenericInfo2_generic,
-         { "Generic", "netlogon.netr_Validation_valNetlogonValidationGenericInfo2.generic", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_QUERY_domain,
-         { "Domain", "netlogon.netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_TC_QUERY.domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_trust_extension_container_length,
          { "Length", "netlogon.netr_trust_extension_container.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_ACCOUNT_system_flags,
@@ -21878,8 +21820,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Logon Server", "netlogon.netr_PacInfo.logon_server", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerAuthenticate2_computer_name,
          { "Computer Name", "netlogon.netr_ServerAuthenticate2.computer_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_Capabilities_val1_server_capabilities,
-         { "Server Capabilities", "netlogon.netr_Capabilities_val1.server_capabilities", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_RENAME_NewName,
          { "Newname", "netlogon.netr_DELTA_RENAME.NewName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonUasLogoff_workstation,
@@ -21938,12 +21878,10 @@ void proto_register_dcerpc_netlogon(void)
          { "Logon Server", "netlogon.netr_GetDcName.logon_server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_AccountSync_total_entries,
          { "Total Entries", "netlogon.netr_AccountSync.total_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_CHANGE_PASSWORD_domain,
-         { "Domain", "netlogon.netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_CHANGE_PASSWORD.domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_GROUP_MEMBER_attribs,
-         { "Attribs", "netlogon.netr_DELTA_GROUP_MEMBER.attribs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_USER_account_name,
          { "Account Name", "netlogon.netr_DELTA_USER.account_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_GROUP_MEMBER_attribs,
+         { "Attribs", "netlogon.netr_DELTA_GROUP_MEMBER.attribs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_TRUSTED_DOMAIN_unknown4,
          { "Unknown4", "netlogon.netr_DELTA_TRUSTED_DOMAIN.unknown4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_RENAME_unknown4,
@@ -21954,34 +21892,32 @@ void proto_register_dcerpc_netlogon(void)
          { "Logon Attempts", "netlogon.netr_NETLOGON_INFO_3.logon_attempts", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_USER_home_directory,
          { "Home Directory", "netlogon.netr_DELTA_USER.home_directory", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_POLICY_policy,
-         { "Policy", "netlogon.netr_DELTA_UNION_valNETR_DELTA_POLICY.policy", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_PasswordInfo_identity_info,
          { "Identity Info", "netlogon.netr_PasswordInfo.identity_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DomainInfo_val1_domain_info,
-         { "Domain Info", "netlogon.netr_DomainInfo_val1.domain_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonGetCapabilities_query_level,
          { "Query Level", "netlogon.netr_LogonGetCapabilities.query_level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_RENAME_unknown5,
          { "Unknown5", "netlogon.netr_DELTA_RENAME.unknown5", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerPasswordGet_account_name,
          { "Account Name", "netlogon.netr_ServerPasswordGet.account_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_UNION_rename_group,
+         { "Rename Group", "netlogon.netr_DELTA_UNION.rename_group", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_GROUP_unknown2,
          { "Unknown2", "netlogon.netr_DELTA_GROUP.unknown2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_LogonLevel_password,
+         { "Password", "netlogon.netr_LogonLevel.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_ENUM_ARRAY_num_deltas,
          { "Num Deltas", "netlogon.netr_DELTA_ENUM_ARRAY.num_deltas", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_PacInfo_unknown2,
          { "Unknown2", "netlogon.netr_PacInfo.unknown2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_WorkstationFlags_NETR_WS_FLAG_HANDLES_INBOUND_TRUSTS,
          { "Netr Ws Flag Handles Inbound Trusts", "netlogon.netr_WorkstationFlags.NETR_WS_FLAG_HANDLES_INBOUND_TRUSTS", FT_BOOLEAN, 32, TFS(&netr_WorkstationFlags_NETR_WS_FLAG_HANDLES_INBOUND_TRUSTS_tfs), ( 0x00000001 ), NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ALIAS_rid,
-         { "Rid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_ALIAS.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_UNION_modified_count,
+         { "Modified Count", "netlogon.netr_DELTA_UNION.modified_count", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerPasswordSet2_credential,
          { "Credential", "netlogon.netr_ServerPasswordSet2.credential", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_AcctLockStr_lockout_duration,
          { "Lockout Duration", "netlogon.netr_AcctLockStr.lockout_duration", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_USER_rid,
-         { "Rid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_USER.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRAddressToSitenamesW_ctr,
          { "Ctr", "netlogon.netr_DsRAddressToSitenamesW.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetDCNameInfo_domain_guid,
@@ -21990,16 +21926,12 @@ void proto_register_dcerpc_netlogon(void)
          { "Server Name", "netlogon.netr_ServerPasswordSet.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonSamLogon_logon,
          { "Logon", "netlogon.netr_LogonSamLogon.logon", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_GROUP_rid,
-         { "Rid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_GROUP.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_UNION_rename_alias,
+         { "Rename Alias", "netlogon.netr_DELTA_UNION.rename_alias", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_POLICY_unknown1,
          { "Unknown1", "netlogon.netr_DELTA_POLICY.unknown1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_STRONG_KEYS,
          { "Netlogon Neg Strong Keys", "netlogon.netr_NegotiateFlags.NETLOGON_NEG_STRONG_KEYS", FT_BOOLEAN, 32, TFS(&netr_NegotiateFlags_NETLOGON_NEG_STRONG_KEYS_tfs), ( 0x00004000 ), NULL, HFILL }},
-       { &hf_netlogon_netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_SET_DBFLAG_debug_level,
-         { "Debug Level", "netlogon.netr_CONTROL_DATA_INFORMATION_valNETLOGON_CONTROL_SET_DBFLAG.debug_level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DomainInfo_val2_lsa_policy_info,
-         { "Lsa Policy Info", "netlogon.netr_DomainInfo_val2.lsa_policy_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_NETLOGON_INFO_2_tc_connection_status,
          { "Tc Connection Status", "netlogon.netr_NETLOGON_INFO_2.tc_connection_status", FT_UINT32, BASE_DEC, VALS(WERR_errors), 0, NULL, HFILL }},
        { &hf_netlogon_netr_DomainInformation_workstation_flags,
@@ -22080,10 +22012,10 @@ void proto_register_dcerpc_netlogon(void)
          { "Site Name", "netlogon.netr_DsrUpdateReadOnlyServerDnsRecords.site_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SamBaseInfo_full_name,
          { "Full Name", "netlogon.netr_SamBaseInfo.full_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_SECRET_name,
-         { "Name", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_SECRET.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerAuthenticate3_return_credentials,
          { "Return Credentials", "netlogon.netr_ServerAuthenticate3.return_credentials", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_CONTROL_DATA_INFORMATION_debug_level,
+         { "Debug Level", "netlogon.netr_CONTROL_DATA_INFORMATION.debug_level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonControl2_function_code,
          { "Function Code", "netlogon.netr_LogonControl2.function_code", FT_UINT32, BASE_DEC, VALS(netlogon_netr_LogonControlCode_vals), 0, NULL, HFILL }},
        { &hf_netlogon_NL_DNS_NAME_INFO_dns_register,
@@ -22116,8 +22048,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Logon Level", "netlogon.netr_LogonSamLogoff.logon_level", FT_UINT1632, BASE_DEC, VALS(netlogon_netr_LogonInfoClass_vals), 0, NULL, HFILL }},
        { &hf_netlogon_netr_OsVersion_os,
          { "Os", "netlogon.netr_OsVersion.os", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_GROUP_MEMBER_group_member,
-         { "Group Member", "netlogon.netr_DELTA_UNION_valNETR_DELTA_GROUP_MEMBER.group_member", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SupportedEncTypes_ENC_RSA_MD5,
          { "Enc Rsa Md5", "netlogon.netr_SupportedEncTypes.ENC_RSA_MD5", FT_BOOLEAN, 32, TFS(&netr_SupportedEncTypes_ENC_RSA_MD5_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetDCNameInfo_dc_address_type,
@@ -22126,8 +22056,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Num Sites", "netlogon.DcSitesCtr.num_sites", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_USER_parameters,
          { "Parameters", "netlogon.netr_DELTA_USER.parameters", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_DOMAIN_domain,
-         { "Domain", "netlogon.netr_DELTA_UNION_valNETR_DELTA_DOMAIN.domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_AccountDeltas_buffersize,
          { "Buffersize", "netlogon.netr_AccountDeltas.buffersize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DomainTrust_trust_flags,
@@ -22140,6 +22068,8 @@ void proto_register_dcerpc_netlogon(void)
          { "Computername", "netlogon.netr_DatabaseSync.computername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_NL_PASSWORD_VERSION_ReservedField,
          { "Reservedfield", "netlogon.NL_PASSWORD_VERSION.ReservedField", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_Validation_sam6,
+         { "Sam6", "netlogon.netr_Validation.sam6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_ACCOUNT_unknown1,
          { "Unknown1", "netlogon.netr_DELTA_ACCOUNT.unknown1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerPasswordSet_credential,
@@ -22186,6 +22116,8 @@ void proto_register_dcerpc_netlogon(void)
          { "Query", "netlogon.netr_LogonControl2.query", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SamBaseInfo_force_password_change,
          { "Force Password Change", "netlogon.netr_SamBaseInfo.force_password_change", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DomainInfo_domain_info,
+         { "Domain Info", "netlogon.netr_DomainInfo.domain_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DatabaseSync_delta_enum_array,
          { "Delta Enum Array", "netlogon.netr_DatabaseSync.delta_enum_array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SamBaseInfo_home_drive,
@@ -22206,6 +22138,8 @@ void proto_register_dcerpc_netlogon(void)
          { "Script Path", "netlogon.netr_UasInfo.script_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_QUOTA_LIMITS_minimumworkingsetsize,
          { "Minimumworkingsetsize", "netlogon.netr_QUOTA_LIMITS.minimumworkingsetsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_CONTROL_QUERY_INFORMATION_info3,
+         { "Info3", "netlogon.netr_CONTROL_QUERY_INFORMATION.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerAuthenticate2_negotiate_flags,
          { "Negotiate Flags", "netlogon.netr_ServerAuthenticate2.negotiate_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_GenericInfo_data,
@@ -22218,16 +22152,20 @@ void proto_register_dcerpc_netlogon(void)
          { "Dummy", "netlogon.netr_AcctLockStr.dummy", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_ACCOUNT_unknown7,
          { "Unknown7", "netlogon.netr_DELTA_ACCOUNT.unknown7", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_CONTROL_QUERY_INFORMATION_info4,
+         { "Info4", "netlogon.netr_CONTROL_QUERY_INFORMATION.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonSamLogon_validation_level,
          { "Validation Level", "netlogon.netr_LogonSamLogon.validation_level", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_UNION_group,
+         { "Group", "netlogon.netr_DELTA_UNION.group", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_PERSISTENT_SAMREPL,
          { "Netlogon Neg Persistent Samrepl", "netlogon.netr_NegotiateFlags.NETLOGON_NEG_PERSISTENT_SAMREPL", FT_BOOLEAN, 32, TFS(&netr_NegotiateFlags_NETLOGON_NEG_PERSISTENT_SAMREPL_tfs), ( 0x00000002 ), NULL, HFILL }},
-       { &hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_ENTERPRISE,
-         { "Netr Ver Suite Enterprise", "netlogon.netr_SuiteMask.NETR_VER_SUITE_ENTERPRISE", FT_BOOLEAN, 16, TFS(&netr_SuiteMask_NETR_VER_SUITE_ENTERPRISE_tfs), ( 0x0002 ), NULL, HFILL }},
        { &hf_netlogon_netr_PacInfo_pac,
          { "Pac", "netlogon.netr_PacInfo.pac", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_ENUM_delta_id_union,
          { "Delta Id Union", "netlogon.netr_DELTA_ENUM.delta_id_union", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_ENTERPRISE,
+         { "Netr Ver Suite Enterprise", "netlogon.netr_SuiteMask.NETR_VER_SUITE_ENTERPRISE", FT_BOOLEAN, 16, TFS(&netr_SuiteMask_NETR_VER_SUITE_ENTERPRISE_tfs), ( 0x0002 ), NULL, HFILL }},
        { &hf_netlogon_netr_ProductType_NETR_VER_NT_WORKSTATION,
          { "Netr Ver Nt Workstation", "netlogon.netr_ProductType.NETR_VER_NT_WORKSTATION", FT_BOOLEAN, 8, TFS(&netr_ProductType_NETR_VER_NT_WORKSTATION_tfs), ( 0x01 ), NULL, HFILL }},
        { &hf_netlogon_netr_AccountSync_credential,
@@ -22258,8 +22196,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Sdbuf", "netlogon.netr_DELTA_ACCOUNT.sdbuf", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonParameterControl_MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT,
          { "Msv1 0 Allow Server Trust Account", "netlogon.netr_LogonParameterControl.MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT", FT_BOOLEAN, 32, TFS(&netr_LogonParameterControl_MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT_tfs), ( 0x00000020 ), NULL, HFILL }},
-       { &hf_netlogon_netr_CONTROL_QUERY_INFORMATION_val2_info2,
-         { "Info2", "netlogon.netr_CONTROL_QUERY_INFORMATION_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DatabaseDeltas_computername,
          { "Computername", "netlogon.netr_DatabaseDeltas.computername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonSamLogoff_computer_name,
@@ -22280,8 +22216,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Osversioninfosize", "netlogon.netr_OsVersionInfoEx.OSVersionInfoSize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerPasswordSet_computer_name,
          { "Computer Name", "netlogon.netr_ServerPasswordSet.computer_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_LogonLevel_valNetlogonNetworkTransitiveInformation_network,
-         { "Network", "netlogon.netr_LogonLevel_valNetlogonNetworkTransitiveInformation.network", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerAuthenticate2_account_name,
          { "Account Name", "netlogon.netr_ServerAuthenticate2.account_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetDCNameEx2_info,
@@ -22330,8 +22264,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Object Rid", "netlogon.netr_ChangeLogEntry.object_rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SamBaseInfo_last_successful_logon,
          { "Last Successful Logon", "netlogon.netr_SamBaseInfo.last_successful_logon", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_LogonLevel_valNetlogonServiceInformation_password,
-         { "Password", "netlogon.netr_LogonLevel_valNetlogonServiceInformation.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonParameterControl_MSV1_0_RETURN_PASSWORD_EXPIRY,
          { "Msv1 0 Return Password Expiry", "netlogon.netr_LogonParameterControl.MSV1_0_RETURN_PASSWORD_EXPIRY", FT_BOOLEAN, 32, TFS(&netr_LogonParameterControl_MSV1_0_RETURN_PASSWORD_EXPIRY_tfs), ( 0x00000040 ), NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_POLICY_sdbuf,
@@ -22370,8 +22302,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Msv1 0 Disable Personal Fallback", "netlogon.netr_LogonParameterControl.MSV1_0_DISABLE_PERSONAL_FALLBACK", FT_BOOLEAN, 32, TFS(&netr_LogonParameterControl_MSV1_0_DISABLE_PERSONAL_FALLBACK_tfs), ( 0x00001000 ), NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_ACCOUNT_unknown8,
          { "Unknown8", "netlogon.netr_DELTA_ACCOUNT.unknown8", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_GROUP2_rid,
-         { "Rid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_GROUP2.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsrEnumerateDomainTrusts_trusts,
          { "Trusts", "netlogon.netr_DsrEnumerateDomainTrusts.trusts", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_USER_KEYS2_history,
@@ -22398,8 +22328,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Msv1 0 Check Logonhours For S4u", "netlogon.netr_LogonParameterControl.MSV1_0_CHECK_LOGONHOURS_FOR_S4U", FT_BOOLEAN, 32, TFS(&netr_LogonParameterControl_MSV1_0_CHECK_LOGONHOURS_FOR_S4U_tfs), ( 0x00040000 ), NULL, HFILL }},
        { &hf_netlogon_netr_DsRAddressToSitenamesW_count,
          { "Count", "netlogon.netr_DsRAddressToSitenamesW.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_CONTROL_QUERY_INFORMATION_val3_info3,
-         { "Info3", "netlogon.netr_CONTROL_QUERY_INFORMATION_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DomainTrust_trust_attributes,
          { "Trust Attributes", "netlogon.netr_DomainTrust.trust_attributes", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_PacInfo_expansionroom,
@@ -22460,8 +22388,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Sensitivedataflag", "netlogon.netr_USER_PRIVATE_INFO.SensitiveDataFlag", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_GetForestTrustInformation_return_authenticator,
          { "Return Authenticator", "netlogon.netr_GetForestTrustInformation.return_authenticator", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_TRUSTED_DOMAIN_trusted_domain,
-         { "Trusted Domain", "netlogon.netr_DELTA_UNION_valNETR_DELTA_TRUSTED_DOMAIN.trusted_domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_werror,
          { "Windows Error", "netlogon.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, NULL, HFILL }},
        { &hf_netlogon_netr_USER_KEYS_version,
@@ -22484,8 +22410,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Unknown3", "netlogon.netr_DELTA_POLICY.unknown3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_OsVersionInfoEx_Reserved,
          { "Reserved", "netlogon.netr_OsVersionInfoEx.Reserved", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_WorkstationInfo_val2_lsa_policy_info,
-         { "Lsa Policy Info", "netlogon.netr_WorkstationInfo_val2.lsa_policy_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ChangeLogEntry_db_index,
          { "Db Index", "netlogon.netr_ChangeLogEntry.db_index", FT_UINT1632, BASE_DEC, VALS(netlogon_netr_SamDatabaseID8Bit_vals), 0, NULL, HFILL }},
        { &hf_netlogon_netr_WorkstationInformation_os_version,
@@ -22498,8 +22422,8 @@ void proto_register_dcerpc_netlogon(void)
          { "Ds Web Service Required", "netlogon.netr_DsRGetDCName_flags.DS_WEB_SERVICE_REQUIRED", FT_BOOLEAN, 32, TFS(&netr_DsRGetDCName_flags_DS_WEB_SERVICE_REQUIRED_tfs), ( 0x00100000 ), NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetDCName_domain_name,
          { "Domain Name", "netlogon.netr_DsRGetDCName.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_RENAME_ALIAS_rename_alias,
-         { "Rename Alias", "netlogon.netr_DELTA_UNION_valNETR_DELTA_RENAME_ALIAS.rename_alias", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_UNION_group_member,
+         { "Group Member", "netlogon.netr_DELTA_UNION.group_member", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsR_DcFlags_DS_SERVER_DS,
          { "Ds Server Ds", "netlogon.netr_DsR_DcFlags.DS_SERVER_DS", FT_BOOLEAN, 32, TFS(&netr_DsR_DcFlags_DS_SERVER_DS_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_netlogon_NL_DNS_NAME_INFO_ARRAY_count,
@@ -22512,8 +22436,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Sid", "netlogon.netr_DELTA_POLICY.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerAuthenticate2_return_credentials,
          { "Return Credentials", "netlogon.netr_ServerAuthenticate2.return_credentials", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_LogonLevel_valNetlogonServiceTransitiveInformation_password,
-         { "Password", "netlogon.netr_LogonLevel_valNetlogonServiceTransitiveInformation.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_InfoFlags_NETLOGON_DNS_UPDATE_FAILURE,
          { "Netlogon Dns Update Failure", "netlogon.netr_InfoFlags.NETLOGON_DNS_UPDATE_FAILURE", FT_BOOLEAN, 32, TFS(&netr_InfoFlags_NETLOGON_DNS_UPDATE_FAILURE_tfs), ( 0x00000040 ), NULL, HFILL }},
        { &hf_netlogon_netr_DsrGetDcSiteCoverageW_ctr,
@@ -22532,8 +22454,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Computer Name", "netlogon.netr_LogonSamLogonWithFlags.computer_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_AccountSync_recordid,
          { "Recordid", "netlogon.netr_AccountSync.recordid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_WorkstationInfo_val1_workstation_info,
-         { "Workstation Info", "netlogon.netr_WorkstationInfo_val1.workstation_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsrEnumerateDomainTrusts_server_name,
          { "Server Name", "netlogon.netr_DsrEnumerateDomainTrusts.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_SECRET_unknown7,
@@ -22558,22 +22478,20 @@ void proto_register_dcerpc_netlogon(void)
          { "Credential", "netlogon.netr_DatabaseRedo.credential", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_PacInfo_pac_size,
          { "Pac Size", "netlogon.netr_PacInfo.pac_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_CONTROL_QUERY_INFORMATION_info1,
+         { "Info1", "netlogon.netr_CONTROL_QUERY_INFORMATION.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRAddressToSitenamesExW_ctr,
          { "Ctr", "netlogon.netr_DsRAddressToSitenamesExW.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_OneDomainInfo_dummy_string4,
          { "Dummy String4", "netlogon.netr_OneDomainInfo.dummy_string4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_DOMAIN_unknown3,
          { "Unknown3", "netlogon.netr_DELTA_DOMAIN.unknown3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_LogonLevel_valNetlogonGenericInformation_generic,
-         { "Generic", "netlogon.netr_LogonLevel_valNetlogonGenericInformation.generic", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_ACCOUNT_unknown2,
          { "Unknown2", "netlogon.netr_DELTA_ACCOUNT.unknown2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetSiteName_computer_name,
          { "Computer Name", "netlogon.netr_DsRGetSiteName.computer_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetDCName_domain_guid,
          { "Domain Guid", "netlogon.netr_DsRGetDCName.domain_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_RENAME_USER_rename_user,
-         { "Rename User", "netlogon.netr_DELTA_UNION_valNETR_DELTA_RENAME_USER.rename_user", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SamBaseInfo_allow_password_change,
          { "Allow Password Change", "netlogon.netr_SamBaseInfo.allow_password_change", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetDCName_flags_DS_DIRECTORY_SERVICE_REQUIRED,
@@ -22582,12 +22500,16 @@ void proto_register_dcerpc_netlogon(void)
          { "Data", "netlogon.netr_LogonControl2.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerPasswordGet_credential,
          { "Credential", "netlogon.netr_ServerPasswordGet.credential", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_WorkstationInfo_lsa_policy_info,
+         { "Lsa Policy Info", "netlogon.netr_WorkstationInfo.lsa_policy_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ChangeLogFlags_NETR_CHANGELOG_FIRST_PROMOTION_OBJ,
          { "Netr Changelog First Promotion Obj", "netlogon.netr_ChangeLogFlags.NETR_CHANGELOG_FIRST_PROMOTION_OBJ", FT_BOOLEAN, 16, TFS(&netr_ChangeLogFlags_NETR_CHANGELOG_FIRST_PROMOTION_OBJ_tfs), ( 0x0010 ), NULL, HFILL }},
        { &hf_netlogon_netr_AccountSync_buffer_,
          { "Subcontext length", "netlogon.netr_AccountSync.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ServerAuthenticate_account_name,
          { "Account Name", "netlogon.netr_ServerAuthenticate.account_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_UNION_account,
+         { "Account", "netlogon.netr_DELTA_UNION.account", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_AccountSync_buffer,
          { "Buffer", "netlogon.netr_AccountSync.buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_InfoFlags_NETLOGON_VERIFY_STATUS_RETURNED,
@@ -22596,8 +22518,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Credentials", "netlogon.netr_ServerAuthenticate3.credentials", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_USER_primary_gid,
          { "Primary Gid", "netlogon.netr_DELTA_USER.primary_gid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_GROUP_rid,
-         { "Rid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_GROUP.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_GetDcName_dcname,
          { "Dcname", "netlogon.netr_GetDcName.dcname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_USER_unknown6,
@@ -22606,14 +22526,10 @@ void proto_register_dcerpc_netlogon(void)
          { "Netlogon Neg Authenticated Rpc", "netlogon.netr_NegotiateFlags.NETLOGON_NEG_AUTHENTICATED_RPC", FT_BOOLEAN, 32, TFS(&netr_NegotiateFlags_NETLOGON_NEG_AUTHENTICATED_RPC_tfs), ( 0x40000000 ), NULL, HFILL }},
        { &hf_netlogon_netr_SamInfo6_principle,
          { "Principle", "netlogon.netr_SamInfo6.principle", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_POLICY_sid,
-         { "Sid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_POLICY.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_TrustFlags_NETR_TRUST_FLAG_MIT_KRB5,
          { "Netr Trust Flag Mit Krb5", "netlogon.netr_TrustFlags.NETR_TRUST_FLAG_MIT_KRB5", FT_BOOLEAN, 32, TFS(&netr_TrustFlags_NETR_TRUST_FLAG_MIT_KRB5_tfs), ( 0x00000080 ), NULL, HFILL }},
        { &hf_netlogon_netr_DatabaseSync2_credential,
          { "Credential", "netlogon.netr_DatabaseSync2.credential", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_LogonLevel_valNetlogonNetworkInformation_network,
-         { "Network", "netlogon.netr_LogonLevel_valNetlogonNetworkInformation.network", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetDCName_flags_DS_TRY_NEXTCLOSEST_SITE,
          { "Ds Try Nextclosest Site", "netlogon.netr_DsRGetDCName_flags.DS_TRY_NEXTCLOSEST_SITE", FT_BOOLEAN, 32, TFS(&netr_DsRGetDCName_flags_DS_TRY_NEXTCLOSEST_SITE_tfs), ( 0x00040000 ), NULL, HFILL }},
        { &hf_netlogon_netr_USER_KEYS2_lmpassword,
@@ -22636,18 +22552,18 @@ void proto_register_dcerpc_netlogon(void)
          { "Unknown5", "netlogon.netr_NETLOGON_INFO_3.unknown5", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_CONCURRENT_RPC,
          { "Netlogon Neg Concurrent Rpc", "netlogon.netr_NegotiateFlags.NETLOGON_NEG_CONCURRENT_RPC", FT_BOOLEAN, 32, TFS(&netr_NegotiateFlags_NETLOGON_NEG_CONCURRENT_RPC_tfs), ( 0x00000800 ), NULL, HFILL }},
-       { &hf_netlogon_netr_TrustFlags_NETR_TRUST_FLAG_AES,
-         { "Netr Trust Flag Aes", "netlogon.netr_TrustFlags.NETR_TRUST_FLAG_AES", FT_BOOLEAN, 32, TFS(&netr_TrustFlags_NETR_TRUST_FLAG_AES_tfs), ( 0x00000100 ), NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_ALIAS_alias_name,
          { "Alias Name", "netlogon.netr_DELTA_ALIAS.alias_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_TrustFlags_NETR_TRUST_FLAG_AES,
+         { "Netr Trust Flag Aes", "netlogon.netr_TrustFlags.NETR_TRUST_FLAG_AES", FT_BOOLEAN, 32, TFS(&netr_TrustFlags_NETR_TRUST_FLAG_AES_tfs), ( 0x00000100 ), NULL, HFILL }},
        { &hf_netlogon_netr_OsVersion_dummy,
          { "Dummy", "netlogon.netr_OsVersion.dummy", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_GROUP_description,
          { "Description", "netlogon.netr_DELTA_GROUP.description", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DomainInformation_trusted_domains,
          { "Trusted Domains", "netlogon.netr_DomainInformation.trusted_domains", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_UNION_valNETR_DELTA_RENAME_GROUP_rename_group,
-         { "Rename Group", "netlogon.netr_DELTA_UNION_valNETR_DELTA_RENAME_GROUP.rename_group", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_WorkstationInfo_workstation_info,
+         { "Workstation Info", "netlogon.netr_WorkstationInfo.workstation_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonSamLogoff_server_name,
          { "Server Name", "netlogon.netr_LogonSamLogoff.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonParameterControl_MSV1_0_TRY_SPECIFIED_DOMAIN_ONLY,
@@ -22686,8 +22602,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Trust Info", "netlogon.netr_ServerGetTrustInfo.trust_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_NL_PASSWORD_VERSION_PasswordVersionNumber,
          { "Passwordversionnumber", "netlogon.NL_PASSWORD_VERSION.PasswordVersionNumber", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_Validation_valNetlogonValidationSamInfo2_sam3,
-         { "Sam3", "netlogon.netr_Validation_valNetlogonValidationSamInfo2.sam3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SuiteMask_NETR_VER_SUITE_SINGLEUSERTS,
          { "Netr Ver Suite Singleuserts", "netlogon.netr_SuiteMask.NETR_VER_SUITE_SINGLEUSERTS", FT_BOOLEAN, 16, TFS(&netr_SuiteMask_NETR_VER_SUITE_SINGLEUSERTS_tfs), ( 0x0100 ), NULL, HFILL }},
        { &hf_netlogon_netr_CryptPassword_data,
@@ -22700,6 +22614,8 @@ void proto_register_dcerpc_netlogon(void)
          { "Identity Info", "netlogon.netr_GenericInfo.identity_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_TRUSTED_DOMAIN_unknown6,
          { "Unknown6", "netlogon.netr_DELTA_TRUSTED_DOMAIN.unknown6", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_Capabilities_server_capabilities,
+         { "Server Capabilities", "netlogon.netr_Capabilities.server_capabilities", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_GetForestTrustInformation_server_name,
          { "Server Name", "netlogon.netr_GetForestTrustInformation.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_USER_comment,
@@ -22738,14 +22654,16 @@ void proto_register_dcerpc_netlogon(void)
          { "Trust Type", "netlogon.netr_DomainTrust.trust_type", FT_UINT32, BASE_DEC, VALS(netlogon_netr_TrustType_vals), 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_SECRET_old_cipher_set_time,
          { "Old Cipher Set Time", "netlogon.netr_DELTA_SECRET.old_cipher_set_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DsRGetDCNameInfo_domain_name,
-         { "Domain Name", "netlogon.netr_DsRGetDCNameInfo.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_GenericInfo2_data,
          { "Data", "netlogon.netr_GenericInfo2.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_UserFlags_NETLOGON_USED_LM_PASSWORD,
          { "Netlogon Used Lm Password", "netlogon.netr_UserFlags.NETLOGON_USED_LM_PASSWORD", FT_BOOLEAN, 32, TFS(&netr_UserFlags_NETLOGON_USED_LM_PASSWORD_tfs), ( 0x00000008 ), NULL, HFILL }},
+       { &hf_netlogon_netr_DsRGetDCNameInfo_domain_name,
+         { "Domain Name", "netlogon.netr_DsRGetDCNameInfo.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_OsVersion_length,
          { "Length", "netlogon.netr_OsVersion.length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_UNION_alias_member,
+         { "Alias Member", "netlogon.netr_DELTA_UNION.alias_member", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_USER_KEY16_flags,
          { "Flags", "netlogon.netr_USER_KEY16.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_POLICY_eventauditoptions,
@@ -22754,12 +22672,12 @@ void proto_register_dcerpc_netlogon(void)
          { "Computer Name", "netlogon.netr_ServerTrustPasswordsGet.computer_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_USER_unknown5,
          { "Unknown5", "netlogon.netr_DELTA_USER.unknown5", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_TrustFlags_NETR_TRUST_FLAG_INBOUND,
-         { "Netr Trust Flag Inbound", "netlogon.netr_TrustFlags.NETR_TRUST_FLAG_INBOUND", FT_BOOLEAN, 32, TFS(&netr_TrustFlags_NETR_TRUST_FLAG_INBOUND_tfs), ( 0x00000020 ), NULL, HFILL }},
-       { &hf_netlogon_netr_DsRGetDCNameInfo_dc_site_name,
-         { "Dc Site Name", "netlogon.netr_DsRGetDCNameInfo.dc_site_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonParameterControl_MSV1_0_UPDATE_LOGON_STATISTICS,
          { "Msv1 0 Update Logon Statistics", "netlogon.netr_LogonParameterControl.MSV1_0_UPDATE_LOGON_STATISTICS", FT_BOOLEAN, 32, TFS(&netr_LogonParameterControl_MSV1_0_UPDATE_LOGON_STATISTICS_tfs), ( 0x00000004 ), NULL, HFILL }},
+       { &hf_netlogon_netr_DsRGetDCNameInfo_dc_site_name,
+         { "Dc Site Name", "netlogon.netr_DsRGetDCNameInfo.dc_site_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_TrustFlags_NETR_TRUST_FLAG_INBOUND,
+         { "Netr Trust Flag Inbound", "netlogon.netr_TrustFlags.NETR_TRUST_FLAG_INBOUND", FT_BOOLEAN, 32, TFS(&netr_TrustFlags_NETR_TRUST_FLAG_INBOUND_tfs), ( 0x00000020 ), NULL, HFILL }},
        { &hf_netlogon_netr_DatabaseSync2_computername,
          { "Computername", "netlogon.netr_DatabaseSync2.computername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_PasswordInfo_lmpassword,
@@ -22790,8 +22708,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Unknown2", "netlogon.netr_DELTA_DOMAIN.unknown2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_ACCOUNT_unknown3,
          { "Unknown3", "netlogon.netr_DELTA_ACCOUNT.unknown3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_TRUSTED_DOMAIN_sid,
-         { "Sid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_TRUSTED_DOMAIN.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_AccountDeltas_buffer_,
          { "Subcontext length", "netlogon.netr_AccountDeltas.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRGetDCName_flags_DS_BACKGROUND_ONLY,
@@ -22804,6 +22720,8 @@ void proto_register_dcerpc_netlogon(void)
          { "Computer Name", "netlogon.netr_ServerAuthenticate3.computer_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_DELETE_USER_unknown8,
          { "Unknown8", "netlogon.netr_DELTA_DELETE_USER.unknown8", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_UNION_delete_group,
+         { "Delete Group", "netlogon.netr_DELTA_UNION.delete_group", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_ChangeLogFlags_NETR_CHANGELOG_SID_INCLUDED,
          { "Netr Changelog Sid Included", "netlogon.netr_ChangeLogFlags.NETR_CHANGELOG_SID_INCLUDED", FT_BOOLEAN, 16, TFS(&netr_ChangeLogFlags_NETR_CHANGELOG_SID_INCLUDED_tfs), ( 0x0004 ), NULL, HFILL }},
        { &hf_netlogon_netr_AccountDeltas_level,
@@ -22856,14 +22774,14 @@ void proto_register_dcerpc_netlogon(void)
          { "Dom Trust List", "netlogon.netr_NetrEnumerateTrustedDomainsEx.dom_trust_list", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_TrustAttributes_NETR_TRUST_ATTRIBUTE_UPLEVEL_ONLY,
          { "Netr Trust Attribute Uplevel Only", "netlogon.netr_TrustAttributes.NETR_TRUST_ATTRIBUTE_UPLEVEL_ONLY", FT_BOOLEAN, 32, TFS(&netr_TrustAttributes_NETR_TRUST_ATTRIBUTE_UPLEVEL_ONLY_tfs), ( 0x00000002 ), NULL, HFILL }},
+       { &hf_netlogon_netr_ChangeLogObject_object_name,
+         { "Object Name", "netlogon.netr_ChangeLogObject.object_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsRAddress_buffer,
          { "Buffer", "netlogon.netr_DsRAddress.buffer", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonSamLogonEx_computer_name,
          { "Computer Name", "netlogon.netr_LogonSamLogonEx.computer_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SamInfo3_sids,
          { "Sids", "netlogon.netr_SamInfo3.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_USER_rid,
-         { "Rid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_RENAME_USER.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_ALIAS_unknown2,
          { "Unknown2", "netlogon.netr_DELTA_ALIAS.unknown2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonGetDomainInfo_query,
@@ -22894,6 +22812,8 @@ void proto_register_dcerpc_netlogon(void)
          { "Bad Pw Count", "netlogon.netr_UasInfo.bad_pw_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_NETLOGON_INFO_1_pdc_connection_status,
          { "Pdc Connection Status", "netlogon.netr_NETLOGON_INFO_1.pdc_connection_status", FT_UINT32, BASE_DEC, VALS(WERR_errors), 0, NULL, HFILL }},
+       { &hf_netlogon_netr_CONTROL_QUERY_INFORMATION_info2,
+         { "Info2", "netlogon.netr_CONTROL_QUERY_INFORMATION.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_SamBaseInfo_LMSessKey,
          { "Lmsesskey", "netlogon.netr_SamBaseInfo.LMSessKey", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_ALIAS_sdbuf,
@@ -22908,6 +22828,8 @@ void proto_register_dcerpc_netlogon(void)
          { "Forest Trust Info", "netlogon.netr_GetForestTrustInformation.forest_trust_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_WorkstationInformation_dummy3,
          { "Dummy3", "netlogon.netr_WorkstationInformation.dummy3", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_UNION_secret,
+         { "Secret", "netlogon.netr_DELTA_UNION.secret", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DELTA_TRUSTED_DOMAIN_unknown7,
          { "Unknown7", "netlogon.netr_DELTA_TRUSTED_DOMAIN.unknown7", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DomainTrust_guid,
@@ -22940,6 +22862,8 @@ void proto_register_dcerpc_netlogon(void)
          { "Entries", "netlogon.netr_TrustInfo.entries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_LogonParameterControl_MSV1_0_CLEARTEXT_PASSWORD_SUPPLIED,
          { "Msv1 0 Cleartext Password Supplied", "netlogon.netr_LogonParameterControl.MSV1_0_CLEARTEXT_PASSWORD_SUPPLIED", FT_BOOLEAN, 32, TFS(&netr_LogonParameterControl_MSV1_0_CLEARTEXT_PASSWORD_SUPPLIED_tfs), ( 0x00004000 ), NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_ID_UNION_name,
+         { "Name", "netlogon.netr_DELTA_ID_UNION.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DatabaseRedo_change_log_entry_size,
          { "Change Log Entry Size", "netlogon.netr_DatabaseRedo.change_log_entry_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_GETDOMAININFO,
@@ -22958,8 +22882,8 @@ void proto_register_dcerpc_netlogon(void)
          { "Site Guid", "netlogon.netr_DsRGetDCName.site_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DsR_DcFlags_DS_SERVER_TIMESERV,
          { "Ds Server Timeserv", "netlogon.netr_DsR_DcFlags.DS_SERVER_TIMESERV", FT_BOOLEAN, 32, TFS(&netr_DsR_DcFlags_DS_SERVER_TIMESERV_tfs), ( 0x00000040 ), NULL, HFILL }},
-       { &hf_netlogon_netr_CONTROL_QUERY_INFORMATION_val4_info4,
-         { "Info4", "netlogon.netr_CONTROL_QUERY_INFORMATION_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_netlogon_netr_DELTA_UNION_domain,
+         { "Domain", "netlogon.netr_DELTA_UNION.domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_NegotiateFlags_NETLOGON_NEG_GENERIC_PASSTHROUGH,
          { "Netlogon Neg Generic Passthrough", "netlogon.netr_NegotiateFlags.NETLOGON_NEG_GENERIC_PASSTHROUGH", FT_BOOLEAN, 32, TFS(&netr_NegotiateFlags_NETLOGON_NEG_GENERIC_PASSTHROUGH_tfs), ( 0x00000400 ), NULL, HFILL }},
        { &hf_netlogon_netr_SamBaseInfo_sub_auth_status,
@@ -22976,8 +22900,6 @@ void proto_register_dcerpc_netlogon(void)
          { "Reset Count", "netlogon.netr_AcctLockStr.reset_count", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_UserFlags_NETLOGON_CACHED_ACCOUNT,
          { "Netlogon Cached Account", "netlogon.netr_UserFlags.NETLOGON_CACHED_ACCOUNT", FT_BOOLEAN, 32, TFS(&netr_UserFlags_NETLOGON_CACHED_ACCOUNT_tfs), ( 0x00000004 ), NULL, HFILL }},
-       { &hf_netlogon_netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_USER2_rid,
-         { "Rid", "netlogon.netr_DELTA_ID_UNION_valNETR_DELTA_DELETE_USER2.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_DatabaseSync2_logon_server,
          { "Logon Server", "netlogon.netr_DatabaseSync2.logon_server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_netlogon_netr_trust_extension_length,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-ntlmssp.c b/bin/default/librpc/gen_ndr/packet-dcerpc-ntlmssp.c
index 128155e68317bb9a934b85172c9ee414a813ec7e..8f37dff590ec43715ab2828afd48ffc2e3659899 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-ntlmssp.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-ntlmssp.c
@@ -57,12 +57,14 @@ static gint ett_ntlmssp_NTLMSSP_MESSAGE_SIGNATURE_NTLMv2 = -1;
 static gint hf_ntlmssp_decode_NTLMv2_RESPONSE_response = -1;
 static gint hf_ntlmssp_CHALLENGE_MESSAGE_TargetNameInfoMaxLen = -1;
 static gint hf_ntlmssp_ntlmssp_VERSION_Reserved = -1;
+static gint hf_ntlmssp_ntlmssp_AvValue_AvNbComputerName = -1;
 static gint hf_ntlmssp_CHALLENGE_MESSAGE_Reserved = -1;
+static gint hf_ntlmssp_ntlmssp_AvValue_AvTimestamp = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_OEM = -1;
-static gint hf_ntlmssp_ntlmssp_NTLM_RESPONSE_valdefault_v2 = -1;
 static gint hf_ntlmssp_Restriction_Encoding_MachineId = -1;
 static gint hf_ntlmssp_NEGOTIATE_MESSAGE_WorkstationLen = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_NTLM = -1;
+static gint hf_ntlmssp_ntlmssp_AvValue_ChannelBindings = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_Signature = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_SEAL = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_KEY_EXCH = -1;
@@ -75,7 +77,6 @@ static gint hf_ntlmssp_CHALLENGE_MESSAGE_TargetInfoLen = -1;
 static gint hf_ntlmssp_LMv2_RESPONSE_ChallengeFromClient = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_NtChallengeResponse_ = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_LmChallengeResponse = -1;
-static gint hf_ntlmssp_ntlmssp_AvValue_valMsvAvDnsTreeName_AvDnsTreeName = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_OEM_WORKSTATION_SUPPLIED = -1;
 static gint hf_ntlmssp_NTLMSSP_MESSAGE_SIGNATURE_Checksum = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_Version = -1;
@@ -85,29 +86,28 @@ static gint hf_ntlmssp_NTLMv2_RESPONSE_Response = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_NETWARE = -1;
 static gint hf_ntlmssp_NTLMv2_CLIENT_CHALLENGE_RespType = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_UserNameMaxLen = -1;
-static gint hf_ntlmssp_ntlmssp_LM_RESPONSE_val24_v1 = -1;
+static gint hf_ntlmssp_ntlmssp_Version_version = -1;
 static gint hf_ntlmssp_CHALLENGE_MESSAGE_TargetNameLen = -1;
 static gint hf_ntlmssp_NEGOTIATE_MESSAGE_DomainNameMaxLen = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_56 = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_EncryptedRandomSessionKeyMaxLen = -1;
 static gint hf_ntlmssp_NEGOTIATE_MESSAGE_MessageType = -1;
-static gint hf_ntlmssp_ntlmssp_AvValue_valMsvAvTargetName_AvTargetName = -1;
+static gint hf_ntlmssp_ntlmssp_AvValue_AvNbDomainName = -1;
 static gint hf_ntlmssp_ntlmssp_AvFlags_NTLMSSP_AVFLAG_MIC_IN_AUTHENTICATE_MESSAGE = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_VERSION = -1;
 static gint hf_ntlmssp_CHALLENGE_MESSAGE_TargetName_ = -1;
-static gint hf_ntlmssp_ntlmssp_AvValue_valMsvChannelBindings_ChannelBindings = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_REQUEST_TARGET = -1;
-static gint hf_ntlmssp_ntlmssp_Version_valNTLMSSP_NEGOTIATE_VERSION_version = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_Workstation_ = -1;
-static gint hf_ntlmssp_ntlmssp_AvValue_valMsvAvDnsComputerName_AvDnsComputerName = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_DomainNameMaxLen = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_TARGET_TYPE_DOMAIN = -1;
 static gint hf_ntlmssp_decode_CHALLENGE_MESSAGE_challenge = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_UserName_ = -1;
+static gint hf_ntlmssp_ntlmssp_LM_RESPONSE_v1 = -1;
 static gint hf_ntlmssp_CHALLENGE_MESSAGE_TargetName = -1;
 static gint hf_ntlmssp_NTLMv2_CLIENT_CHALLENGE_Reserved2 = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_THIS_IS_LOCAL_CALL = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_MessageType = -1;
+static gint hf_ntlmssp_ntlmssp_NTLM_RESPONSE_v2 = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_WorkstationLen = -1;
 static gint hf_ntlmssp_NTLMSSP_MESSAGE_SIGNATURE_Version = -1;
 static gint hf_ntlmssp_AV_PAIR_AvLen = -1;
@@ -117,6 +117,7 @@ static gint hf_ntlmssp_LMv2_RESPONSE_Response = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_WorkstationMaxLen = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_LmChallengeResponseMaxLen = -1;
 static gint hf_ntlmssp_AV_PAIR_AvId = -1;
+static gint hf_ntlmssp_ntlmssp_AvValue_blob = -1;
 static gint hf_ntlmssp_CHALLENGE_MESSAGE_ServerChallenge = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_NT_ONLY = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_SIGN = -1;
@@ -130,11 +131,12 @@ static gint hf_ntlmssp_Restriction_Encoding_SubjectIntegrityLevel = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_NtChallengeResponse = -1;
 static gint hf_ntlmssp_decode_NEGOTIATE_MESSAGE_negotiate = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_UserName = -1;
+static gint hf_ntlmssp_ntlmssp_AvValue_AvFlags = -1;
 static gint hf_ntlmssp_CHALLENGE_MESSAGE_Signature = -1;
 static gint hf_ntlmssp_NTLMSSP_MESSAGE_SIGNATURE_NTLMv2_Version = -1;
 static gint hf_ntlmssp_Restriction_Encoding_Z4 = -1;
+static gint hf_ntlmssp_ntlmssp_AvValue_AvDnsTreeName = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_EncryptedRandomSessionKey = -1;
-static gint hf_ntlmssp_ntlmssp_AvValue_valMsvAvFlags_AvFlags = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_NtChallengeResponseLen = -1;
 static gint hf_ntlmssp_NTLMSSP_MESSAGE_SIGNATURE_SeqNum = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_REQUEST_NON_NT_SESSION_KEY = -1;
@@ -143,6 +145,7 @@ static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_TARGET_INFO = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_NtChallengeResponseMaxLen = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_DomainNameLen = -1;
 static gint hf_ntlmssp_NEGOTIATE_MESSAGE_Signature = -1;
+static gint hf_ntlmssp_ntlmssp_AvValue_AvRestrictions = -1;
 static gint hf_ntlmssp_MIC_MIC = -1;
 static gint hf_ntlmssp_AV_PAIR_Value_ = -1;
 static gint hf_ntlmssp_Restriction_Encoding_Size = -1;
@@ -150,13 +153,12 @@ static gint hf_ntlmssp_NTLMv2_CLIENT_CHALLENGE_AvPairs_ = -1;
 static gint hf_ntlmssp_NTLMv2_CLIENT_CHALLENGE_HiRespType = -1;
 static gint hf_ntlmssp_NTLMv2_CLIENT_CHALLENGE_ChallengeFromClient = -1;
 static gint hf_ntlmssp_ntlmssp_AvFlags_NTLMSSP_AVFLAG_CONSTRAINTED_ACCOUNT = -1;
-static gint hf_ntlmssp_ntlmssp_AvValue_valdefault_blob = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_ANONYMOUS = -1;
 static gint hf_ntlmssp_NTLMSSP_MESSAGE_SIGNATURE_RandomPad = -1;
-static gint hf_ntlmssp_ntlmssp_NTLM_RESPONSE_val0x18_v1 = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_NegotiateFlags = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_TARGET_TYPE_SHARE = -1;
 static gint hf_ntlmssp_NEGOTIATE_MESSAGE_Workstation_ = -1;
+static gint hf_ntlmssp_ntlmssp_NTLM_RESPONSE_v1 = -1;
 static gint hf_ntlmssp_NEGOTIATE_MESSAGE_Version = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_LM_KEY = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_UNICODE = -1;
@@ -167,9 +169,8 @@ static gint hf_ntlmssp_CHALLENGE_MESSAGE_TargetInfo_ = -1;
 static gint hf_ntlmssp_opnum = -1;
 static gint hf_ntlmssp_ntlmssp_VERSION_ProductBuild = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_DATAGRAM = -1;
-static gint hf_ntlmssp_ntlmssp_AvValue_valMsvAvNbDomainName_AvNbDomainName = -1;
-static gint hf_ntlmssp_ntlmssp_AvValue_valMsvAvNbComputerName_AvNbComputerName = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_DomainName = -1;
+static gint hf_ntlmssp_ntlmssp_AvValue_AvDnsComputerName = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_128 = -1;
 static gint hf_ntlmssp_NTLMv2_CLIENT_CHALLENGE_Reserved3 = -1;
 static gint hf_ntlmssp_NEGOTIATE_MESSAGE_NegotiateFlags = -1;
@@ -180,6 +181,7 @@ static gint hf_ntlmssp_ntlmssp_VERSION_ProductMinorVersion = -1;
 static gint hf_ntlmssp_NEGOTIATE_MESSAGE_Workstation = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_EXTENDED_SESSIONSECURITY = -1;
 static gint hf_ntlmssp_CHALLENGE_MESSAGE_NegotiateFlags = -1;
+static gint hf_ntlmssp_ntlmssp_AvValue_AvTargetName = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_TARGET_TYPE_SERVER = -1;
 static gint hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_OEM_DOMAIN_SUPPLIED = -1;
 static gint hf_ntlmssp_CHALLENGE_MESSAGE_MessageType = -1;
@@ -192,10 +194,8 @@ static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_EncryptedRandomSessionKeyLen = -1;
 static gint hf_ntlmssp_NEGOTIATE_MESSAGE_DomainName = -1;
 static gint hf_ntlmssp_ntlmssp_VERSION_ProductMajorVersion = -1;
 static gint hf_ntlmssp_AUTHENTICATE_MESSAGE_Workstation = -1;
-static gint hf_ntlmssp_ntlmssp_AvValue_valMsvAvDnsDomainName_AvDnsDomainName = -1;
+static gint hf_ntlmssp_ntlmssp_AvValue_AvDnsDomainName = -1;
 static gint hf_ntlmssp_NTLMv2_CLIENT_CHALLENGE_TimeStamp = -1;
-static gint hf_ntlmssp_ntlmssp_AvValue_valMsAvRestrictions_AvRestrictions = -1;
-static gint hf_ntlmssp_ntlmssp_AvValue_valMsvAvTimestamp_AvTimestamp = -1;
 
 static gint proto_dcerpc_ntlmssp = -1;
 /* Version information */
@@ -339,7 +339,7 @@ static int ntlmssp_dissect_element_VERSION_ProductBuild(tvbuff_t *tvb _U_, int o
 static int ntlmssp_dissect_element_VERSION_Reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_VERSION_Reserved_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_VERSION_NTLMRevisionCurrent(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_Version_valNTLMSSP_NEGOTIATE_VERSION_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ntlmssp_dissect_element_Version_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_NEGOTIATE_MESSAGE_Signature(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_NEGOTIATE_MESSAGE_Signature_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_NEGOTIATE_MESSAGE_MessageType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -383,18 +383,18 @@ static const true_false_string ntlmssp_AvFlags_NTLMSSP_AVFLAG_MIC_IN_AUTHENTICAT
    "NTLMSSP_AVFLAG_MIC_IN_AUTHENTICATE_MESSAGE is SET",
    "NTLMSSP_AVFLAG_MIC_IN_AUTHENTICATE_MESSAGE is NOT SET",
 };
-static int ntlmssp_dissect_element_AvValue_valMsvAvNbComputerName_AvNbComputerName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_AvValue_valMsvAvNbDomainName_AvNbDomainName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_AvValue_valMsvAvDnsComputerName_AvDnsComputerName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_AvValue_valMsvAvDnsDomainName_AvDnsDomainName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_AvValue_valMsvAvDnsTreeName_AvDnsTreeName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_AvValue_valMsvAvFlags_AvFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_AvValue_valMsvAvTimestamp_AvTimestamp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_AvValue_valMsAvRestrictions_AvRestrictions(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_AvValue_valMsvAvTargetName_AvTargetName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_AvValue_valMsvChannelBindings_ChannelBindings(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_AvValue_valMsvChannelBindings_ChannelBindings_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_AvValue_valdefault_blob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ntlmssp_dissect_element_AvValue_AvNbComputerName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ntlmssp_dissect_element_AvValue_AvNbDomainName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ntlmssp_dissect_element_AvValue_AvDnsComputerName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ntlmssp_dissect_element_AvValue_AvDnsDomainName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ntlmssp_dissect_element_AvValue_AvDnsTreeName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ntlmssp_dissect_element_AvValue_AvFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ntlmssp_dissect_element_AvValue_AvTimestamp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ntlmssp_dissect_element_AvValue_AvRestrictions(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ntlmssp_dissect_element_AvValue_AvTargetName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ntlmssp_dissect_element_AvValue_ChannelBindings(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ntlmssp_dissect_element_AvValue_ChannelBindings_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ntlmssp_dissect_element_AvValue_blob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_AV_PAIR_AvId(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *AvId);
 static int ntlmssp_dissect_element_AV_PAIR_AvLen(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_AV_PAIR_Value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *AvId);
@@ -427,7 +427,7 @@ static int ntlmssp_dissect_element_LMv2_RESPONSE_Response(tvbuff_t *tvb _U_, int
 static int ntlmssp_dissect_element_LMv2_RESPONSE_Response_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_LMv2_RESPONSE_ChallengeFromClient(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_LMv2_RESPONSE_ChallengeFromClient_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_LM_RESPONSE_val24_v1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ntlmssp_dissect_element_LM_RESPONSE_v1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_NTLM_RESPONSE_Response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_NTLM_RESPONSE_Response_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_NTLMv2_CLIENT_CHALLENGE_RespType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -443,8 +443,8 @@ static int ntlmssp_dissect_element_NTLMv2_CLIENT_CHALLENGE_AvPairs_(tvbuff_t *tv
 static int ntlmssp_dissect_element_NTLMv2_RESPONSE_Response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_NTLMv2_RESPONSE_Response_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_NTLMv2_RESPONSE_Challenge(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_NTLM_RESPONSE_val0x18_v1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_NTLM_RESPONSE_valdefault_v2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ntlmssp_dissect_element_NTLM_RESPONSE_v1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ntlmssp_dissect_element_NTLM_RESPONSE_v2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_MIC_MIC(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_MIC_MIC_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_Signature(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -949,9 +949,9 @@ ntlmssp_dissect_struct_VERSION(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 /* IDL: } */
 
 static int
-ntlmssp_dissect_element_Version_valNTLMSSP_NEGOTIATE_VERSION_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ntlmssp_dissect_element_Version_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = ntlmssp_dissect_struct_VERSION(tvb,offset,pinfo,tree,drep,hf_ntlmssp_ntlmssp_Version_valNTLMSSP_NEGOTIATE_VERSION_version,0);
+       offset = ntlmssp_dissect_struct_VERSION(tvb,offset,pinfo,tree,drep,hf_ntlmssp_ntlmssp_Version_version,0);
 
        return offset;
 }
@@ -972,7 +972,7 @@ ntlmssp_dissect_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U
 
        switch(level) {
                case NTLMSSP_NEGOTIATE_VERSION:
-                       offset = ntlmssp_dissect_element_Version_valNTLMSSP_NEGOTIATE_VERSION_version(tvb, offset, pinfo, tree, drep);
+                       offset = ntlmssp_dissect_element_Version_version(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -1388,95 +1388,95 @@ ntlmssp_dissect_bitmap_AvFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 /* IDL: } */
 
 static int
-ntlmssp_dissect_element_AvValue_valMsvAvNbComputerName_AvNbComputerName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ntlmssp_dissect_element_AvValue_AvNbComputerName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
 
        return offset;
 }
 
 static int
-ntlmssp_dissect_element_AvValue_valMsvAvNbDomainName_AvNbDomainName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ntlmssp_dissect_element_AvValue_AvNbDomainName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
 
        return offset;
 }
 
 static int
-ntlmssp_dissect_element_AvValue_valMsvAvDnsComputerName_AvDnsComputerName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ntlmssp_dissect_element_AvValue_AvDnsComputerName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
 
        return offset;
 }
 
 static int
-ntlmssp_dissect_element_AvValue_valMsvAvDnsDomainName_AvDnsDomainName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ntlmssp_dissect_element_AvValue_AvDnsDomainName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
 
        return offset;
 }
 
 static int
-ntlmssp_dissect_element_AvValue_valMsvAvDnsTreeName_AvDnsTreeName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ntlmssp_dissect_element_AvValue_AvDnsTreeName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
 
        return offset;
 }
 
 static int
-ntlmssp_dissect_element_AvValue_valMsvAvFlags_AvFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ntlmssp_dissect_element_AvValue_AvFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = ntlmssp_dissect_bitmap_AvFlags(tvb, offset, pinfo, tree, drep, hf_ntlmssp_ntlmssp_AvValue_valMsvAvFlags_AvFlags, 0);
+       offset = ntlmssp_dissect_bitmap_AvFlags(tvb, offset, pinfo, tree, drep, hf_ntlmssp_ntlmssp_AvValue_AvFlags, 0);
 
        return offset;
 }
 
 static int
-ntlmssp_dissect_element_AvValue_valMsvAvTimestamp_AvTimestamp(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ntlmssp_dissect_element_AvValue_AvTimestamp(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_ntlmssp_ntlmssp_AvValue_valMsvAvTimestamp_AvTimestamp);
+       offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, drep, hf_ntlmssp_ntlmssp_AvValue_AvTimestamp);
 
        return offset;
 }
 
 static int
-ntlmssp_dissect_element_AvValue_valMsAvRestrictions_AvRestrictions(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ntlmssp_dissect_element_AvValue_AvRestrictions(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = ntlmssp_dissect_struct_Restriction_Encoding(tvb,offset,pinfo,tree,drep,hf_ntlmssp_ntlmssp_AvValue_valMsAvRestrictions_AvRestrictions,0);
+       offset = ntlmssp_dissect_struct_Restriction_Encoding(tvb,offset,pinfo,tree,drep,hf_ntlmssp_ntlmssp_AvValue_AvRestrictions,0);
 
        return offset;
 }
 
 static int
-ntlmssp_dissect_element_AvValue_valMsvAvTargetName_AvTargetName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ntlmssp_dissect_element_AvValue_AvTargetName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
 
        return offset;
 }
 
 static int
-ntlmssp_dissect_element_AvValue_valMsvChannelBindings_ChannelBindings(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ntlmssp_dissect_element_AvValue_ChannelBindings(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        int conformant = di->conformant_run;
        if (!conformant) {
-               offset = ntlmssp_dissect_element_AvValue_valMsvChannelBindings_ChannelBindings_(tvb, offset, 16, pinfo, tree, drep);
+               offset = ntlmssp_dissect_element_AvValue_ChannelBindings_(tvb, offset, 16, pinfo, tree, drep);
        }
 
        return offset;
 }
 
 static int
-ntlmssp_dissect_element_AvValue_valMsvChannelBindings_ChannelBindings_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ntlmssp_dissect_element_AvValue_ChannelBindings_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       proto_tree_add_bytes(tree, hf_ntlmssp_ntlmssp_AvValue_valMsvChannelBindings_ChannelBindings, tvb, offset, length, tvb_get_ptr(tvb, offset,length)); offset += length;
+       proto_tree_add_bytes(tree, hf_ntlmssp_ntlmssp_AvValue_ChannelBindings, tvb, offset, length, tvb_get_ptr(tvb, offset,length)); offset += length;
 
        return offset;
 }
 
 static int
-ntlmssp_dissect_element_AvValue_valdefault_blob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ntlmssp_dissect_element_AvValue_blob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_ntlmssp_ntlmssp_AvValue_valdefault_blob, 1);
+       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_ntlmssp_ntlmssp_AvValue_blob, 1);
 
        return offset;
 }
@@ -1500,47 +1500,47 @@ ntlmssp_dissect_AvValue(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U
                break;
 
                case MsvAvNbComputerName:
-                       offset = ntlmssp_dissect_element_AvValue_valMsvAvNbComputerName_AvNbComputerName(tvb, offset, pinfo, tree, drep);
+                       offset = ntlmssp_dissect_element_AvValue_AvNbComputerName(tvb, offset, pinfo, tree, drep);
                break;
 
                case MsvAvNbDomainName:
-                       offset = ntlmssp_dissect_element_AvValue_valMsvAvNbDomainName_AvNbDomainName(tvb, offset, pinfo, tree, drep);
+                       offset = ntlmssp_dissect_element_AvValue_AvNbDomainName(tvb, offset, pinfo, tree, drep);
                break;
 
                case MsvAvDnsComputerName:
-                       offset = ntlmssp_dissect_element_AvValue_valMsvAvDnsComputerName_AvDnsComputerName(tvb, offset, pinfo, tree, drep);
+                       offset = ntlmssp_dissect_element_AvValue_AvDnsComputerName(tvb, offset, pinfo, tree, drep);
                break;
 
                case MsvAvDnsDomainName:
-                       offset = ntlmssp_dissect_element_AvValue_valMsvAvDnsDomainName_AvDnsDomainName(tvb, offset, pinfo, tree, drep);
+                       offset = ntlmssp_dissect_element_AvValue_AvDnsDomainName(tvb, offset, pinfo, tree, drep);
                break;
 
                case MsvAvDnsTreeName:
-                       offset = ntlmssp_dissect_element_AvValue_valMsvAvDnsTreeName_AvDnsTreeName(tvb, offset, pinfo, tree, drep);
+                       offset = ntlmssp_dissect_element_AvValue_AvDnsTreeName(tvb, offset, pinfo, tree, drep);
                break;
 
                case MsvAvFlags:
-                       offset = ntlmssp_dissect_element_AvValue_valMsvAvFlags_AvFlags(tvb, offset, pinfo, tree, drep);
+                       offset = ntlmssp_dissect_element_AvValue_AvFlags(tvb, offset, pinfo, tree, drep);
                break;
 
                case MsvAvTimestamp:
-                       offset = ntlmssp_dissect_element_AvValue_valMsvAvTimestamp_AvTimestamp(tvb, offset, pinfo, tree, drep);
+                       offset = ntlmssp_dissect_element_AvValue_AvTimestamp(tvb, offset, pinfo, tree, drep);
                break;
 
                case MsAvRestrictions:
-                       offset = ntlmssp_dissect_element_AvValue_valMsAvRestrictions_AvRestrictions(tvb, offset, pinfo, tree, drep);
+                       offset = ntlmssp_dissect_element_AvValue_AvRestrictions(tvb, offset, pinfo, tree, drep);
                break;
 
                case MsvAvTargetName:
-                       offset = ntlmssp_dissect_element_AvValue_valMsvAvTargetName_AvTargetName(tvb, offset, pinfo, tree, drep);
+                       offset = ntlmssp_dissect_element_AvValue_AvTargetName(tvb, offset, pinfo, tree, drep);
                break;
 
                case MsvChannelBindings:
-                       offset = ntlmssp_dissect_element_AvValue_valMsvChannelBindings_ChannelBindings(tvb, offset, pinfo, tree, drep);
+                       offset = ntlmssp_dissect_element_AvValue_ChannelBindings(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = ntlmssp_dissect_element_AvValue_valdefault_blob(tvb, offset, pinfo, tree, drep);
+                       offset = ntlmssp_dissect_element_AvValue_blob(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -2080,9 +2080,9 @@ ntlmssp_dissect_struct_LMv2_RESPONSE(tvbuff_t *tvb _U_, int offset _U_, packet_i
 /* IDL: } */
 
 static int
-ntlmssp_dissect_element_LM_RESPONSE_val24_v1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ntlmssp_dissect_element_LM_RESPONSE_v1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = ntlmssp_dissect_struct_LM_RESPONSE(tvb,offset,pinfo,tree,drep,hf_ntlmssp_ntlmssp_LM_RESPONSE_val24_v1,0);
+       offset = ntlmssp_dissect_struct_LM_RESPONSE(tvb,offset,pinfo,tree,drep,hf_ntlmssp_ntlmssp_LM_RESPONSE_v1,0);
 
        return offset;
 }
@@ -2103,7 +2103,7 @@ ntlmssp_dissect_LM_RESPONSE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 
        switch(level) {
                case 24:
-                       offset = ntlmssp_dissect_element_LM_RESPONSE_val24_v1(tvb, offset, pinfo, tree, drep);
+                       offset = ntlmssp_dissect_element_LM_RESPONSE_v1(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -2390,17 +2390,17 @@ ntlmssp_dissect_struct_NTLMv2_RESPONSE(tvbuff_t *tvb _U_, int offset _U_, packet
 /* IDL: } */
 
 static int
-ntlmssp_dissect_element_NTLM_RESPONSE_val0x18_v1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ntlmssp_dissect_element_NTLM_RESPONSE_v1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = ntlmssp_dissect_struct_NTLM_RESPONSE(tvb,offset,pinfo,tree,drep,hf_ntlmssp_ntlmssp_NTLM_RESPONSE_val0x18_v1,0);
+       offset = ntlmssp_dissect_struct_NTLM_RESPONSE(tvb,offset,pinfo,tree,drep,hf_ntlmssp_ntlmssp_NTLM_RESPONSE_v1,0);
 
        return offset;
 }
 
 static int
-ntlmssp_dissect_element_NTLM_RESPONSE_valdefault_v2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ntlmssp_dissect_element_NTLM_RESPONSE_v2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = ntlmssp_dissect_struct_NTLMv2_RESPONSE(tvb,offset,pinfo,tree,drep,hf_ntlmssp_ntlmssp_NTLM_RESPONSE_valdefault_v2,0);
+       offset = ntlmssp_dissect_struct_NTLMv2_RESPONSE(tvb,offset,pinfo,tree,drep,hf_ntlmssp_ntlmssp_NTLM_RESPONSE_v2,0);
 
        return offset;
 }
@@ -2424,11 +2424,11 @@ ntlmssp_dissect_NTLM_RESPONSE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
                break;
 
                case 0x18:
-                       offset = ntlmssp_dissect_element_NTLM_RESPONSE_val0x18_v1(tvb, offset, pinfo, tree, drep);
+                       offset = ntlmssp_dissect_element_NTLM_RESPONSE_v1(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = ntlmssp_dissect_element_NTLM_RESPONSE_valdefault_v2(tvb, offset, pinfo, tree, drep);
+                       offset = ntlmssp_dissect_element_NTLM_RESPONSE_v2(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -3264,18 +3264,22 @@ void proto_register_dcerpc_ntlmssp(void)
          { "Targetnameinfomaxlen", "ntlmssp.CHALLENGE_MESSAGE.TargetNameInfoMaxLen", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_ntlmssp_VERSION_Reserved,
          { "Reserved", "ntlmssp.ntlmssp_VERSION.Reserved", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_ntlmssp_ntlmssp_AvValue_AvNbComputerName,
+         { "Avnbcomputername", "ntlmssp.ntlmssp_AvValue.AvNbComputerName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_CHALLENGE_MESSAGE_Reserved,
          { "Reserved", "ntlmssp.CHALLENGE_MESSAGE.Reserved", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_ntlmssp_ntlmssp_AvValue_AvTimestamp,
+         { "Avtimestamp", "ntlmssp.ntlmssp_AvValue.AvTimestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_OEM,
          { "Ntlmssp Negotiate Oem", "ntlmssp.NEGOTIATE.NTLMSSP_NEGOTIATE_OEM", FT_BOOLEAN, 32, TFS(&NEGOTIATE_NTLMSSP_NEGOTIATE_OEM_tfs), ( 0x00000002 ), NULL, HFILL }},
-       { &hf_ntlmssp_ntlmssp_NTLM_RESPONSE_valdefault_v2,
-         { "V2", "ntlmssp.ntlmssp_NTLM_RESPONSE_valdefault.v2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_Restriction_Encoding_MachineId,
          { "Machineid", "ntlmssp.Restriction_Encoding.MachineId", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_MESSAGE_WorkstationLen,
          { "Workstationlen", "ntlmssp.NEGOTIATE_MESSAGE.WorkstationLen", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_NTLM,
          { "Ntlmssp Negotiate Ntlm", "ntlmssp.NEGOTIATE.NTLMSSP_NEGOTIATE_NTLM", FT_BOOLEAN, 32, TFS(&NEGOTIATE_NTLMSSP_NEGOTIATE_NTLM_tfs), ( 0x00000200 ), NULL, HFILL }},
+       { &hf_ntlmssp_ntlmssp_AvValue_ChannelBindings,
+         { "Channelbindings", "ntlmssp.ntlmssp_AvValue.ChannelBindings", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_AUTHENTICATE_MESSAGE_Signature,
          { "Signature", "ntlmssp.AUTHENTICATE_MESSAGE.Signature", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_SEAL,
@@ -3300,8 +3304,6 @@ void proto_register_dcerpc_ntlmssp(void)
          { "Subcontext length", "ntlmssp.AUTHENTICATE_MESSAGE.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_AUTHENTICATE_MESSAGE_LmChallengeResponse,
          { "Lmchallengeresponse", "ntlmssp.AUTHENTICATE_MESSAGE.LmChallengeResponse", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_ntlmssp_ntlmssp_AvValue_valMsvAvDnsTreeName_AvDnsTreeName,
-         { "Avdnstreename", "ntlmssp.ntlmssp_AvValue_valMsvAvDnsTreeName.AvDnsTreeName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_OEM_WORKSTATION_SUPPLIED,
          { "Ntlmssp Negotiate Oem Workstation Supplied", "ntlmssp.NEGOTIATE.NTLMSSP_NEGOTIATE_OEM_WORKSTATION_SUPPLIED", FT_BOOLEAN, 32, TFS(&NEGOTIATE_NTLMSSP_NEGOTIATE_OEM_WORKSTATION_SUPPLIED_tfs), ( 0x00002000 ), NULL, HFILL }},
        { &hf_ntlmssp_NTLMSSP_MESSAGE_SIGNATURE_Checksum,
@@ -3320,8 +3322,8 @@ void proto_register_dcerpc_ntlmssp(void)
          { "Resptype", "ntlmssp.NTLMv2_CLIENT_CHALLENGE.RespType", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_AUTHENTICATE_MESSAGE_UserNameMaxLen,
          { "Usernamemaxlen", "ntlmssp.AUTHENTICATE_MESSAGE.UserNameMaxLen", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_ntlmssp_ntlmssp_LM_RESPONSE_val24_v1,
-         { "V1", "ntlmssp.ntlmssp_LM_RESPONSE_val24.v1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_ntlmssp_ntlmssp_Version_version,
+         { "Version", "ntlmssp.ntlmssp_Version.version", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_CHALLENGE_MESSAGE_TargetNameLen,
          { "Targetnamelen", "ntlmssp.CHALLENGE_MESSAGE.TargetNameLen", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_MESSAGE_DomainNameMaxLen,
@@ -3332,24 +3334,18 @@ void proto_register_dcerpc_ntlmssp(void)
          { "Encryptedrandomsessionkeymaxlen", "ntlmssp.AUTHENTICATE_MESSAGE.EncryptedRandomSessionKeyMaxLen", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_MESSAGE_MessageType,
          { "Messagetype", "ntlmssp.NEGOTIATE_MESSAGE.MessageType", FT_UINT32, BASE_DEC, VALS(ntlmssp_ntlmssp_MessageType_vals), 0, NULL, HFILL }},
-       { &hf_ntlmssp_ntlmssp_AvValue_valMsvAvTargetName_AvTargetName,
-         { "Avtargetname", "ntlmssp.ntlmssp_AvValue_valMsvAvTargetName.AvTargetName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_ntlmssp_ntlmssp_AvValue_AvNbDomainName,
+         { "Avnbdomainname", "ntlmssp.ntlmssp_AvValue.AvNbDomainName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_ntlmssp_AvFlags_NTLMSSP_AVFLAG_MIC_IN_AUTHENTICATE_MESSAGE,
          { "Ntlmssp Avflag Mic In Authenticate Message", "ntlmssp.ntlmssp_AvFlags.NTLMSSP_AVFLAG_MIC_IN_AUTHENTICATE_MESSAGE", FT_BOOLEAN, 32, TFS(&ntlmssp_AvFlags_NTLMSSP_AVFLAG_MIC_IN_AUTHENTICATE_MESSAGE_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_VERSION,
          { "Ntlmssp Negotiate Version", "ntlmssp.NEGOTIATE.NTLMSSP_NEGOTIATE_VERSION", FT_BOOLEAN, 32, TFS(&NEGOTIATE_NTLMSSP_NEGOTIATE_VERSION_tfs), ( 0x02000000 ), NULL, HFILL }},
        { &hf_ntlmssp_CHALLENGE_MESSAGE_TargetName_,
          { "Subcontext length", "ntlmssp.CHALLENGE_MESSAGE.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_ntlmssp_ntlmssp_AvValue_valMsvChannelBindings_ChannelBindings,
-         { "Channelbindings", "ntlmssp.ntlmssp_AvValue_valMsvChannelBindings.ChannelBindings", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_NTLMSSP_REQUEST_TARGET,
          { "Ntlmssp Request Target", "ntlmssp.NEGOTIATE.NTLMSSP_REQUEST_TARGET", FT_BOOLEAN, 32, TFS(&NEGOTIATE_NTLMSSP_REQUEST_TARGET_tfs), ( 0x00000004 ), NULL, HFILL }},
-       { &hf_ntlmssp_ntlmssp_Version_valNTLMSSP_NEGOTIATE_VERSION_version,
-         { "Version", "ntlmssp.ntlmssp_Version_valNTLMSSP_NEGOTIATE_VERSION.version", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_AUTHENTICATE_MESSAGE_Workstation_,
          { "Subcontext length", "ntlmssp.AUTHENTICATE_MESSAGE.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_ntlmssp_ntlmssp_AvValue_valMsvAvDnsComputerName_AvDnsComputerName,
-         { "Avdnscomputername", "ntlmssp.ntlmssp_AvValue_valMsvAvDnsComputerName.AvDnsComputerName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_AUTHENTICATE_MESSAGE_DomainNameMaxLen,
          { "Domainnamemaxlen", "ntlmssp.AUTHENTICATE_MESSAGE.DomainNameMaxLen", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_NTLMSSP_TARGET_TYPE_DOMAIN,
@@ -3358,6 +3354,8 @@ void proto_register_dcerpc_ntlmssp(void)
          { "Challenge", "ntlmssp.decode_CHALLENGE_MESSAGE.challenge", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_AUTHENTICATE_MESSAGE_UserName_,
          { "Subcontext length", "ntlmssp.AUTHENTICATE_MESSAGE.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_ntlmssp_ntlmssp_LM_RESPONSE_v1,
+         { "V1", "ntlmssp.ntlmssp_LM_RESPONSE.v1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_CHALLENGE_MESSAGE_TargetName,
          { "Targetname", "ntlmssp.CHALLENGE_MESSAGE.TargetName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NTLMv2_CLIENT_CHALLENGE_Reserved2,
@@ -3366,6 +3364,8 @@ void proto_register_dcerpc_ntlmssp(void)
          { "Ntlmssp Negotiate This Is Local Call", "ntlmssp.NEGOTIATE.NTLMSSP_NEGOTIATE_THIS_IS_LOCAL_CALL", FT_BOOLEAN, 32, TFS(&NEGOTIATE_NTLMSSP_NEGOTIATE_THIS_IS_LOCAL_CALL_tfs), ( 0x00004000 ), NULL, HFILL }},
        { &hf_ntlmssp_AUTHENTICATE_MESSAGE_MessageType,
          { "Messagetype", "ntlmssp.AUTHENTICATE_MESSAGE.MessageType", FT_UINT32, BASE_DEC, VALS(ntlmssp_ntlmssp_MessageType_vals), 0, NULL, HFILL }},
+       { &hf_ntlmssp_ntlmssp_NTLM_RESPONSE_v2,
+         { "V2", "ntlmssp.ntlmssp_NTLM_RESPONSE.v2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_AUTHENTICATE_MESSAGE_WorkstationLen,
          { "Workstationlen", "ntlmssp.AUTHENTICATE_MESSAGE.WorkstationLen", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NTLMSSP_MESSAGE_SIGNATURE_Version,
@@ -3384,6 +3384,8 @@ void proto_register_dcerpc_ntlmssp(void)
          { "Lmchallengeresponsemaxlen", "ntlmssp.AUTHENTICATE_MESSAGE.LmChallengeResponseMaxLen", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_AV_PAIR_AvId,
          { "Avid", "ntlmssp.AV_PAIR.AvId", FT_UINT1632, BASE_DEC, VALS(ntlmssp_ntlmssp_AvId_vals), 0, NULL, HFILL }},
+       { &hf_ntlmssp_ntlmssp_AvValue_blob,
+         { "Blob", "ntlmssp.ntlmssp_AvValue.blob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_CHALLENGE_MESSAGE_ServerChallenge,
          { "Serverchallenge", "ntlmssp.CHALLENGE_MESSAGE.ServerChallenge", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_NT_ONLY,
@@ -3410,16 +3412,18 @@ void proto_register_dcerpc_ntlmssp(void)
          { "Negotiate", "ntlmssp.decode_NEGOTIATE_MESSAGE.negotiate", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_AUTHENTICATE_MESSAGE_UserName,
          { "Username", "ntlmssp.AUTHENTICATE_MESSAGE.UserName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_ntlmssp_ntlmssp_AvValue_AvFlags,
+         { "Avflags", "ntlmssp.ntlmssp_AvValue.AvFlags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_CHALLENGE_MESSAGE_Signature,
          { "Signature", "ntlmssp.CHALLENGE_MESSAGE.Signature", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NTLMSSP_MESSAGE_SIGNATURE_NTLMv2_Version,
          { "Version", "ntlmssp.NTLMSSP_MESSAGE_SIGNATURE_NTLMv2.Version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_Restriction_Encoding_Z4,
          { "Z4", "ntlmssp.Restriction_Encoding.Z4", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_ntlmssp_ntlmssp_AvValue_AvDnsTreeName,
+         { "Avdnstreename", "ntlmssp.ntlmssp_AvValue.AvDnsTreeName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_AUTHENTICATE_MESSAGE_EncryptedRandomSessionKey,
          { "Encryptedrandomsessionkey", "ntlmssp.AUTHENTICATE_MESSAGE.EncryptedRandomSessionKey", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_ntlmssp_ntlmssp_AvValue_valMsvAvFlags_AvFlags,
-         { "Avflags", "ntlmssp.ntlmssp_AvValue_valMsvAvFlags.AvFlags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_AUTHENTICATE_MESSAGE_NtChallengeResponseLen,
          { "Ntchallengeresponselen", "ntlmssp.AUTHENTICATE_MESSAGE.NtChallengeResponseLen", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NTLMSSP_MESSAGE_SIGNATURE_SeqNum,
@@ -3436,6 +3440,8 @@ void proto_register_dcerpc_ntlmssp(void)
          { "Domainnamelen", "ntlmssp.AUTHENTICATE_MESSAGE.DomainNameLen", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_MESSAGE_Signature,
          { "Signature", "ntlmssp.NEGOTIATE_MESSAGE.Signature", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_ntlmssp_ntlmssp_AvValue_AvRestrictions,
+         { "Avrestrictions", "ntlmssp.ntlmssp_AvValue.AvRestrictions", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_MIC_MIC,
          { "Mic", "ntlmssp.MIC.MIC", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_AV_PAIR_Value_,
@@ -3450,20 +3456,18 @@ void proto_register_dcerpc_ntlmssp(void)
          { "Challengefromclient", "ntlmssp.NTLMv2_CLIENT_CHALLENGE.ChallengeFromClient", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_ntlmssp_AvFlags_NTLMSSP_AVFLAG_CONSTRAINTED_ACCOUNT,
          { "Ntlmssp Avflag Constrainted Account", "ntlmssp.ntlmssp_AvFlags.NTLMSSP_AVFLAG_CONSTRAINTED_ACCOUNT", FT_BOOLEAN, 32, TFS(&ntlmssp_AvFlags_NTLMSSP_AVFLAG_CONSTRAINTED_ACCOUNT_tfs), ( 0x00000001 ), NULL, HFILL }},
-       { &hf_ntlmssp_ntlmssp_AvValue_valdefault_blob,
-         { "Blob", "ntlmssp.ntlmssp_AvValue_valdefault.blob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_NTLMSSP_ANONYMOUS,
          { "Ntlmssp Anonymous", "ntlmssp.NEGOTIATE.NTLMSSP_ANONYMOUS", FT_BOOLEAN, 32, TFS(&NEGOTIATE_NTLMSSP_ANONYMOUS_tfs), ( 0x00000800 ), NULL, HFILL }},
        { &hf_ntlmssp_NTLMSSP_MESSAGE_SIGNATURE_RandomPad,
          { "Randompad", "ntlmssp.NTLMSSP_MESSAGE_SIGNATURE.RandomPad", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_ntlmssp_ntlmssp_NTLM_RESPONSE_val0x18_v1,
-         { "V1", "ntlmssp.ntlmssp_NTLM_RESPONSE_val0x18.v1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_AUTHENTICATE_MESSAGE_NegotiateFlags,
          { "Negotiateflags", "ntlmssp.AUTHENTICATE_MESSAGE.NegotiateFlags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_NTLMSSP_TARGET_TYPE_SHARE,
          { "Ntlmssp Target Type Share", "ntlmssp.NEGOTIATE.NTLMSSP_TARGET_TYPE_SHARE", FT_BOOLEAN, 32, TFS(&NEGOTIATE_NTLMSSP_TARGET_TYPE_SHARE_tfs), ( 0x00040000 ), NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_MESSAGE_Workstation_,
          { "Subcontext length", "ntlmssp.NEGOTIATE_MESSAGE.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_ntlmssp_ntlmssp_NTLM_RESPONSE_v1,
+         { "V1", "ntlmssp.ntlmssp_NTLM_RESPONSE.v1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_MESSAGE_Version,
          { "Version", "ntlmssp.NEGOTIATE_MESSAGE.Version", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_LM_KEY,
@@ -3484,12 +3488,10 @@ void proto_register_dcerpc_ntlmssp(void)
          { "Productbuild", "ntlmssp.ntlmssp_VERSION.ProductBuild", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_DATAGRAM,
          { "Ntlmssp Negotiate Datagram", "ntlmssp.NEGOTIATE.NTLMSSP_NEGOTIATE_DATAGRAM", FT_BOOLEAN, 32, TFS(&NEGOTIATE_NTLMSSP_NEGOTIATE_DATAGRAM_tfs), ( 0x00000040 ), NULL, HFILL }},
-       { &hf_ntlmssp_ntlmssp_AvValue_valMsvAvNbDomainName_AvNbDomainName,
-         { "Avnbdomainname", "ntlmssp.ntlmssp_AvValue_valMsvAvNbDomainName.AvNbDomainName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_ntlmssp_ntlmssp_AvValue_valMsvAvNbComputerName_AvNbComputerName,
-         { "Avnbcomputername", "ntlmssp.ntlmssp_AvValue_valMsvAvNbComputerName.AvNbComputerName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_AUTHENTICATE_MESSAGE_DomainName,
          { "Domainname", "ntlmssp.AUTHENTICATE_MESSAGE.DomainName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_ntlmssp_ntlmssp_AvValue_AvDnsComputerName,
+         { "Avdnscomputername", "ntlmssp.ntlmssp_AvValue.AvDnsComputerName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_128,
          { "Ntlmssp Negotiate 128", "ntlmssp.NEGOTIATE.NTLMSSP_NEGOTIATE_128", FT_BOOLEAN, 32, TFS(&NEGOTIATE_NTLMSSP_NEGOTIATE_128_tfs), ( 0x20000000 ), NULL, HFILL }},
        { &hf_ntlmssp_NTLMv2_CLIENT_CHALLENGE_Reserved3,
@@ -3510,6 +3512,8 @@ void proto_register_dcerpc_ntlmssp(void)
          { "Ntlmssp Negotiate Extended Sessionsecurity", "ntlmssp.NEGOTIATE.NTLMSSP_NEGOTIATE_EXTENDED_SESSIONSECURITY", FT_BOOLEAN, 32, TFS(&NEGOTIATE_NTLMSSP_NEGOTIATE_EXTENDED_SESSIONSECURITY_tfs), ( 0x00080000 ), NULL, HFILL }},
        { &hf_ntlmssp_CHALLENGE_MESSAGE_NegotiateFlags,
          { "Negotiateflags", "ntlmssp.CHALLENGE_MESSAGE.NegotiateFlags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_ntlmssp_ntlmssp_AvValue_AvTargetName,
+         { "Avtargetname", "ntlmssp.ntlmssp_AvValue.AvTargetName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_NTLMSSP_TARGET_TYPE_SERVER,
          { "Ntlmssp Target Type Server", "ntlmssp.NEGOTIATE.NTLMSSP_TARGET_TYPE_SERVER", FT_BOOLEAN, 32, TFS(&NEGOTIATE_NTLMSSP_TARGET_TYPE_SERVER_tfs), ( 0x00020000 ), NULL, HFILL }},
        { &hf_ntlmssp_NEGOTIATE_NTLMSSP_NEGOTIATE_OEM_DOMAIN_SUPPLIED,
@@ -3534,14 +3538,10 @@ void proto_register_dcerpc_ntlmssp(void)
          { "Productmajorversion", "ntlmssp.ntlmssp_VERSION.ProductMajorVersion", FT_UINT8, BASE_DEC, VALS(ntlmssp_ntlmssp_WindowsMajorVersion_vals), 0, NULL, HFILL }},
        { &hf_ntlmssp_AUTHENTICATE_MESSAGE_Workstation,
          { "Workstation", "ntlmssp.AUTHENTICATE_MESSAGE.Workstation", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_ntlmssp_ntlmssp_AvValue_valMsvAvDnsDomainName_AvDnsDomainName,
-         { "Avdnsdomainname", "ntlmssp.ntlmssp_AvValue_valMsvAvDnsDomainName.AvDnsDomainName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_ntlmssp_ntlmssp_AvValue_AvDnsDomainName,
+         { "Avdnsdomainname", "ntlmssp.ntlmssp_AvValue.AvDnsDomainName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ntlmssp_NTLMv2_CLIENT_CHALLENGE_TimeStamp,
          { "Timestamp", "ntlmssp.NTLMv2_CLIENT_CHALLENGE.TimeStamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
-       { &hf_ntlmssp_ntlmssp_AvValue_valMsAvRestrictions_AvRestrictions,
-         { "Avrestrictions", "ntlmssp.ntlmssp_AvValue_valMsAvRestrictions.AvRestrictions", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_ntlmssp_ntlmssp_AvValue_valMsvAvTimestamp_AvTimestamp,
-         { "Avtimestamp", "ntlmssp.ntlmssp_AvValue_valMsvAvTimestamp.AvTimestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        };
 
 

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-orpc.c b/bin/default/librpc/gen_ndr/packet-dcerpc-orpc.c
index e12758d24e3efe33ebb3f53f453fde18fcfafb4f..bf31af8cf04c290d071d0ad5f55e6c020a692c8b 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-orpc.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-orpc.c
@@ -59,7 +59,6 @@ static gint hf_ObjectRpcBaseTypes_SECURITYBINDING_PrincName = -1;
 static gint hf_ObjectRpcBaseTypes_ORPC_FLAGS_ORPCF_RESERVED2 = -1;
 static gint hf_ObjectRpcBaseTypes_u_standard_saResAddr = -1;
 static gint hf_ObjectRpcBaseTypes_STDOBJREF_ipid = -1;
-static gint hf_ObjectRpcBaseTypes_OBJREF_Types_valOBJREF_HANDLER_u_handler = -1;
 static gint hf_ObjectRpcBaseTypes_STDOBJREF_FLAGS_SORF_OXRES5 = -1;
 static gint hf_ObjectRpcBaseTypes_STDOBJREF_FLAGS_SORF_OXRES2 = -1;
 static gint hf_ObjectRpcBaseTypes_ORPCTHAT_flags = -1;
@@ -67,8 +66,8 @@ static gint hf_ObjectRpcBaseTypes_MInterfacePointer_obj = -1;
 static gint hf_ObjectRpcBaseTypes_STRINGBINDING_NetworkAddr = -1;
 static gint hf_ObjectRpcBaseTypes_MInterfacePointer_obj_ = -1;
 static gint hf_ObjectRpcBaseTypes_ORPCTHIS_reserved1 = -1;
-static gint hf_ObjectRpcBaseTypes_OBJREF_Types_valOBJREF_NULL_u_null = -1;
 static gint hf_ObjectRpcBaseTypes_OBJREF_u_objref = -1;
+static gint hf_ObjectRpcBaseTypes_OBJREF_Types_u_standard = -1;
 static gint hf_ObjectRpcBaseTypes_ORPC_FLAGS_ORPCF_LOCAL = -1;
 static gint hf_ObjectRpcBaseTypes_STDOBJREF_FLAGS_SORF_NOPING = -1;
 static gint hf_ObjectRpcBaseTypes_STDOBJREF_FLAGS_SORF_OXRES3 = -1;
@@ -79,11 +78,11 @@ static gint hf_ObjectRpcBaseTypes_STRINGARRAY_stringbindings = -1;
 static gint hf_ObjectRpcBaseTypes_STDOBJREF_FLAGS_SORF_OXRES8 = -1;
 static gint hf_ObjectRpcBaseTypes_STDOBJREF_cPublicRefs = -1;
 static gint hf_ObjectRpcBaseTypes_STDOBJREF_FLAGS_SORF_OXRES6 = -1;
+static gint hf_ObjectRpcBaseTypes_OBJREF_Types_u_null = -1;
 static gint hf_ObjectRpcBaseTypes_u_standard_std = -1;
 static gint hf_ObjectRpcBaseTypes_ORPCTHIS_flags = -1;
 static gint hf_ObjectRpcBaseTypes_SECURITYBINDING_wAuthzSvc = -1;
 static gint hf_ObjectRpcBaseTypes_SECURITYBINDING_wAuthnSvc = -1;
-static gint hf_ObjectRpcBaseTypes_OBJREF_Types_valOBJREF_CUSTOM_u_custom = -1;
 static gint hf_ObjectRpcBaseTypes_ORPCTHIS_extensions = -1;
 static gint hf_ObjectRpcBaseTypes_DUALSTRINGARRAY_securitybindings = -1;
 static gint hf_ObjectRpcBaseTypes_ORPC_EXTENT_ARRAY_size = -1;
@@ -93,11 +92,12 @@ static gint hf_ObjectRpcBaseTypes_OBJREF_flags = -1;
 static gint hf_ObjectRpcBaseTypes_STDOBJREF_FLAGS_SORF_NULL = -1;
 static gint hf_ObjectRpcBaseTypes_ORPC_FLAGS_ORPCF_RESERVED4 = -1;
 static gint hf_ObjectRpcBaseTypes_ORPC_EXTENT_size = -1;
+static gint hf_ObjectRpcBaseTypes_OBJREF_Types_u_handler = -1;
 static gint hf_ObjectRpcBaseTypes_u_custom_cbExtension = -1;
 static gint hf_ObjectRpcBaseTypes_opnum = -1;
 static gint hf_ObjectRpcBaseTypes_u_handler_clsid = -1;
 static gint hf_ObjectRpcBaseTypes_OBJREF_signature = -1;
-static gint hf_ObjectRpcBaseTypes_OBJREF_Types_valOBJREF_STANDARD_u_standard = -1;
+static gint hf_ObjectRpcBaseTypes_OBJREF_Types_u_custom = -1;
 static gint hf_ObjectRpcBaseTypes_ORPC_EXTENT_ARRAY_extent = -1;
 static gint hf_ObjectRpcBaseTypes_ORPC_EXTENT_id = -1;
 static gint hf_ObjectRpcBaseTypes_u_custom_size = -1;
@@ -249,10 +249,10 @@ static int ObjectRpcBaseTypes_dissect_element_u_custom_cbExtension(tvbuff_t *tvb
 static int ObjectRpcBaseTypes_dissect_element_u_custom_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ObjectRpcBaseTypes_dissect_element_u_custom_pData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ObjectRpcBaseTypes_dissect_element_u_custom_pData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ObjectRpcBaseTypes_dissect_element_OBJREF_Types_valOBJREF_NULL_u_null(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ObjectRpcBaseTypes_dissect_element_OBJREF_Types_valOBJREF_STANDARD_u_standard(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ObjectRpcBaseTypes_dissect_element_OBJREF_Types_valOBJREF_HANDLER_u_handler(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ObjectRpcBaseTypes_dissect_element_OBJREF_Types_valOBJREF_CUSTOM_u_custom(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ObjectRpcBaseTypes_dissect_element_OBJREF_Types_u_null(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ObjectRpcBaseTypes_dissect_element_OBJREF_Types_u_standard(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ObjectRpcBaseTypes_dissect_element_OBJREF_Types_u_handler(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int ObjectRpcBaseTypes_dissect_element_OBJREF_Types_u_custom(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ObjectRpcBaseTypes_dissect_element_OBJREF_signature(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ObjectRpcBaseTypes_dissect_element_OBJREF_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *flags);
 static int ObjectRpcBaseTypes_dissect_element_OBJREF_iid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1461,33 +1461,33 @@ ObjectRpcBaseTypes_dissect_struct_u_null(tvbuff_t *tvb _U_, int offset _U_, pack
 /* IDL: } */
 
 static int
-ObjectRpcBaseTypes_dissect_element_OBJREF_Types_valOBJREF_NULL_u_null(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ObjectRpcBaseTypes_dissect_element_OBJREF_Types_u_null(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = ObjectRpcBaseTypes_dissect_struct_u_null(tvb,offset,pinfo,tree,drep,hf_ObjectRpcBaseTypes_OBJREF_Types_valOBJREF_NULL_u_null,0);
+       offset = ObjectRpcBaseTypes_dissect_struct_u_null(tvb,offset,pinfo,tree,drep,hf_ObjectRpcBaseTypes_OBJREF_Types_u_null,0);
 
        return offset;
 }
 
 static int
-ObjectRpcBaseTypes_dissect_element_OBJREF_Types_valOBJREF_STANDARD_u_standard(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ObjectRpcBaseTypes_dissect_element_OBJREF_Types_u_standard(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = ObjectRpcBaseTypes_dissect_struct_u_standard(tvb,offset,pinfo,tree,drep,hf_ObjectRpcBaseTypes_OBJREF_Types_valOBJREF_STANDARD_u_standard,0);
+       offset = ObjectRpcBaseTypes_dissect_struct_u_standard(tvb,offset,pinfo,tree,drep,hf_ObjectRpcBaseTypes_OBJREF_Types_u_standard,0);
 
        return offset;
 }
 
 static int
-ObjectRpcBaseTypes_dissect_element_OBJREF_Types_valOBJREF_HANDLER_u_handler(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ObjectRpcBaseTypes_dissect_element_OBJREF_Types_u_handler(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = ObjectRpcBaseTypes_dissect_struct_u_handler(tvb,offset,pinfo,tree,drep,hf_ObjectRpcBaseTypes_OBJREF_Types_valOBJREF_HANDLER_u_handler,0);
+       offset = ObjectRpcBaseTypes_dissect_struct_u_handler(tvb,offset,pinfo,tree,drep,hf_ObjectRpcBaseTypes_OBJREF_Types_u_handler,0);
 
        return offset;
 }
 
 static int
-ObjectRpcBaseTypes_dissect_element_OBJREF_Types_valOBJREF_CUSTOM_u_custom(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+ObjectRpcBaseTypes_dissect_element_OBJREF_Types_u_custom(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = ObjectRpcBaseTypes_dissect_struct_u_custom(tvb,offset,pinfo,tree,drep,hf_ObjectRpcBaseTypes_OBJREF_Types_valOBJREF_CUSTOM_u_custom,0);
+       offset = ObjectRpcBaseTypes_dissect_struct_u_custom(tvb,offset,pinfo,tree,drep,hf_ObjectRpcBaseTypes_OBJREF_Types_u_custom,0);
 
        return offset;
 }
@@ -1508,19 +1508,19 @@ ObjectRpcBaseTypes_dissect_OBJREF_Types(tvbuff_t *tvb _U_, int offset _U_, packe
 
        switch(level) {
                case OBJREF_NULL:
-                       offset = ObjectRpcBaseTypes_dissect_element_OBJREF_Types_valOBJREF_NULL_u_null(tvb, offset, pinfo, tree, drep);
+                       offset = ObjectRpcBaseTypes_dissect_element_OBJREF_Types_u_null(tvb, offset, pinfo, tree, drep);
                break;
 
                case OBJREF_STANDARD:
-                       offset = ObjectRpcBaseTypes_dissect_element_OBJREF_Types_valOBJREF_STANDARD_u_standard(tvb, offset, pinfo, tree, drep);
+                       offset = ObjectRpcBaseTypes_dissect_element_OBJREF_Types_u_standard(tvb, offset, pinfo, tree, drep);
                break;
 
                case OBJREF_HANDLER:
-                       offset = ObjectRpcBaseTypes_dissect_element_OBJREF_Types_valOBJREF_HANDLER_u_handler(tvb, offset, pinfo, tree, drep);
+                       offset = ObjectRpcBaseTypes_dissect_element_OBJREF_Types_u_handler(tvb, offset, pinfo, tree, drep);
                break;
 
                case OBJREF_CUSTOM:
-                       offset = ObjectRpcBaseTypes_dissect_element_OBJREF_Types_valOBJREF_CUSTOM_u_custom(tvb, offset, pinfo, tree, drep);
+                       offset = ObjectRpcBaseTypes_dissect_element_OBJREF_Types_u_custom(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -1730,8 +1730,6 @@ void proto_register_dcerpc_ObjectRpcBaseTypes(void)
          { "Saresaddr", "ObjectRpcBaseTypes.u_standard.saResAddr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_STDOBJREF_ipid,
          { "Ipid", "ObjectRpcBaseTypes.STDOBJREF.ipid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_ObjectRpcBaseTypes_OBJREF_Types_valOBJREF_HANDLER_u_handler,
-         { "U Handler", "ObjectRpcBaseTypes.OBJREF_Types_valOBJREF_HANDLER.u_handler", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_STDOBJREF_FLAGS_SORF_OXRES5,
          { "Sorf Oxres5", "ObjectRpcBaseTypes.STDOBJREF_FLAGS.SORF_OXRES5", FT_BOOLEAN, 32, TFS(&STDOBJREF_FLAGS_SORF_OXRES5_tfs), ( 0x0100 ), NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_STDOBJREF_FLAGS_SORF_OXRES2,
@@ -1746,10 +1744,10 @@ void proto_register_dcerpc_ObjectRpcBaseTypes(void)
          { "Subcontext length", "ObjectRpcBaseTypes.MInterfacePointer.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_ORPCTHIS_reserved1,
          { "Reserved1", "ObjectRpcBaseTypes.ORPCTHIS.reserved1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_ObjectRpcBaseTypes_OBJREF_Types_valOBJREF_NULL_u_null,
-         { "U Null", "ObjectRpcBaseTypes.OBJREF_Types_valOBJREF_NULL.u_null", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_OBJREF_u_objref,
          { "U Objref", "ObjectRpcBaseTypes.OBJREF.u_objref", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_ObjectRpcBaseTypes_OBJREF_Types_u_standard,
+         { "U Standard", "ObjectRpcBaseTypes.OBJREF_Types.u_standard", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_ORPC_FLAGS_ORPCF_LOCAL,
          { "Orpcf Local", "ObjectRpcBaseTypes.ORPC_FLAGS.ORPCF_LOCAL", FT_BOOLEAN, 32, TFS(&ORPC_FLAGS_ORPCF_LOCAL_tfs), ( 0x01 ), NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_STDOBJREF_FLAGS_SORF_NOPING,
@@ -1770,6 +1768,8 @@ void proto_register_dcerpc_ObjectRpcBaseTypes(void)
          { "Cpublicrefs", "ObjectRpcBaseTypes.STDOBJREF.cPublicRefs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_STDOBJREF_FLAGS_SORF_OXRES6,
          { "Sorf Oxres6", "ObjectRpcBaseTypes.STDOBJREF_FLAGS.SORF_OXRES6", FT_BOOLEAN, 32, TFS(&STDOBJREF_FLAGS_SORF_OXRES6_tfs), ( 0x0200 ), NULL, HFILL }},
+       { &hf_ObjectRpcBaseTypes_OBJREF_Types_u_null,
+         { "U Null", "ObjectRpcBaseTypes.OBJREF_Types.u_null", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_u_standard_std,
          { "Std", "ObjectRpcBaseTypes.u_standard.std", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_ORPCTHIS_flags,
@@ -1778,8 +1778,6 @@ void proto_register_dcerpc_ObjectRpcBaseTypes(void)
          { "Wauthzsvc", "ObjectRpcBaseTypes.SECURITYBINDING.wAuthzSvc", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_SECURITYBINDING_wAuthnSvc,
          { "Wauthnsvc", "ObjectRpcBaseTypes.SECURITYBINDING.wAuthnSvc", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_ObjectRpcBaseTypes_OBJREF_Types_valOBJREF_CUSTOM_u_custom,
-         { "U Custom", "ObjectRpcBaseTypes.OBJREF_Types_valOBJREF_CUSTOM.u_custom", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_ORPCTHIS_extensions,
          { "Extensions", "ObjectRpcBaseTypes.ORPCTHIS.extensions", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_DUALSTRINGARRAY_securitybindings,
@@ -1798,6 +1796,8 @@ void proto_register_dcerpc_ObjectRpcBaseTypes(void)
          { "Orpcf Reserved4", "ObjectRpcBaseTypes.ORPC_FLAGS.ORPCF_RESERVED4", FT_BOOLEAN, 32, TFS(&ORPC_FLAGS_ORPCF_RESERVED4_tfs), ( 0x10 ), NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_ORPC_EXTENT_size,
          { "Size", "ObjectRpcBaseTypes.ORPC_EXTENT.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_ObjectRpcBaseTypes_OBJREF_Types_u_handler,
+         { "U Handler", "ObjectRpcBaseTypes.OBJREF_Types.u_handler", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_u_custom_cbExtension,
          { "Cbextension", "ObjectRpcBaseTypes.u_custom.cbExtension", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_opnum,
@@ -1806,8 +1806,8 @@ void proto_register_dcerpc_ObjectRpcBaseTypes(void)
          { "Clsid", "ObjectRpcBaseTypes.u_handler.clsid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_OBJREF_signature,
          { "Signature", "ObjectRpcBaseTypes.OBJREF.signature", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_ObjectRpcBaseTypes_OBJREF_Types_valOBJREF_STANDARD_u_standard,
-         { "U Standard", "ObjectRpcBaseTypes.OBJREF_Types_valOBJREF_STANDARD.u_standard", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_ObjectRpcBaseTypes_OBJREF_Types_u_custom,
+         { "U Custom", "ObjectRpcBaseTypes.OBJREF_Types.u_custom", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_ORPC_EXTENT_ARRAY_extent,
          { "Extent", "ObjectRpcBaseTypes.ORPC_EXTENT_ARRAY.extent", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_ObjectRpcBaseTypes_ORPC_EXTENT_id,

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

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-schannel.c b/bin/default/librpc/gen_ndr/packet-dcerpc-schannel.c
index d0425228e873dc72807a75e2da0c08a779300747..7b471d76e68e36560eae93801aa22b2de4f73bdb 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-schannel.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-schannel.c
@@ -42,9 +42,10 @@ static gint ett_schannel_NL_AUTH_SHA2_SIGNATURE = -1;
 /* Header field declarations */
 static gint hf_schannel_NL_AUTH_SHA2_SIGNATURE_SequenceNumber = -1;
 static gint hf_schannel_NL_AUTH_SHA2_SIGNATURE_SignatureAlgorithm = -1;
+static gint hf_schannel_NL_AUTH_MESSAGE_BUFFER_REPLY_dummy = -1;
 static gint hf_schannel_NL_AUTH_MESSAGE_oem_netbios_computer = -1;
+static gint hf_schannel_NL_AUTH_MESSAGE_BUFFER_a = -1;
 static gint hf_schannel_NL_AUTH_MESSAGE_FLAGS_NL_FLAG_UTF8_NETBIOS_COMPUTER_NAME = -1;
-static gint hf_schannel_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_OEM_NETBIOS_COMPUTER_NAME_a = -1;
 static gint hf_schannel_NL_AUTH_SIGNATURE_Pad = -1;
 static gint hf_schannel_NL_AUTH_SIGNATURE_Confounder = -1;
 static gint hf_schannel_NL_AUTH_SIGNATURE_SignatureAlgorithm = -1;
@@ -54,7 +55,6 @@ static gint hf_schannel_NL_AUTH_MESSAGE_Buffer = -1;
 static gint hf_schannel_NL_AUTH_MESSAGE_utf8_dns_domain = -1;
 static gint hf_schannel_netlogon_creds_CredentialState_sequence = -1;
 static gint hf_schannel_NL_AUTH_MESSAGE_FLAGS_NL_FLAG_OEM_NETBIOS_COMPUTER_NAME = -1;
-static gint hf_schannel_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_DNS_DOMAIN_NAME_u = -1;
 static gint hf_schannel_netlogon_creds_CredentialState_seed = -1;
 static gint hf_schannel_NL_AUTH_MESSAGE_FLAGS_NL_FLAG_OEM_NETBIOS_DOMAIN_NAME = -1;
 static gint hf_schannel_netlogon_creds_CredentialState_negotiate_flags = -1;
@@ -62,19 +62,17 @@ static gint hf_schannel_NL_AUTH_SHA2_SIGNATURE_Confounder = -1;
 static gint hf_schannel_NL_AUTH_MESSAGE_oem_netbios_domain = -1;
 static gint hf_schannel_netlogon_creds_CredentialState_session_key = -1;
 static gint hf_schannel_NL_AUTH_MESSAGE_utf8_netbios_computer = -1;
-static gint hf_schannel_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_OEM_NETBIOS_DOMAIN_NAME_a = -1;
 static gint hf_schannel_NL_AUTH_SIGNATURE_SequenceNumber = -1;
 static gint hf_schannel_netlogon_creds_CredentialState_client = -1;
 static gint hf_schannel_opnum = -1;
-static gint hf_schannel_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_NETBIOS_COMPUTER_NAME_u = -1;
 static gint hf_schannel_NL_AUTH_SIGNATURE_SealAlgorithm = -1;
 static gint hf_schannel_NL_AUTH_SHA2_SIGNATURE_Pad = -1;
 static gint hf_schannel_netlogon_creds_CredentialState_account_name = -1;
 static gint hf_schannel_NL_AUTH_MESSAGE_Flags = -1;
+static gint hf_schannel_NL_AUTH_MESSAGE_BUFFER_u = -1;
 static gint hf_schannel_NL_AUTH_MESSAGE_utf8_dns_host = -1;
 static gint hf_schannel_netlogon_creds_CredentialState_server = -1;
 static gint hf_schannel_NL_AUTH_MESSAGE_FLAGS_NL_FLAG_UTF8_DNS_DOMAIN_NAME = -1;
-static gint hf_schannel_NL_AUTH_MESSAGE_BUFFER_REPLY_valNL_NEGOTIATE_RESPONSE_dummy = -1;
 static gint hf_schannel_NL_AUTH_MESSAGE_MessageType = -1;
 static gint hf_schannel_NL_AUTH_MESSAGE_FLAGS_NL_FLAG_UTF8_DNS_HOST_NAME = -1;
 static gint hf_schannel_NL_AUTH_SHA2_SIGNATURE_SealAlgorithm = -1;
@@ -82,7 +80,6 @@ static gint hf_schannel_netlogon_creds_CredentialState_computer_name = -1;
 static gint hf_schannel_netlogon_creds_CredentialState_secure_channel_type = -1;
 static gint hf_schannel_NL_AUTH_SHA2_SIGNATURE_Checksum = -1;
 static gint hf_schannel_NL_AUTH_SIGNATURE_Checksum = -1;
-static gint hf_schannel_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_DNS_HOST_NAME_u = -1;
 static gint hf_schannel_NL_AUTH_SIGNATURE_Flags = -1;
 
 static gint proto_dcerpc_schannel = -1;
@@ -132,12 +129,12 @@ static const true_false_string NL_AUTH_MESSAGE_FLAGS_NL_FLAG_UTF8_NETBIOS_COMPUT
    "NL_FLAG_UTF8_NETBIOS_COMPUTER_NAME is SET",
    "NL_FLAG_UTF8_NETBIOS_COMPUTER_NAME is NOT SET",
 };
-static int schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_OEM_NETBIOS_DOMAIN_NAME_a(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_OEM_NETBIOS_COMPUTER_NAME_a(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_DNS_DOMAIN_NAME_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_DNS_HOST_NAME_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_NETBIOS_COMPUTER_NAME_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_REPLY_valNL_NEGOTIATE_RESPONSE_dummy(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_a(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_a(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_REPLY_dummy(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int schannel_dissect_element_NL_AUTH_MESSAGE_MessageType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *MessageType);
 static int schannel_dissect_element_NL_AUTH_MESSAGE_Flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int schannel_dissect_element_NL_AUTH_MESSAGE_oem_netbios_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
@@ -453,41 +450,41 @@ schannel_dissect_bitmap_NL_AUTH_MESSAGE_FLAGS(tvbuff_t *tvb _U_, int offset _U_,
 /* IDL: } */
 
 static int
-schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_OEM_NETBIOS_DOMAIN_NAME_a(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_a(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_null_term_string(tvb, offset, pinfo, tree, drep, hf_schannel_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_OEM_NETBIOS_DOMAIN_NAME_a , 0);
+       offset = dissect_null_term_string(tvb, offset, pinfo, tree, drep, hf_schannel_NL_AUTH_MESSAGE_BUFFER_a , 0);
 
        return offset;
 }
 
 static int
-schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_OEM_NETBIOS_COMPUTER_NAME_a(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_a(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_null_term_string(tvb, offset, pinfo, tree, drep, hf_schannel_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_OEM_NETBIOS_COMPUTER_NAME_a , 0);
+       offset = dissect_null_term_string(tvb, offset, pinfo, tree, drep, hf_schannel_NL_AUTH_MESSAGE_BUFFER_a , 0);
 
        return offset;
 }
 
 static int
-schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_DNS_DOMAIN_NAME_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = schannel_dissect_struct_nbt_string(tvb,offset,pinfo,tree,drep,hf_schannel_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_DNS_DOMAIN_NAME_u,0);
+       offset = schannel_dissect_struct_nbt_string(tvb,offset,pinfo,tree,drep,hf_schannel_NL_AUTH_MESSAGE_BUFFER_u,0);
 
        return offset;
 }
 
 static int
-schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_DNS_HOST_NAME_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = schannel_dissect_struct_nbt_string(tvb,offset,pinfo,tree,drep,hf_schannel_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_DNS_HOST_NAME_u,0);
+       offset = schannel_dissect_struct_nbt_string(tvb,offset,pinfo,tree,drep,hf_schannel_NL_AUTH_MESSAGE_BUFFER_u,0);
 
        return offset;
 }
 
 static int
-schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_NETBIOS_COMPUTER_NAME_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = schannel_dissect_struct_nbt_string(tvb,offset,pinfo,tree,drep,hf_schannel_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_NETBIOS_COMPUTER_NAME_u,0);
+       offset = schannel_dissect_struct_nbt_string(tvb,offset,pinfo,tree,drep,hf_schannel_NL_AUTH_MESSAGE_BUFFER_u,0);
 
        return offset;
 }
@@ -508,23 +505,23 @@ schannel_dissect_NL_AUTH_MESSAGE_BUFFER(tvbuff_t *tvb _U_, int offset _U_, packe
 
        switch(level) {
                case NL_FLAG_OEM_NETBIOS_DOMAIN_NAME:
-                       offset = schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_OEM_NETBIOS_DOMAIN_NAME_a(tvb, offset, pinfo, tree, drep);
+                       offset = schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_a(tvb, offset, pinfo, tree, drep);
                break;
 
                case NL_FLAG_OEM_NETBIOS_COMPUTER_NAME:
-                       offset = schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_OEM_NETBIOS_COMPUTER_NAME_a(tvb, offset, pinfo, tree, drep);
+                       offset = schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_a(tvb, offset, pinfo, tree, drep);
                break;
 
                case NL_FLAG_UTF8_DNS_DOMAIN_NAME:
-                       offset = schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_DNS_DOMAIN_NAME_u(tvb, offset, pinfo, tree, drep);
+                       offset = schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_u(tvb, offset, pinfo, tree, drep);
                break;
 
                case NL_FLAG_UTF8_DNS_HOST_NAME:
-                       offset = schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_DNS_HOST_NAME_u(tvb, offset, pinfo, tree, drep);
+                       offset = schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_u(tvb, offset, pinfo, tree, drep);
                break;
 
                case NL_FLAG_UTF8_NETBIOS_COMPUTER_NAME:
-                       offset = schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_NETBIOS_COMPUTER_NAME_u(tvb, offset, pinfo, tree, drep);
+                       offset = schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_u(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -542,9 +539,9 @@ schannel_dissect_NL_AUTH_MESSAGE_BUFFER(tvbuff_t *tvb _U_, int offset _U_, packe
 /* IDL: } */
 
 static int
-schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_REPLY_valNL_NEGOTIATE_RESPONSE_dummy(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_REPLY_dummy(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_schannel_NL_AUTH_MESSAGE_BUFFER_REPLY_valNL_NEGOTIATE_RESPONSE_dummy, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_schannel_NL_AUTH_MESSAGE_BUFFER_REPLY_dummy, 0);
 
        return offset;
 }
@@ -565,7 +562,7 @@ schannel_dissect_NL_AUTH_MESSAGE_BUFFER_REPLY(tvbuff_t *tvb _U_, int offset _U_,
 
        switch(level) {
                case NL_NEGOTIATE_RESPONSE:
-                       offset = schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_REPLY_valNL_NEGOTIATE_RESPONSE_dummy(tvb, offset, pinfo, tree, drep);
+                       offset = schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_REPLY_dummy(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -1040,12 +1037,14 @@ void proto_register_dcerpc_schannel(void)
          { "Sequencenumber", "schannel.NL_AUTH_SHA2_SIGNATURE.SequenceNumber", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_SHA2_SIGNATURE_SignatureAlgorithm,
          { "Signaturealgorithm", "schannel.NL_AUTH_SHA2_SIGNATURE.SignatureAlgorithm", FT_UINT1632, BASE_DEC, VALS(schannel_NL_SIGNATURE_ALGORITHM_vals), 0, NULL, HFILL }},
+       { &hf_schannel_NL_AUTH_MESSAGE_BUFFER_REPLY_dummy,
+         { "Dummy", "schannel.NL_AUTH_MESSAGE_BUFFER_REPLY.dummy", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_MESSAGE_oem_netbios_computer,
          { "Oem Netbios Computer", "schannel.NL_AUTH_MESSAGE.oem_netbios_computer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_schannel_NL_AUTH_MESSAGE_BUFFER_a,
+         { "A", "schannel.NL_AUTH_MESSAGE_BUFFER.a", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_MESSAGE_FLAGS_NL_FLAG_UTF8_NETBIOS_COMPUTER_NAME,
          { "Nl Flag Utf8 Netbios Computer Name", "schannel.NL_AUTH_MESSAGE_FLAGS.NL_FLAG_UTF8_NETBIOS_COMPUTER_NAME", FT_BOOLEAN, 32, TFS(&NL_AUTH_MESSAGE_FLAGS_NL_FLAG_UTF8_NETBIOS_COMPUTER_NAME_tfs), ( 0x00000010 ), NULL, HFILL }},
-       { &hf_schannel_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_OEM_NETBIOS_COMPUTER_NAME_a,
-         { "A", "schannel.NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_OEM_NETBIOS_COMPUTER_NAME.a", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_SIGNATURE_Pad,
          { "Pad", "schannel.NL_AUTH_SIGNATURE.Pad", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_SIGNATURE_Confounder,
@@ -1064,8 +1063,6 @@ void proto_register_dcerpc_schannel(void)
          { "Sequence", "schannel.netlogon_creds_CredentialState.sequence", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_MESSAGE_FLAGS_NL_FLAG_OEM_NETBIOS_COMPUTER_NAME,
          { "Nl Flag Oem Netbios Computer Name", "schannel.NL_AUTH_MESSAGE_FLAGS.NL_FLAG_OEM_NETBIOS_COMPUTER_NAME", FT_BOOLEAN, 32, TFS(&NL_AUTH_MESSAGE_FLAGS_NL_FLAG_OEM_NETBIOS_COMPUTER_NAME_tfs), ( 0x00000002 ), NULL, HFILL }},
-       { &hf_schannel_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_DNS_DOMAIN_NAME_u,
-         { "U", "schannel.NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_DNS_DOMAIN_NAME.u", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_schannel_netlogon_creds_CredentialState_seed,
          { "Seed", "schannel.netlogon_creds_CredentialState.seed", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_MESSAGE_FLAGS_NL_FLAG_OEM_NETBIOS_DOMAIN_NAME,
@@ -1080,16 +1077,12 @@ void proto_register_dcerpc_schannel(void)
          { "Session Key", "schannel.netlogon_creds_CredentialState.session_key", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_MESSAGE_utf8_netbios_computer,
          { "Utf8 Netbios Computer", "schannel.NL_AUTH_MESSAGE.utf8_netbios_computer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_schannel_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_OEM_NETBIOS_DOMAIN_NAME_a,
-         { "A", "schannel.NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_OEM_NETBIOS_DOMAIN_NAME.a", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_SIGNATURE_SequenceNumber,
          { "Sequencenumber", "schannel.NL_AUTH_SIGNATURE.SequenceNumber", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_schannel_netlogon_creds_CredentialState_client,
          { "Client", "schannel.netlogon_creds_CredentialState.client", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_schannel_opnum,
          { "Operation", "schannel.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_schannel_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_NETBIOS_COMPUTER_NAME_u,
-         { "U", "schannel.NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_NETBIOS_COMPUTER_NAME.u", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_SIGNATURE_SealAlgorithm,
          { "Sealalgorithm", "schannel.NL_AUTH_SIGNATURE.SealAlgorithm", FT_UINT1632, BASE_DEC, VALS(schannel_NL_SEAL_ALGORITHM_vals), 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_SHA2_SIGNATURE_Pad,
@@ -1098,14 +1091,14 @@ void proto_register_dcerpc_schannel(void)
          { "Account Name", "schannel.netlogon_creds_CredentialState.account_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_MESSAGE_Flags,
          { "Flags", "schannel.NL_AUTH_MESSAGE.Flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_schannel_NL_AUTH_MESSAGE_BUFFER_u,
+         { "U", "schannel.NL_AUTH_MESSAGE_BUFFER.u", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_MESSAGE_utf8_dns_host,
          { "Utf8 Dns Host", "schannel.NL_AUTH_MESSAGE.utf8_dns_host", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_schannel_netlogon_creds_CredentialState_server,
          { "Server", "schannel.netlogon_creds_CredentialState.server", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_MESSAGE_FLAGS_NL_FLAG_UTF8_DNS_DOMAIN_NAME,
          { "Nl Flag Utf8 Dns Domain Name", "schannel.NL_AUTH_MESSAGE_FLAGS.NL_FLAG_UTF8_DNS_DOMAIN_NAME", FT_BOOLEAN, 32, TFS(&NL_AUTH_MESSAGE_FLAGS_NL_FLAG_UTF8_DNS_DOMAIN_NAME_tfs), ( 0x00000004 ), NULL, HFILL }},
-       { &hf_schannel_NL_AUTH_MESSAGE_BUFFER_REPLY_valNL_NEGOTIATE_RESPONSE_dummy,
-         { "Dummy", "schannel.NL_AUTH_MESSAGE_BUFFER_REPLY_valNL_NEGOTIATE_RESPONSE.dummy", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_MESSAGE_MessageType,
          { "Messagetype", "schannel.NL_AUTH_MESSAGE.MessageType", FT_UINT32, BASE_DEC, VALS(schannel_NL_AUTH_MESSAGE_TYPE_vals), 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_MESSAGE_FLAGS_NL_FLAG_UTF8_DNS_HOST_NAME,
@@ -1120,8 +1113,6 @@ void proto_register_dcerpc_schannel(void)
          { "Checksum", "schannel.NL_AUTH_SHA2_SIGNATURE.Checksum", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_SIGNATURE_Checksum,
          { "Checksum", "schannel.NL_AUTH_SIGNATURE.Checksum", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_schannel_NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_DNS_HOST_NAME_u,
-         { "U", "schannel.NL_AUTH_MESSAGE_BUFFER_valNL_FLAG_UTF8_DNS_HOST_NAME.u", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_schannel_NL_AUTH_SIGNATURE_Flags,
          { "Flags", "schannel.NL_AUTH_SIGNATURE.Flags", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        };

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-smb_acl.c b/bin/default/librpc/gen_ndr/packet-dcerpc-smb_acl.c
index f4faf7d440f891b2486f837e541ac772c9bab9a1..ab4d52ca1e8b07fc229f55a59c2a24454af5cd2b 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-smb_acl.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-smb_acl.c
@@ -41,16 +41,16 @@ static gint ett_smb_acl_smb_acl_wrapper = -1;
 /* Header field declarations */
 static gint hf_smb_acl_smb_acl_wrapper_mode = -1;
 static gint hf_smb_acl_smb_acl_entry_info = -1;
-static gint hf_smb_acl_smb_acl_entry_info_valSMB_ACL_GROUP_group = -1;
 static gint hf_smb_acl_smb_acl_wrapper_default_acl = -1;
+static gint hf_smb_acl_smb_acl_entry_info_group = -1;
 static gint hf_smb_acl_smb_acl_wrapper_access_acl = -1;
+static gint hf_smb_acl_smb_acl_entry_info_user = -1;
 static gint hf_smb_acl_smb_acl_t_acl = -1;
 static gint hf_smb_acl_smb_acl_user_uid = -1;
 static gint hf_smb_acl_smb_acl_t_next = -1;
 static gint hf_smb_acl_smb_acl_entry_a_perm = -1;
 static gint hf_smb_acl_smb_acl_group_gid = -1;
 static gint hf_smb_acl_smb_acl_wrapper_group = -1;
-static gint hf_smb_acl_smb_acl_entry_info_valSMB_ACL_USER_user = -1;
 static gint hf_smb_acl_smb_acl_t_count = -1;
 static gint hf_smb_acl_smb_acl_wrapper_owner = -1;
 static gint hf_smb_acl_smb_acl_entry_a_type = -1;
@@ -78,8 +78,8 @@ const value_string smb_acl_smb_acl_tag_t_vals[] = {
 };
 static int smb_acl_dissect_element_user_uid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int smb_acl_dissect_element_group_gid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int smb_acl_dissect_element_entry_info_valSMB_ACL_USER_user(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int smb_acl_dissect_element_entry_info_valSMB_ACL_GROUP_group(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int smb_acl_dissect_element_entry_info_user(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int smb_acl_dissect_element_entry_info_group(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int smb_acl_dissect_element_entry_a_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *a_type);
 static int smb_acl_dissect_element_entry_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *a_type);
 static int smb_acl_dissect_element_entry_a_perm(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -217,17 +217,17 @@ smb_acl_dissect_struct_group(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
 /* IDL: } */
 
 static int
-smb_acl_dissect_element_entry_info_valSMB_ACL_USER_user(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+smb_acl_dissect_element_entry_info_user(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = smb_acl_dissect_struct_user(tvb,offset,pinfo,tree,drep,hf_smb_acl_smb_acl_entry_info_valSMB_ACL_USER_user,0);
+       offset = smb_acl_dissect_struct_user(tvb,offset,pinfo,tree,drep,hf_smb_acl_smb_acl_entry_info_user,0);
 
        return offset;
 }
 
 static int
-smb_acl_dissect_element_entry_info_valSMB_ACL_GROUP_group(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+smb_acl_dissect_element_entry_info_group(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = smb_acl_dissect_struct_group(tvb,offset,pinfo,tree,drep,hf_smb_acl_smb_acl_entry_info_valSMB_ACL_GROUP_group,0);
+       offset = smb_acl_dissect_struct_group(tvb,offset,pinfo,tree,drep,hf_smb_acl_smb_acl_entry_info_group,0);
 
        return offset;
 }
@@ -251,14 +251,14 @@ smb_acl_dissect_entry_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case SMB_ACL_USER:
-                       offset = smb_acl_dissect_element_entry_info_valSMB_ACL_USER_user(tvb, offset, pinfo, tree, drep);
+                       offset = smb_acl_dissect_element_entry_info_user(tvb, offset, pinfo, tree, drep);
                break;
 
                case SMB_ACL_USER_OBJ:
                break;
 
                case SMB_ACL_GROUP:
-                       offset = smb_acl_dissect_element_entry_info_valSMB_ACL_GROUP_group(tvb, offset, pinfo, tree, drep);
+                       offset = smb_acl_dissect_element_entry_info_group(tvb, offset, pinfo, tree, drep);
                break;
 
                case SMB_ACL_GROUP_OBJ:
@@ -529,12 +529,14 @@ void proto_register_dcerpc_smb_acl(void)
          { "Mode", "smb_acl.smb_acl_wrapper.mode", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_smb_acl_smb_acl_entry_info,
          { "Info", "smb_acl.smb_acl_entry.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_smb_acl_smb_acl_entry_info_valSMB_ACL_GROUP_group,
-         { "Group", "smb_acl.smb_acl_entry_info_valSMB_ACL_GROUP.group", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_smb_acl_smb_acl_wrapper_default_acl,
          { "Default Acl", "smb_acl.smb_acl_wrapper.default_acl", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_smb_acl_smb_acl_entry_info_group,
+         { "Group", "smb_acl.smb_acl_entry_info.group", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_smb_acl_smb_acl_wrapper_access_acl,
          { "Access Acl", "smb_acl.smb_acl_wrapper.access_acl", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_smb_acl_smb_acl_entry_info_user,
+         { "User", "smb_acl.smb_acl_entry_info.user", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_smb_acl_smb_acl_t_acl,
          { "Acl", "smb_acl.smb_acl_t.acl", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_smb_acl_smb_acl_user_uid,
@@ -547,8 +549,6 @@ void proto_register_dcerpc_smb_acl(void)
          { "Gid", "smb_acl.smb_acl_group.gid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_smb_acl_smb_acl_wrapper_group,
          { "Group", "smb_acl.smb_acl_wrapper.group", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_smb_acl_smb_acl_entry_info_valSMB_ACL_USER_user,
-         { "User", "smb_acl.smb_acl_entry_info_valSMB_ACL_USER.user", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_smb_acl_smb_acl_t_count,
          { "Count", "smb_acl.smb_acl_t.count", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_smb_acl_smb_acl_wrapper_owner,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-spoolss.c b/bin/default/librpc/gen_ndr/packet-dcerpc-spoolss.c
index 4abc88d2cf79406df3fe13065109f4641142ceef..a03868cc381e6ae0daeae512256972eb4e4ce32c 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-spoolss.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-spoolss.c
@@ -198,9 +198,9 @@ static gint hf_spoolss_spoolss_RouterReplyPrinterEx_reply_result = -1;
 static gint hf_spoolss_spoolss_GetJob_buffer = -1;
 static gint hf_spoolss_spoolss_DriverInfo5_driver_path = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_drivername = -1;
+static gint hf_spoolss_spoolss_DocumentInfo_info1 = -1;
 static gint hf_spoolss_spoolss_AddFormInfo2_ressource_id = -1;
 static gint hf_spoolss_spoolss_UserLevel3_reserved = -1;
-static gint hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_TIME_time = -1;
 static gint hf_spoolss_spoolss_FormInfo2_keyword = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_NOT_SHAREABLE = -1;
 static gint hf_spoolss_spoolss_JobInfo2_start_time = -1;
@@ -210,6 +210,7 @@ static gint hf_spoolss_spoolss_XcvData_handle = -1;
 static gint hf_spoolss_spoolss_SetJobInfo1_total_pages = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_data_file = -1;
 static gint hf_spoolss_spoolss_SetPortInfo2_monitor_name = -1;
+static gint hf_spoolss_spoolss_PortInfo_infoFF = -1;
 static gint hf_spoolss_spoolss_JobInfo2_submitted = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo6_architecture = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo9_devmode_ptr = -1;
@@ -224,29 +225,28 @@ static gint hf_spoolss___spoolss_EnumPrintProcDataTypes_level = -1;
 static gint hf_spoolss_spoolss_AddPrinterDriverExFlags_APD_STRICT_DOWNGRADE = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_location = -1;
 static gint hf_spoolss_spoolss_EnumPrinterData_data_needed = -1;
+static gint hf_spoolss_spoolss_NotifyData_integer = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo2_architecture = -1;
-static gint hf_spoolss_spoolss_PrinterData_valREG_SZ_string = -1;
 static gint hf_spoolss_spoolss_SetPrinter_devmode_ctr = -1;
 static gint hf_spoolss_RPC_BIDI_RESPONSE_DATA_pSchema = -1;
 static gint hf_spoolss_spoolss_SetJobInfo1_document_name = -1;
 static gint hf_spoolss_spoolss_DriverInfo7_inf_name = -1;
 static gint hf_spoolss_spoolss_SetPrinter_command = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_CONNECTIONS = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_info2 = -1;
 static gint hf_spoolss_spoolss_RpcGetJobNamedPropertyValue_JobId = -1;
 static gint hf_spoolss_spoolss_DeviceMode___driverextra_length = -1;
 static gint hf_spoolss_spoolss_XcvData_function_name = -1;
+static gint hf_spoolss_spoolss_AddDriverInfo_info1 = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_position = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_sepfile = -1;
 static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_RESTART = -1;
 static gint hf_spoolss___spoolss_EnumPrinterDataEx_count = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2__devmode_ptr = -1;
-static gint hf_spoolss_spoolss_Field_valdefault_field = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_val9_info9 = -1;
 static gint hf_spoolss_spoolss_JobInfo1_submitted = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo5_driver_attributes = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_monitor_name = -1;
 static gint hf_spoolss_spoolss_PortData2_size = -1;
-static gint hf_spoolss_spoolss_FormInfo_val1_info1 = -1;
 static gint hf_spoolss___spoolss_EnumPrintProcDataTypes_count = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PORT = -1;
 static gint hf_spoolss_spoolss_StringArray_string = -1;
@@ -254,13 +254,11 @@ static gint hf_spoolss_spoolss_PSDRVEXTRA400_aubOptions = -1;
 static gint hf_spoolss___spoolss_EnumPorts_level = -1;
 static gint hf_spoolss_spoolss_JobInfo4_until_time = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_SOFT_RESET_REQUIRED = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_val5_info5 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_config_file = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_wFeedDirection = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_averageppm = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo6_provider = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_text_status = -1;
-static gint hf_spoolss_spoolss_JobInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_EnumPorts_level = -1;
 static gint hf_spoolss_spoolss_EnumForms_count = -1;
 static gint hf_spoolss_spoolss_PortData2_snmpcommunity = -1;
@@ -305,7 +303,6 @@ static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON7 = -1;
 static gint hf_spoolss_spoolss_GetForm_buffer = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_devmode_ = -1;
 static gint hf_spoolss_spoolss_Notify_variable_type = -1;
-static gint hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo1_description = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_number_of_processors = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDrivers_environment = -1;
@@ -338,17 +335,16 @@ static gint hf_spoolss_spoolss_PrinterInfo2_starttime = -1;
 static gint hf_spoolss_spoolss_RpcDeleteJobNamedProperty_hPrinter = -1;
 static gint hf_spoolss_spoolss_JobInfo1_pages_printed = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA351_caColorfulness = -1;
-static gint hf_spoolss_spoolss_AddFormInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_EnumPrinterDrivers_buffer = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriverPackagePath_language = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_dependent_files = -1;
+static gint hf_spoolss_spoolss_FormInfo_info1 = -1;
+static gint hf_spoolss_spoolss_SetJobInfo_info3 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_dwReserved3 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_wReserved1 = -1;
-static gint hf_spoolss_spoolss_MonitorInfo_val2_info2 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo5_config_version = -1;
 static gint hf_spoolss_spoolss_JobInfo2_status = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON2 = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_val0_info0 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_bReversePrint = -1;
 static gint hf_spoolss_spoolss_GetPrintProcessorDirectory_offered = -1;
 static gint hf_spoolss_spoolss_ReplyOpenPrinter_printer_local = -1;
@@ -360,6 +356,7 @@ static gint hf_spoolss_spoolss_AddDriverInfo4_help_file = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_reserved2 = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver2_info = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_JOB = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_info9 = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_driver_name = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_sharename = -1;
 static gint hf_spoolss_spoolss_RpcEnumJobNamedProperties_ppProperties = -1;
@@ -370,22 +367,19 @@ static gint hf_spoolss_spoolss_PortInfo2_description = -1;
 static gint hf_spoolss__spoolss_EnumJobs_count = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_session_counter = -1;
 static gint hf_spoolss_spoolss_DocumentInfo1_output_file = -1;
-static gint hf_spoolss_RPC_BIDI_DATA_u_valBIDI_STRING_sData = -1;
 static gint hf_spoolss_spoolss_UserLevel3_user = -1;
+static gint hf_spoolss_spoolss_DriverInfo_info7 = -1;
 static gint hf_spoolss_spoolss_UserLevel1_minor = -1;
-static gint hf_spoolss_spoolss_JobInfo_val3_info3 = -1;
 static gint hf_spoolss_spoolss_EnumPrinterDataEx_info = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver_handle = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_server_name = -1;
 static gint hf_spoolss_spoolss_UserLevelCtr_level = -1;
 static gint hf_spoolss_spoolss_OpenPrinterEx_access_mask = -1;
 static gint hf_spoolss_spoolss_AddFormInfo1_form_name = -1;
-static gint hf_spoolss_spoolss_UserLevel_val3_level3 = -1;
 static gint hf_spoolss_spoolss_PortData2_version = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_ORIENTATION = -1;
 static gint hf_spoolss_spoolss_OpenPrinter_handle = -1;
 static gint hf_spoolss_spoolss_AccessRights_JOB_ACCESS_READ = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0600_unidrvextra = -1;
 static gint hf_spoolss_RPC_BIDI_RESPONSE_DATA_dwResult = -1;
 static gint hf_spoolss_spoolss_DeletePerMachineConnection_server = -1;
 static gint hf_spoolss_spoolss_JobInfoContainer_level = -1;
@@ -401,7 +395,6 @@ static gint hf_spoolss_spoolss_SetPrinterData_value_name = -1;
 static gint hf_spoolss_spoolss_PortData1_queue = -1;
 static gint hf_spoolss_spoolss_PortData2_reserved = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_location = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_val3_info3 = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PELSHEIGHT = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcDataTypes_servername = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_submitted = -1;
@@ -412,14 +405,15 @@ static gint hf_spoolss_spoolss_JobInfo4_devmode_ = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_dwReserved2 = -1;
 static gint hf_spoolss_spoolss_Time_month = -1;
 static gint hf_spoolss_spoolss_OpenPrinter_datatype = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_info0 = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDataEx_needed = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcDataTypes_buffer = -1;
 static gint hf_spoolss_spoolss_PortData2_hostaddress = -1;
+static gint hf_spoolss_spoolss_UserLevel_level2 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_min_inbox_driver_ver_date = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo3_config_file = -1;
 static gint hf_spoolss_spoolss_NotifyInfo_version = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver2_needed = -1;
-static gint hf_spoolss_spoolss_AddDriverInfo_val4_info4 = -1;
 static gint hf_spoolss_spoolss_DeviceMode_scale = -1;
 static gint hf_spoolss_spoolss_DeletePrinterData_handle = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_core_driver_dependencies = -1;
@@ -441,14 +435,11 @@ static gint hf_spoolss__spoolss_EnumJobs_offered = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_WORK_OFFLINE = -1;
 static gint hf_spoolss_spoolss_DriverInfo3_version = -1;
 static gint hf_spoolss_spoolss_GetJob_handle = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_val4_info4 = -1;
 static gint hf_spoolss_spoolss_AddPrinter_secdesc_ctr = -1;
 static gint hf_spoolss_spoolss_DeviceMode_duplex = -1;
 static gint hf_spoolss_spoolss_RouterReplyPrinterEx_color = -1;
 static gint hf_spoolss_spoolss_DeletePort_port_name = -1;
-static gint hf_spoolss_spoolss_AddDriverInfo_val1_info1 = -1;
 static gint hf_spoolss__spoolss_EnumForms_handle = -1;
-static gint hf_spoolss_spoolss_UserLevel_val2_level2 = -1;
 static gint hf_spoolss_spoolss_FormInfo2_flags = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_status = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo2_config_file = -1;
@@ -467,19 +458,20 @@ static gint hf_spoolss_spoolss_EnumPrinterDrivers_level = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo6_default_datatype = -1;
 static gint hf_spoolss_spoolss_Time_millisecond = -1;
 static gint hf_spoolss_spoolss_EnumForms_needed = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_val9_info9 = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_dwNupDirection = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_min_inbox_driver_ver_version = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_driver_path = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_time = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver2_architecture = -1;
 static gint hf_spoolss_spoolss_GetPrinter_buffer = -1;
+static gint hf_spoolss_spoolss_PrinterData_string = -1;
 static gint hf_spoolss_spoolss_JobInfo4_print_processor = -1;
 static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_DELETED = -1;
 static gint hf_spoolss_spoolss_OEM_DMEXTRA_dwVersion = -1;
+static gint hf_spoolss_spoolss_SetPortInfo_info2 = -1;
+static gint hf_spoolss_spoolss_JobInfo_info3 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo4_architecture = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_PUBLISHED = -1;
-static gint hf_spoolss_spoolss_DriverInfo_val8_info8 = -1;
 static gint hf_spoolss_spoolss_EnumPrinterKey__ndr_size = -1;
 static gint hf_spoolss_spoolss_EnumPrinterDataEx_count = -1;
 static gint hf_spoolss_spoolss_FormInfo2_display_name = -1;
@@ -499,6 +491,7 @@ static gint hf_spoolss_spoolss_JobInfo4_size = -1;
 static gint hf_spoolss_spoolss_EnumPrinters_level = -1;
 static gint hf_spoolss_spoolss_AddPrinterDriverExFlags_APD_DONT_COPY_FILES_TO_CLUSTER = -1;
 static gint hf_spoolss_spoolss_UserLevel3_client = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psblob = -1;
 static gint hf_spoolss_spoolss_PlayGDIScriptOnPrinterIC_cOut = -1;
 static gint hf_spoolss_spoolss_JobInfo4_status = -1;
 static gint hf_spoolss_spoolss_OSVersion_platform_id = -1;
@@ -509,7 +502,6 @@ static gint hf_spoolss_spoolss_PortData2_device_type = -1;
 static gint hf_spoolss_spoolss_PortType_SPOOLSS_PORT_TYPE_REDIRECTED = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_devmode_ptr = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_status = -1;
-static gint hf_spoolss_spoolss_PrinterData_valdefault_data = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_NAME = -1;
 static gint hf_spoolss_spoolss_RpcSendRecvBidiData_pReqData = -1;
 static gint hf_spoolss_spoolss_ClosePrinter_handle = -1;
@@ -522,15 +514,13 @@ static gint hf_spoolss_spoolss_PSDRVEXTRA400_dwFlags = -1;
 static gint hf_spoolss_spoolss_PrinterInfo5_attributes = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA351_caRedGamma = -1;
 static gint hf_spoolss_spoolss_JobInfo1_priority = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0501_psdrvextra500 = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo1_name = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_OUT_OF_MEMORY = -1;
 static gint hf_spoolss_spoolss_JobInfo1_data_type = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON5 = -1;
-static gint hf_spoolss_spoolss_ReplyPrinterInfo_val0_info0 = -1;
 static gint hf_spoolss_spoolss_DeviceMode_bitsperpel = -1;
 static gint hf_spoolss_spoolss_OSVersionEx_extra_string = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_val2_info2 = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_info0 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_dwOptions = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_caRedGreenTint = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_QUEUED = -1;
@@ -541,6 +531,7 @@ static gint hf_spoolss_spoolss_AddMonitorInfo1_monitor_name = -1;
 static gint hf_spoolss_spoolss_EnumPrintProcDataTypes_offered = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcDataTypes_level = -1;
 static gint hf_spoolss_spoolss_DevmodeContainer_devmode = -1;
+static gint hf_spoolss_RPC_BIDI_DATA_u_sData = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_dwNupBorderFlags = -1;
 static gint hf_spoolss_spoolss_JobInfo3_reserved = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_version = -1;
@@ -577,13 +568,14 @@ static gint hf_spoolss_spoolss_PSDRVEXTRA500_caBrightness = -1;
 static gint hf_spoolss_spoolss_PlayGDIScriptOnPrinterIC_cIn = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo1_flags = -1;
 static gint hf_spoolss_spoolss_AddFormInfo2_form_name = -1;
+static gint hf_spoolss_spoolss_MonitorInfo_info2 = -1;
+static gint hf_spoolss_spoolss_SetJobInfo_info4 = -1;
+static gint hf_spoolss_RPC_PrintPropertyValueUnion_propertyInt64 = -1;
 static gint hf_spoolss_spoolss_JTEXP_wCoreMFOSize = -1;
 static gint hf_spoolss_spoolss_DeletePrinterKey_handle = -1;
-static gint hf_spoolss_spoolss_DriverDirectoryInfo_valdefault_info1 = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_reserved2 = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_SERVER = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_print_processor = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_val2_info2 = -1;
 static gint hf_spoolss_spoolss_EnumPrinters_server = -1;
 static gint hf_spoolss_spoolss_EnumMonitors_count = -1;
 static gint hf_spoolss_spoolss_JobInfo2_secdesc = -1;
@@ -601,12 +593,13 @@ static gint hf_spoolss_spoolss_RouterReplyPrinter_buffer = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo6_status = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_free_build = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver2_buffer = -1;
+static gint hf_spoolss_spoolss_AddDriverInfo_info3 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_hardware_id = -1;
 static gint hf_spoolss___spoolss_EnumPrinters_info = -1;
 static gint hf_spoolss_spoolss_DriverInfo7_install_source_root = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_position = -1;
-static gint hf_spoolss_spoolss_MonitorInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PRINTQUALITY = -1;
+static gint hf_spoolss_spoolss_PrinterData_string_array = -1;
 static gint hf_spoolss_spoolss_AddFormInfoCtr_info = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriverPackagePath_driver_package_cab = -1;
 static gint hf_spoolss_spoolss_EnumPorts_count = -1;
@@ -636,6 +629,7 @@ static gint hf_spoolss_spoolss_JobInfo2_text_status = -1;
 static gint hf_spoolss_spoolss_AddPrinterDriver_info_ctr = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_printer_driver_attributes = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_DOOR_OPEN = -1;
+static gint hf_spoolss_spoolss_MonitorInfo_info1 = -1;
 static gint hf_spoolss___spoolss_EnumPrinterDrivers_info = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_previous_names = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_dependent_files = -1;
@@ -644,15 +638,12 @@ static gint hf_spoolss_spoolss_AddDriverInfo2_version = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_aOptions = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_PRINTER = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_high_part_total_bytes = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_val0_info0 = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_time = -1;
 static gint hf_spoolss__spoolss_EnumForms_level = -1;
-static gint hf_spoolss_spoolss_PrintProcessorDirectoryInfo_valdefault_info1 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_manufacturer_url = -1;
 static gint hf_spoolss_spoolss_AddForm_info_ctr = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_cjobs = -1;
 static gint hf_spoolss_spoolss_GetForm_needed = -1;
-static gint hf_spoolss_RPC_BIDI_DATA_u_valBIDI_BLOB_biData = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_wCoreFullSize = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver2_info_ = -1;
 static gint hf_spoolss_spoolss_SetPrinterData_handle = -1;
@@ -665,14 +656,13 @@ static gint hf_spoolss_spoolss_JobInfo2_secdesc_ = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_caBlueGamma = -1;
 static gint hf_spoolss_spoolss_JobInfo4_data_type = -1;
 static gint hf_spoolss_spoolss_EnumJobs_firstjob = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_valdefault_psblob = -1;
+static gint hf_spoolss_spoolss_DriverInfo_info4 = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_enumerate_network_printers = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDrivers_needed = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_printer_name = -1;
 static gint hf_spoolss_spoolss_JobInfo2_printer_name = -1;
 static gint hf_spoolss_spoolss_EnumPrinterKey_offered = -1;
 static gint hf_spoolss__spoolss_EnumPorts_offered = -1;
-static gint hf_spoolss_spoolss_AddDriverInfo_val3_info3 = -1;
 static gint hf_spoolss_spoolss_DeviceMode_yresolution = -1;
 static gint hf_spoolss_spoolss_EnumPrinters_info = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo4_default_datatype = -1;
@@ -685,7 +675,6 @@ static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_PAUSED = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_change_id = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo4_previous_names = -1;
 static gint hf_spoolss_spoolss_DeletePrinterData_value_name = -1;
-static gint hf_spoolss_spoolss_SetJobInfo_val2_info2 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_dwSignature = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_ERROR = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_DO_COMPLETE_FIRST = -1;
@@ -695,14 +684,12 @@ static gint hf_spoolss_spoolss_DeviceModeInfo_devmode_ = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_PRINTER_DRIVER = -1;
 static gint hf_spoolss_spoolss_NotifyOptionType_u3 = -1;
 static gint hf_spoolss_spoolss_JobInfo1_server_name = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_val8_info8 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_caColorfulness = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA500_dwOptions = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo8_devmode_ptr = -1;
 static gint hf_spoolss_spoolss_DriverInfo6_provider = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_USER_INTERVENTION = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriverDirectory_server = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_notify_name = -1;
 static gint hf_spoolss___spoolss_EnumPrintProcDataTypes_info = -1;
 static gint hf_spoolss_spoolss_JobInfo2_data_type = -1;
@@ -719,21 +706,19 @@ static gint hf_spoolss_spoolss_GetJob_info_ = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_manufacturer_name = -1;
 static gint hf_spoolss_spoolss_EnumPrinterDrivers_offered = -1;
 static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_SPOOLING = -1;
-static gint hf_spoolss_spoolss_JobInfo_val4_info4 = -1;
 static gint hf_spoolss_RPC_BIDI_RESPONSE_CONTAINER_Count = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_parameters = -1;
 static gint hf_spoolss_spoolss_DriverInfo101_file_info = -1;
 static gint hf_spoolss_spoolss_GetPrinter_level = -1;
 static gint hf_spoolss_spoolss_DeviceMode_papersize = -1;
-static gint hf_spoolss_spoolss_Field_valPRINTER_NOTIFY_TYPE_field = -1;
 static gint hf_spoolss_spoolss_DeletePrinterKey_key_name = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA351_caContrast = -1;
 static gint hf_spoolss_spoolss_AddPrinterDriverExFlags_APD_COPY_NEW_FILES = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2__secdesc_ptr = -1;
-static gint hf_spoolss_spoolss_DriverInfo_val7_info7 = -1;
 static gint hf_spoolss_spoolss_AddPerMachineConnection_printername = -1;
 static gint hf_spoolss_spoolss_GetPrintProcessorDirectory_server = -1;
 static gint hf_spoolss_spoolss_SetPrinterDataEx_value_name = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_info5 = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_wReserved = -1;
 static gint hf_spoolss_spoolss_SetJobInfo1_pages_printed = -1;
 static gint hf_spoolss_spoolss_XcvData_out_data_size = -1;
@@ -746,7 +731,7 @@ static gint hf_spoolss___spoolss_EnumJobs_level = -1;
 static gint hf_spoolss_spoolss_RpcDeleteJobNamedProperty_JobId = -1;
 static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_USER_INTERVENTION = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcessors_needed = -1;
-static gint hf_spoolss_spoolss_AddDriverInfo_val8_info8 = -1;
+static gint hf_spoolss_spoolss_PrintProcDataTypesInfo_info1 = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON6 = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_SERVICE = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_total_pages = -1;
@@ -767,14 +752,14 @@ static gint hf_spoolss_spoolss_AddDriverInfo3_monitor_name = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_version = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_WARMING_UP = -1;
 static gint hf_spoolss_spoolss_AddPrinterEx_devmode_ctr = -1;
-static gint hf_spoolss_spoolss_DriverInfo_val2_info2 = -1;
-static gint hf_spoolss_spoolss_JobInfo_val2_info2 = -1;
 static gint hf_spoolss_spoolss_SetPrinterDataEx_data = -1;
 static gint hf_spoolss_spoolss_CreatePrinterIC_handle = -1;
 static gint hf_spoolss_spoolss_DriverInfo6_help_file = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8__ndr_size_color_profiles = -1;
 static gint hf_spoolss__spoolss_EnumPrinters_flags = -1;
-static gint hf_spoolss_spoolss_AddDriverInfo_val2_info2 = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra500 = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_info2 = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_info6 = -1;
 static gint hf_spoolss_spoolss_EnumPrintProcessors_environment = -1;
 static gint hf_spoolss_spoolss_OSVersion_build = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_last_error = -1;
@@ -783,10 +768,8 @@ static gint hf_spoolss_spoolss_WritePrinter_data = -1;
 static gint hf_spoolss__spoolss_EnumJobs_info = -1;
 static gint hf_spoolss_spoolss_DriverInfo7_size = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_caIlluminantIndex = -1;
-static gint hf_spoolss_spoolss_FormInfo_val2_info2 = -1;
 static gint hf_spoolss_spoolss_EnumPorts_offered = -1;
 static gint hf_spoolss_spoolss_PortData1_ip_address = -1;
-static gint hf_spoolss_spoolss_PortInfo_val2_info2 = -1;
 static gint hf_spoolss_spoolss_Time_minute = -1;
 static gint hf_spoolss_spoolss_AddPortEx_monitor_name = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA500_iQuality = -1;
@@ -807,12 +790,12 @@ static gint hf_spoolss_spoolss_GetPrinterDataEx_handle = -1;
 static gint hf_spoolss_spoolss_GetJob_info = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_caContrast = -1;
 static gint hf_spoolss_spoolss_AddPrinterEx_info_ctr = -1;
-static gint hf_spoolss_spoolss_PrintProcessorInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_wFeedDirection = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcessors_buffer = -1;
 static gint hf_spoolss_UNIVERSAL_FONT_ID_ctr_count = -1;
 static gint hf_spoolss_spoolss_NotifyString_size = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_status = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_info3 = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_c_setprinter = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcessors_environment = -1;
 static gint hf_spoolss_spoolss_GetForm_offered = -1;
@@ -839,13 +822,17 @@ static gint hf_spoolss_spoolss_PortData1_size = -1;
 static gint hf_spoolss_spoolss_DeleteDriverFlags_DPD_DELETE_UNUSED_FILES = -1;
 static gint hf_spoolss_spoolss_PortData1_snmpcommunity = -1;
 static gint hf_spoolss_spoolss_UserLevel1_client = -1;
+static gint hf_spoolss_spoolss_KeyNames_string_array = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriverPackagePath_architecture = -1;
 static gint hf_spoolss__spoolss_EnumMonitors_servername = -1;
+static gint hf_spoolss_spoolss_AddMonitorInfo_info2 = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_sharename = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_info4 = -1;
 static gint hf_spoolss_spoolss_EnumForms_level = -1;
 static gint hf_spoolss_spoolss_ReadPrinter_handle = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_inf_path = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo6_driver_version = -1;
+static gint hf_spoolss_spoolss_SetJobInfo_info2 = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriverDirectory_environment = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_DERIVED = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_color_profiles = -1;
@@ -857,21 +844,22 @@ static gint hf_spoolss_spoolss_StartDocPrinter_job_id = -1;
 static gint hf_spoolss__spoolss_EnumPrinters_count = -1;
 static gint hf_spoolss_spoolss_AddFormInfo2_lang_id = -1;
 static gint hf_spoolss_spoolss_FormStringType_SPOOLSS_FORM_STRING_TYPE_LANG_PAIR = -1;
+static gint hf_spoolss_spoolss_JobInfo_info2 = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDrivers_count = -1;
-static gint hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_DWORD_integer = -1;
+static gint hf_spoolss_spoolss_PortInfo_info1 = -1;
 static gint hf_spoolss_spoolss_EnumForms_buffer = -1;
 static gint hf_spoolss_spoolss_PortData1_snmp_enabled = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_COLOR = -1;
 static gint hf_spoolss_spoolss_SetPortInfo2_port_name = -1;
 static gint hf_spoolss_spoolss_EnumMonitors_buffer = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_parameters = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0600_psdrvextra = -1;
 static gint hf_spoolss_spoolss_CorePrinterDriver_driver_date = -1;
 static gint hf_spoolss_spoolss_EnumPrinters_flags = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_attributes = -1;
 static gint hf_spoolss___spoolss_EnumJobs_info = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA500_dwChecksum32 = -1;
 static gint hf_spoolss_spoolss_ReadPrinter_data = -1;
+static gint hf_spoolss_spoolss_DriverInfo_info2 = -1;
 static gint hf_spoolss_spoolss_DriverInfo5_version = -1;
 static gint hf_spoolss_spoolss_JobInfo4_start_time = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo6_config_file = -1;
@@ -899,7 +887,6 @@ static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_DELETING = -1;
 static gint hf_spoolss__spoolss_EnumForms_needed = -1;
 static gint hf_spoolss_spoolss_Notify_type = -1;
 static gint hf_spoolss_spoolss_PortData2_port_number = -1;
-static gint hf_spoolss_spoolss_DriverInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_max_spooling = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_caColorfulness = -1;
 static gint hf_spoolss_spoolss_JobInfo2_parameters = -1;
@@ -913,18 +900,16 @@ static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_VIRTUAL
 static gint hf_spoolss_spoolss_GetPrinterDriverPackagePath_servername = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA500_wOEMExtra = -1;
 static gint hf_spoolss_spoolss_DriverFileInfo_file_type = -1;
-static gint hf_spoolss_spoolss_AddMonitorInfo_val1_info1 = -1;
+static gint hf_spoolss_RPC_BIDI_DATA_u_iData = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_driver_path = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_XPS = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_iDialect = -1;
 static gint hf_spoolss__spoolss_EnumMonitors_info = -1;
-static gint hf_spoolss_spoolss_DriverInfo_val4_info4 = -1;
 static gint hf_spoolss_spoolss_AddPrinterEx_handle = -1;
 static gint hf_spoolss_spoolss_JobInfo1_status = -1;
 static gint hf_spoolss_spoolss_PortType_SPOOLSS_PORT_TYPE_WRITE = -1;
 static gint hf_spoolss_spoolss_JobInfo4_secdesc = -1;
 static gint hf_spoolss_spoolss_AddFormInfo1_size = -1;
-static gint hf_spoolss_spoolss_SetJobInfo_val3_info3 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8__ndr_size_core_driver_dependencies = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDrivers_server = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_processor_level = -1;
@@ -933,9 +918,12 @@ static gint hf_spoolss__spoolss_EnumMonitors_count = -1;
 static gint hf_spoolss_spoolss_JobInfo4_pages_printed = -1;
 static gint hf_spoolss_spoolss_NotifyOptionType_fields = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_FAX = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra351 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_dwX = -1;
 static gint hf_spoolss_spoolss_DevmodeContainer_devmode_ = -1;
 static gint hf_spoolss_spoolss_GetPrinter_info = -1;
+static gint hf_spoolss_RPC_PrintPropertyValueUnion_propertyInt32 = -1;
+static gint hf_spoolss_spoolss_NotifyData_devmode = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_config_file = -1;
 static gint hf_spoolss_spoolss_SetPrinterDataEx_key_name = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_iPSLevel = -1;
@@ -955,27 +943,26 @@ static gint hf_spoolss_spoolss_NotifyInfo_count = -1;
 static gint hf_spoolss_spoolss_FormArea_left = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_iLayout = -1;
 static gint hf_spoolss_spoolss_SetForm_info_ctr = -1;
+static gint hf_spoolss_spoolss_AddFormInfo_info1 = -1;
 static gint hf_spoolss_spoolss_Time_year = -1;
 static gint hf_spoolss_spoolss_EnumPorts_servername = -1;
 static gint hf_spoolss_spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_DRV_ERROR_HANDLER = -1;
-static gint hf_spoolss_spoolss_SetJobInfo_val4_info4 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo4_data_file = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON4 = -1;
 static gint hf_spoolss_spoolss_JobInfo4_parameters = -1;
 static gint hf_spoolss__spoolss_EnumPorts_info = -1;
 static gint hf_spoolss_RPC_BIDI_REQUEST_CONTAINER_Version = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_info7 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_caContrast = -1;
 static gint hf_spoolss_spoolss_OSVersionEx_suite_mask = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_wCutSheet = -1;
 static gint hf_spoolss_spoolss_RouterReplyPrinter_handle = -1;
-static gint hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_DEVMODE_devmode = -1;
 static gint hf_spoolss_spoolss_DriverInfo7_version = -1;
 static gint hf_spoolss_spoolss_AddPrinterDriverExFlags_APD_COPY_ALL_FILES = -1;
 static gint hf_spoolss_spoolss_JobInfo4_notify_name = -1;
 static gint hf_spoolss___spoolss_EnumPrintProcessors_info = -1;
 static gint hf_spoolss_spoolss_OpenPrinterEx_printername = -1;
 static gint hf_spoolss_spoolss_DeletePrinterDataEx_value_name = -1;
-static gint hf_spoolss_spoolss_AddMonitorInfo_val2_info2 = -1;
 static gint hf_spoolss_spoolss_EnumPrintProcDataTypes_count = -1;
 static gint hf_spoolss_UNIVERSAL_FONT_ID_Index = -1;
 static gint hf_spoolss_spoolss_DeviceMode_reserved2 = -1;
@@ -983,6 +970,7 @@ static gint hf_spoolss_spoolss_AddDriverInfo3_dependent_files = -1;
 static gint hf_spoolss_spoolss_DeletePrinterDriverEx_delete_flags = -1;
 static gint hf_spoolss_spoolss_OSVersion_major = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PAPERLENGTH = -1;
+static gint hf_spoolss_spoolss_NotifyData_string = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_NETWORK = -1;
 static gint hf_spoolss__spoolss_EnumMonitors_level = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_global_counter = -1;
@@ -994,7 +982,6 @@ static gint hf_spoolss_spoolss_PrinterInfo2_untiltime = -1;
 static gint hf_spoolss_spoolss_SetPrinterDataEx_type = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA351_caGreenGamma = -1;
 static gint hf_spoolss___spoolss_EnumPorts_count = -1;
-static gint hf_spoolss_spoolss_KeyNames_valdefault_string_array = -1;
 static gint hf_spoolss_spoolss_EnumPrinters_needed = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PRINTER = -1;
 static gint hf_spoolss_spoolss_FormArea_right = -1;
@@ -1006,15 +993,14 @@ static gint hf_spoolss_spoolss_AddMonitorInfo2_dll_name = -1;
 static gint hf_spoolss_spoolss_JobInfo2_pages_printed = -1;
 static gint hf_spoolss_spoolss_JobInfo4_driver_name = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_iDialect = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_val6_info6 = -1;
 static gint hf_spoolss_spoolss_JobInfo4_time = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_SET_PRINTER_DRIVER = -1;
 static gint hf_spoolss_spoolss_GetForm_form_name = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA351_caReferenceBlack = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_info1 = -1;
 static gint hf_spoolss_spoolss_DeviceMode_logpixels = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo3_default_datatype = -1;
 static gint hf_spoolss_spoolss_DeletePort_ptr = -1;
-static gint hf_spoolss_RPC_BIDI_DATA_u_valBIDI_ENUM_sData = -1;
 static gint hf_spoolss_spoolss_PrinterEnumValues_data_length = -1;
 static gint hf_spoolss_RPC_BIDI_REQUEST_DATA_pSchema = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo3_version = -1;
@@ -1034,7 +1020,7 @@ static gint hf_spoolss_spoolss_ReadPrinter_data_size = -1;
 static gint hf_spoolss_spoolss_EnumPrintProcDataTypes_info = -1;
 static gint hf_spoolss_spoolss_DeleteDriverFlags_DPD_DELETE_SPECIFIC_VERSION = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo6_driver_path = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_val3_info3 = -1;
+static gint hf_spoolss_spoolss_AddFormInfo_info2 = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_printername = -1;
 static gint hf_spoolss_spoolss_XcvData_in_data = -1;
 static gint hf_spoolss_spoolss_Notify_data = -1;
@@ -1068,6 +1054,8 @@ static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_COPIES = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_caBlueGamma = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA3_4_wReserved = -1;
 static gint hf_spoolss_spoolss_AddPrinter_info_ctr = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra3_4 = -1;
+static gint hf_spoolss_spoolss_PrinterData_value = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_inf_path = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_wCoreJTExpSize = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_help_file = -1;
@@ -1076,14 +1064,15 @@ static gint hf_spoolss_spoolss_EnumMonitors_needed = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_fxScrFreq = -1;
 static gint hf_spoolss_spoolss_PrinterInfo5_device_not_selected_timeout = -1;
 static gint hf_spoolss_spoolss_DeviceModeInfo_devmode = -1;
-static gint hf_spoolss_spoolss_PrinterData_valREG_BINARY_binary = -1;
 static gint hf_spoolss_spoolss_OSVersion_extra_string = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_SCALE = -1;
 static gint hf_spoolss_spoolss_SetPortInfo3_severity = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_wchEPSFile = -1;
 static gint hf_spoolss_spoolss_DriverInfo101_previous_names = -1;
+static gint hf_spoolss_spoolss_SetPortInfo_info1 = -1;
 static gint hf_spoolss_spoolss_AddPrintProcessor_print_processor_name = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_reserved3 = -1;
+static gint hf_spoolss_spoolss_DriverInfo_info8 = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_drivername = -1;
 static gint hf_spoolss_spoolss_RemoteFindFirstPrinterChangeNotifyEx_flags = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_caGreenGamma = -1;
@@ -1101,21 +1090,18 @@ static gint hf_spoolss_spoolss_EnumJobs_needed = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDataEx_key_name = -1;
 static gint hf_spoolss_spoolss_MonitorInfo2_environment = -1;
 static gint hf_spoolss_spoolss_DriverInfo3_data_file = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0350_psdrvextra351 = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_LOCAL = -1;
 static gint hf_spoolss_spoolss_CorePrinterDriver_formname = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcDataTypes_count = -1;
-static gint hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeByte_propertyByte = -1;
-static gint hf_spoolss_spoolss_DriverDirectoryInfo_val1_info1 = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_val7_info7 = -1;
 static gint hf_spoolss_spoolss_AddPortEx_port_ctr = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriverPackagePath_package_id = -1;
 static gint hf_spoolss_spoolss_GetForm_info = -1;
 static gint hf_spoolss_spoolss_TimeCtr_size = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_iQuality = -1;
-static gint hf_spoolss_spoolss_Field_valJOB_NOTIFY_TYPE_field = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_info8 = -1;
 static gint hf_spoolss_spoolss_PrinterEnumValues_value_name_len = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDrivers_info = -1;
+static gint hf_spoolss_spoolss_PrintProcessorDirectoryInfo_info1 = -1;
 static gint hf_spoolss___spoolss_EnumForms_info = -1;
 static gint hf_spoolss_spoolss_SetPrinterDataEx_handle = -1;
 static gint hf_spoolss_spoolss_UserLevel1_major = -1;
@@ -1146,13 +1132,11 @@ static gint hf_spoolss_spoolss_DeviceMode_paperwidth = -1;
 static gint hf_spoolss_spoolss_JTEXP_wJTHdrSize = -1;
 static gint hf_spoolss_spoolss_DriverInfo4_version = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_size_high = -1;
-static gint hf_spoolss_spoolss_PrintProcessorDirectoryInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_AddPrinterDriverExFlags_APD_STRICT_UPGRADE = -1;
 static gint hf_spoolss_spoolss_ReplyClosePrinter_handle = -1;
 static gint hf_spoolss_spoolss_AddPrintProcessor_server = -1;
 static gint hf_spoolss_spoolss_DsPrintAction_DSPRINT_UNPUBLISH = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_monitor_name = -1;
-static gint hf_spoolss_spoolss_DriverInfo_val6_info6 = -1;
 static gint hf_spoolss_spoolss_DeviceMode_devicename = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8_driver_name = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_document_name = -1;
@@ -1164,11 +1148,9 @@ static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_CONTAINER = -1;
 static gint hf_spoolss_spoolss_UserLevel1_processor = -1;
 static gint hf_spoolss_spoolss_PrinterInfo4_servername = -1;
 static gint hf_spoolss_spoolss_RpcDeleteJobNamedProperty_pszName = -1;
-static gint hf_spoolss_spoolss_SetPortInfo_val2_info2 = -1;
 static gint hf_spoolss__spoolss_EnumPorts_servername = -1;
 static gint hf_spoolss_spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_COMPRESS_BITMAP = -1;
 static gint hf_spoolss_spoolss_GetJob_needed = -1;
-static gint hf_spoolss_RPC_BIDI_DATA_u_valBIDI_INT_iData = -1;
 static gint hf_spoolss_spoolss_PortData1_reserved = -1;
 static gint hf_spoolss_spoolss_SetJobInfo1_status = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver_buffer = -1;
@@ -1177,7 +1159,6 @@ static gint hf_spoolss_spoolss_SetPrinterInfo3_sec_desc_ptr = -1;
 static gint hf_spoolss_spoolss_SetPrinterData_offered = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_BUSY = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_NETWORK = -1;
-static gint hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_STRING_string = -1;
 static gint hf_spoolss_spoolss_DriverInfo6_dependent_files = -1;
 static gint hf_spoolss_spoolss_FormSize_height = -1;
 static gint hf_spoolss_spoolss_PortData2_dblspool = -1;
@@ -1194,18 +1175,18 @@ static gint hf_spoolss_spoolss_AccessRights_PRINTER_ACCESS_ADMINISTER = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_wchEPSFile = -1;
 static gint hf_spoolss_spoolss_AddFormInfo2_keyword = -1;
 static gint hf_spoolss_spoolss_DriverInfo4_monitor_name = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_val5_info5 = -1;
 static gint hf_spoolss_spoolss_DocumentInfo1_datatype = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo5_driver_name = -1;
-static gint hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt32_propertyInt32 = -1;
 static gint hf_spoolss_spoolss_RpcSetJobNamedProperty_hPrinter = -1;
 static gint hf_spoolss_spoolss_AddPrintProcessor_architecture = -1;
+static gint hf_spoolss_spoolss_UserLevel_level3 = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PROCESSING = -1;
 static gint hf_spoolss_spoolss_PortData2_snmp_enabled = -1;
 static gint hf_spoolss_spoolss_OEM_DMEXTRA_Data = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDataEx_handle = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PAPER_OUT = -1;
 static gint hf_spoolss_spoolss_FormInfo1_area = -1;
+static gint hf_spoolss_RPC_PrintPropertyValueUnion_propertyByte = -1;
 static gint hf_spoolss_spoolss_PortData2_protocol = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_wOEMExtra = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_caReferenceWhite = -1;
@@ -1217,6 +1198,7 @@ static gint hf_spoolss_spoolss_AddJob_offered = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriverDirectory_needed = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_caBrightness = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_EXPAND = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra = -1;
 static gint hf_spoolss_spoolss_JTEXP_dwVersion = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo4_driver_name = -1;
 static gint hf_spoolss_spoolss_UserLevel1_user = -1;
@@ -1226,19 +1208,19 @@ static gint hf_spoolss_spoolss_JobInfo1_total_pages = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_priority = -1;
 static gint hf_spoolss_spoolss_SetJobInfo1_data_type = -1;
 static gint hf_spoolss_spoolss_EnumPrinterKey_key_name = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_info3 = -1;
 static gint hf_spoolss_spoolss_JobInfo1_printer_name = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_start_time = -1;
-static gint hf_spoolss_spoolss_PortInfo_val3_info3 = -1;
+static gint hf_spoolss_spoolss_AddDriverInfo_info4 = -1;
 static gint hf_spoolss_spoolss_RemoteFindFirstPrinterChangeNotifyEx_notify_options = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PAUSED = -1;
-static gint hf_spoolss_RPC_BIDI_DATA_u_valBIDI_BOOL_bData = -1;
-static gint hf_spoolss_spoolss_SetJobInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_DeviceMode_fields = -1;
 static gint hf_spoolss_RPC_BIDI_RESPONSE_CONTAINER_Version = -1;
 static gint hf_spoolss_spoolss_EnumPrinterKey_needed = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_servername = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA500_wReserved = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_job_error = -1;
+static gint hf_spoolss_spoolss_DriverInfo_info1 = -1;
 static gint hf_spoolss_spoolss_StartDocPrinter_info_ctr = -1;
 static gint hf_spoolss_spoolss_MonitorUi_dll_name = -1;
 static gint hf_spoolss_spoolss_JobInfo1_position = -1;
@@ -1248,14 +1230,13 @@ static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_MEDIATYPE = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_total_jobs = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_datatype = -1;
 static gint hf_spoolss_spoolss_DsPrintAction_DSPRINT_PUBLISH = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_valdefault_uniblob = -1;
 static gint hf_spoolss_spoolss_JobInfoContainer_info = -1;
 static gint hf_spoolss_spoolss_XcvData_needed = -1;
 static gint hf_spoolss_spoolss_SetJobInfo1_position = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_notify_name = -1;
-static gint hf_spoolss_spoolss_SetPortInfo_val3_info3 = -1;
 static gint hf_spoolss_spoolss_GetPrinterDataEx_needed = -1;
 static gint hf_spoolss_spoolss_DeletePrinterDriver_driver = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra500 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_caReferenceBlack = -1;
 static gint hf_spoolss_spoolss_AddPort_unknown = -1;
 static gint hf_spoolss_spoolss_DriverInfo5_driver_name = -1;
@@ -1268,12 +1249,14 @@ static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PENDING_DELETION = -
 static gint hf_spoolss___spoolss_EnumForms_level = -1;
 static gint hf_spoolss___spoolss_EnumPrinterDataEx_info = -1;
 static gint hf_spoolss_spoolss_OSVersionEx_extra_string_ = -1;
-static gint hf_spoolss_spoolss_AddDriverInfo_val6_info6 = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_info7 = -1;
 static gint hf_spoolss_spoolss_DriverInfo6_monitor_name = -1;
 static gint hf_spoolss_spoolss_OSVersion__ndr_size = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_hardware_id = -1;
 static gint hf_spoolss_spoolss_EnumJobs_handle = -1;
+static gint hf_spoolss_spoolss_DriverInfo_info6 = -1;
 static gint hf_spoolss_spoolss_EnumPrinterKey_handle = -1;
+static gint hf_spoolss_spoolss_SetPortInfo_infoFF = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo6__ndr_size_dependent_files = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver_offered = -1;
 static gint hf_spoolss_spoolss_OpenPrinter_devmode_ctr = -1;
@@ -1283,12 +1266,16 @@ static gint hf_spoolss_spoolss_PrinterInfo0_reserved3 = -1;
 static gint hf_spoolss__spoolss_EnumPrinterDataEx_info = -1;
 static gint hf_spoolss_spoolss_AddPortEx_servername = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_fxScrAngle = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_info8 = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_manufacturer_url = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra = -1;
 static gint hf_spoolss_spoolss_JobInfo4_position = -1;
 static gint hf_spoolss__spoolss_EnumJobs_handle = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_defaultpriority = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo7_action = -1;
+static gint hf_spoolss_spoolss_PrinterData_data = -1;
 static gint hf_spoolss_spoolss_AbortPrinter_handle = -1;
+static gint hf_spoolss_RPC_BIDI_DATA_u_bData = -1;
 static gint hf_spoolss_spoolss_FormInfo1_flags = -1;
 static gint hf_spoolss_spoolss_PortData1_portname = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_starttime = -1;
@@ -1300,7 +1287,6 @@ static gint hf_spoolss_spoolss_RpcSetJobNamedProperty_pProperty = -1;
 static gint hf_spoolss_spoolss_AddPortEx_port_var_ctr = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PAGE_PUNT = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo6_version = -1;
-static gint hf_spoolss_spoolss_DriverInfo_val5_info5 = -1;
 static gint hf_spoolss_spoolss_OSVersionEx_minor = -1;
 static gint hf_spoolss_RPC_BIDI_REQUEST_CONTAINER_aData = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_wVer = -1;
@@ -1312,11 +1298,13 @@ static gint hf_spoolss_spoolss_AddPrinterDriverEx_flags = -1;
 static gint hf_spoolss_spoolss_RouterReplyPrinter_bufsize = -1;
 static gint hf_spoolss_spoolss_SetPortInfoFF_port_name = -1;
 static gint hf_spoolss_spoolss_AddPerMachineConnection_provider = -1;
+static gint hf_spoolss_spoolss_UserLevel_level1 = -1;
 static gint hf_spoolss_spoolss_AccessRights_JOB_ACCESS_ADMINISTER = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_DITHERTYPE = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_PRINT_PROCESSOR = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4__secdesc_ptr = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PANNINGWIDTH = -1;
+static gint hf_spoolss_spoolss_SetPortInfo_info3 = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_total_bytes = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_driver_name = -1;
 static gint hf_spoolss_spoolss_PlayGDIScriptOnPrinterIC_pIn = -1;
@@ -1345,6 +1333,7 @@ static gint hf_spoolss_spoolss_SetPrinterInfo5_printername = -1;
 static gint hf_spoolss_spoolss_EnumPrinterDataEx_offered = -1;
 static gint hf_spoolss_spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_PRINT_NEGATIVE = -1;
 static gint hf_spoolss_spoolss_FindClosePrinterNotify_handle = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_info1 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo2_driver_name = -1;
 static gint hf_spoolss_spoolss_EnumForms_handle = -1;
 static gint hf_spoolss_spoolss_JobInfo2_document_name = -1;
@@ -1368,6 +1357,8 @@ static gint hf_spoolss_spoolss_PortInfo2_reserved = -1;
 static gint hf_spoolss_propertyBlob_cbBuf = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_enumerate_network_printers = -1;
 static gint hf_spoolss_spoolss_GetPrinter_needed = -1;
+static gint hf_spoolss_spoolss_JobInfo_info4 = -1;
+static gint hf_spoolss_spoolss_DriverInfo_info5 = -1;
 static gint hf_spoolss_spoolss_JobInfo1_job_id = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_FORMNAME = -1;
 static gint hf_spoolss__spoolss_EnumPrinters_level = -1;
@@ -1377,6 +1368,8 @@ static gint hf_spoolss_spoolss_MonitorInfo2_monitor_name = -1;
 static gint hf_spoolss_spoolss_StartDocPrinter_handle = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_job_id = -1;
 static gint hf_spoolss_spoolss_RouterRefreshPrinterChangeNotify_options = -1;
+static gint hf_spoolss_spoolss_PortInfo_info3 = -1;
+static gint hf_spoolss_RPC_BIDI_DATA_u_biData = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_dwSignature = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_caReferenceBlack = -1;
 static gint hf_spoolss_spoolss_EnumPrinterDrivers_server = -1;
@@ -1385,7 +1378,6 @@ static gint hf_spoolss_spoolss_NotifyOptionType_count = -1;
 static gint hf_spoolss_spoolss_DriverInfo3_driver_path = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriverDirectory_level = -1;
 static gint hf_spoolss_spoolss_OpenPrinter_printername = -1;
-static gint hf_spoolss_spoolss_PortInfo_val0xff_infoFF = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_total_pages = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo5_driver_version = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_cjobs = -1;
@@ -1398,6 +1390,7 @@ static gint hf_spoolss_spoolss_PSDRVEXTRA500_caIlluminantIndex = -1;
 static gint hf_spoolss_spoolss_RemoteFindFirstPrinterChangeNotifyEx_handle = -1;
 static gint hf_spoolss_spoolss_Time_second = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_FILE = -1;
+static gint hf_spoolss_spoolss_DriverDirectoryInfo_info1 = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_cjobs = -1;
 static gint hf_spoolss_spoolss_DsPrintAction_DSPRINT_UPDATE = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo1_comment = -1;
@@ -1416,7 +1409,6 @@ static gint hf_spoolss_spoolss_SetPrinterInfo0_servername = -1;
 static gint hf_spoolss_spoolss_TimeCtr_time = -1;
 static gint hf_spoolss_spoolss_DriverInfo3_help_file = -1;
 static gint hf_spoolss_spoolss_DriverInfo4_dependent_files = -1;
-static gint hf_spoolss_spoolss_PortInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo5_config_file = -1;
 static gint hf_spoolss_RPC_BIDI_DATA_dwBidiType = -1;
 static gint hf_spoolss_spoolss_GetForm_level = -1;
@@ -1431,24 +1423,23 @@ static gint hf_spoolss_spoolss_SetPortInfo2_port_type = -1;
 static gint hf_spoolss_spoolss_EnumJobs_level = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_iTTDLFmt = -1;
 static gint hf_spoolss_spoolss_DriverInfo101_manufacturer_name = -1;
+static gint hf_spoolss_spoolss_NotifyData_sd = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_printprocessor = -1;
 static gint hf_spoolss_spoolss_CreatePrinterIC_gdi_handle = -1;
 static gint hf_spoolss_spoolss_EnumJobs_buffer = -1;
 static gint hf_spoolss_spoolss_AccessRights_SERVER_ACCESS_ENUMERATE = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_val6_info6 = -1;
 static gint hf_spoolss_spoolss_DMUNI_Flags_SPOOLSS_DM_UNI_FLAGS_PRINT_TEXT_AS_GRAPHICS = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_servername = -1;
 static gint hf_spoolss_spoolss_UserLevel3_size2 = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfoCtr_info = -1;
-static gint hf_spoolss_RPC_BIDI_DATA_u_valBIDI_TEXT_sData = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_info4 = -1;
 static gint hf_spoolss_spoolss_NotifyOption_count = -1;
 static gint hf_spoolss_spoolss_GetJob_offered = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo7_guid = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_total_jobs = -1;
-static gint hf_spoolss_spoolss_UserLevel_val1_level1 = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0500_unidrvextra500 = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_parameters = -1;
 static gint hf_spoolss_spoolss_DeletePort_server_name = -1;
+static gint hf_spoolss_spoolss_SetPrinterInfo_info5 = -1;
 static gint hf_spoolss_spoolss_AddFormInfo2_string_type = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_NUP = -1;
 static gint hf_spoolss_spoolss_RpcSetJobNamedProperty_JobId = -1;
@@ -1466,7 +1457,6 @@ static gint hf_spoolss_spoolss_CorePrinterDriver_driver_version = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_DIRECT = -1;
 static gint hf_spoolss_spoolss_DriverInfo101_driver_date = -1;
 static gint hf_spoolss_spoolss_SetForm_handle = -1;
-static gint hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt64_propertyInt64 = -1;
 static gint hf_spoolss_spoolss_DriverInfo4_architecture = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_num_error_out_of_paper = -1;
 static gint hf_spoolss_spoolss_DsPrintAction_DSPRINT_PENDING = -1;
@@ -1481,7 +1471,6 @@ static gint hf_spoolss_spoolss_UserLevel3_processor = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_caRedGamma = -1;
 static gint hf_spoolss_spoolss_EnumPrinterData_handle = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_job_error = -1;
-static gint hf_spoolss_spoolss_SetPortInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_PACKAGE_AWARE = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PAPER_PROBLEM = -1;
 static gint hf_spoolss_spoolss_SetPortInfoContainer_level = -1;
@@ -1491,10 +1480,12 @@ static gint hf_spoolss_spoolss_DeviceMode_defaultsource = -1;
 static gint hf_spoolss_spoolss_FormSize_width = -1;
 static gint hf_spoolss_spoolss_SetPrinter_handle = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_caRedGamma = -1;
+static gint hf_spoolss_RPC_PrintPropertyValueUnion_propertyString = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_portname = -1;
 static gint hf_spoolss_spoolss_EnumPrinterData_data = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcessors_info = -1;
 static gint hf_spoolss_spoolss_DocumentInfoCtr_info = -1;
+static gint hf_spoolss_spoolss_PrinterData_binary = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_caRedGreenTint = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_RAW_ONLY = -1;
 static gint hf_spoolss_spoolss_DriverInfo8_min_inbox_driver_ver_version = -1;
@@ -1524,17 +1515,15 @@ static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_OFFLINE = -1;
 static gint hf_spoolss_spoolss_EndPagePrinter_handle = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_DEFAULT = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo3__ndr_size_dependent_files = -1;
-static gint hf_spoolss_spoolss_DriverInfo_val101_info101 = -1;
 static gint hf_spoolss_spoolss_SetForm_form_name = -1;
 static gint hf_spoolss_spoolss_GetPrintProcessorDirectory_level = -1;
 static gint hf_spoolss_spoolss_AddPrintProcessor_path_name = -1;
 static gint hf_spoolss_spoolss_PortData2_port_monitor_mib_index = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo4_driver_path = -1;
+static gint hf_spoolss_spoolss_AddDriverInfo_info6 = -1;
 static gint hf_spoolss_spoolss_DriverInfo4_help_file = -1;
 static gint hf_spoolss___spoolss_EnumJobs_count = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_val8_info8 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_caReferenceWhite = -1;
-static gint hf_spoolss_spoolss_SetPrinterInfo_val4_info4 = -1;
 static gint hf_spoolss_spoolss_GetCorePrinterDrivers_core_printer_driver_count = -1;
 static gint hf_spoolss_spoolss_ReplyOpenPrinter_handle = -1;
 static gint hf_spoolss_spoolss_JobInfo2_time = -1;
@@ -1548,24 +1537,24 @@ static gint hf_spoolss_spoolss_SetJobInfo4__devmode_ptr = -1;
 static gint hf_spoolss_spoolss_GetJob_level = -1;
 static gint hf_spoolss_spoolss_DeviceMode_ttoption = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver_info_ = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_aOptions = -1;
 static gint hf_spoolss_spoolss_RpcGetJobNamedPropertyValue_pValue = -1;
+static gint hf_spoolss_spoolss_DriverInfo_info3 = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA500_wVer = -1;
-static gint hf_spoolss_spoolss_PrinterData_valREG_DWORD_value = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA500_iLayout = -1;
 static gint hf_spoolss_spoolss_PortData1_device_type = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcDataTypes_info = -1;
 static gint hf_spoolss_spoolss_DeviceMode_displayflags = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA351_wchEPSFile = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_info9 = -1;
 static gint hf_spoolss_spoolss_Time_day_of_week = -1;
-static gint hf_spoolss_RPC_BIDI_DATA_u_valBIDI_NULL_bData = -1;
 static gint hf_spoolss_spoolss_JobInfo1_text_status = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_servername = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_WRITE_JOB = -1;
 static gint hf_spoolss_spoolss_SetPrinterData_type = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_processor_type = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo5_transmission_retry_timeout = -1;
+static gint hf_spoolss_spoolss_FormInfo_info2 = -1;
 static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_ERROR = -1;
 static gint hf_spoolss_spoolss_EnumPrinterDrivers_needed = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_iPSLevel = -1;
@@ -1588,9 +1577,10 @@ static gint hf_spoolss_spoolss_SetJobInfo4_print_processor = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_caBlueGamma = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_until_time = -1;
 static gint hf_spoolss___spoolss_EnumForms_count = -1;
+static gint hf_spoolss_spoolss_DriverInfo_info101 = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PRINTER_DRIVER = -1;
+static gint hf_spoolss_spoolss_SetJobInfo_info1 = -1;
 static gint hf_spoolss_spoolss_MonitorInfo2_dll_name = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0400_psdrvextra400 = -1;
 static gint hf_spoolss_spoolss_RouterReplyPrinter_flags = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver2_client_minor_version = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_dwBookletFlags = -1;
@@ -1610,7 +1600,6 @@ static gint hf_spoolss_spoolss_JTEXP_dwSize = -1;
 static gint hf_spoolss_spoolss_PortVarContainer_monitor_data_size = -1;
 static gint hf_spoolss_spoolss_EnumJobs_numjobs = -1;
 static gint hf_spoolss__spoolss_EnumJobs_firstjob = -1;
-static gint hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeBuffer_propertyBlob = -1;
 static gint hf_spoolss_spoolss_XcvData__in_data_length = -1;
 static gint hf_spoolss_spoolss_SetPrinter_info_ctr = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_processor_architecture = -1;
@@ -1621,7 +1610,6 @@ static gint hf_spoolss_spoolss_OpenPrinterEx_userlevel_ctr = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8__ndr_size_dependent_files = -1;
 static gint hf_spoolss_spoolss_UNIDRVEXTRA_dwOptions = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_dwX = -1;
-static gint hf_spoolss_spoolss_PrinterData_valREG_MULTI_SZ_string_array = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo0_cjobs = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_JOB = -1;
 static gint hf_spoolss___spoolss_EnumMonitors_count = -1;
@@ -1631,7 +1619,6 @@ static gint hf_spoolss_werror = -1;
 static gint hf_spoolss_spoolss_EnumMonitors_servername = -1;
 static gint hf_spoolss_spoolss_AddJob_level = -1;
 static gint hf_spoolss_spoolss_AccessRights_PRINTER_ACCESS_USE = -1;
-static gint hf_spoolss_spoolss_PrintProcDataTypesInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_data_type = -1;
 static gint hf_spoolss_spoolss_AddMonitorInfo2_environment = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo8__ndr_size_previous_names = -1;
@@ -1656,20 +1643,24 @@ static gint hf_spoolss_spoolss_UNIDRVEXTRA500_aOptions = -1;
 static gint hf_spoolss_spoolss_SetJobInfo4_text_status = -1;
 static gint hf_spoolss_spoolss_RpcEnumJobNamedProperties_pcProperties = -1;
 static gint hf_spoolss_spoolss_JTEXP_ModelName = -1;
-static gint hf_spoolss_spoolss_PrinterInfo_val7_info7 = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_caFlags = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_SHARED = -1;
 static gint hf_spoolss_spoolss_RouterReplyPrinterEx_handle = -1;
+static gint hf_spoolss_spoolss_PrintProcessorInfo_info1 = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_DEFAULT = -1;
 static gint hf_spoolss_spoolss_GetPrinterDriver2_server_minor_version = -1;
 static gint hf_spoolss_spoolss_EnumJobs_offered = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PRINT_PROCESSOR = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_COLLATE = -1;
 static gint hf_spoolss_spoolss_EnumMonitors_offered = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_uniblob = -1;
 static gint hf_spoolss_spoolss_WritePrinter_handle = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_dwSignature = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo5_driver_path = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo5_portname = -1;
+static gint hf_spoolss_spoolss_Field_field = -1;
+static gint hf_spoolss_spoolss_AddDriverInfo_info2 = -1;
+static gint hf_spoolss_spoolss_AddMonitorInfo_info1 = -1;
 static gint hf_spoolss_spoolss_OSVersionEx_major = -1;
 static gint hf_spoolss_spoolss_AddFormInfo2_mui_dll = -1;
 static gint hf_spoolss_spoolss_SetPortInfo2_reserved = -1;
@@ -1688,12 +1679,13 @@ static gint hf_spoolss_spoolss_PrinterInfo2_devmode = -1;
 static gint hf_spoolss_spoolss_GetPrinterData_data = -1;
 static gint hf_spoolss_spoolss_RouterRefreshPrinterChangeNotify_handle = -1;
 static gint hf_spoolss_spoolss_JobStatus_JOB_STATUS_COMPLETE = -1;
+static gint hf_spoolss_spoolss_AddDriverInfo_info8 = -1;
 static gint hf_spoolss_spoolss_DeviceMode_collate = -1;
-static gint hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0301_unidrvextra3_4 = -1;
 static gint hf_spoolss_spoolss_DeleteForm_form_name = -1;
 static gint hf_spoolss_spoolss_Time_day = -1;
 static gint hf_spoolss_spoolss_DriverDirectoryInfo1_directory_name = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_start_time = -1;
+static gint hf_spoolss_spoolss_PrinterInfo_info6 = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_printprocessor = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_dwWidthOffset = -1;
 static gint hf_spoolss_spoolss_ReplyOpenPrinter_server_name = -1;
@@ -1712,7 +1704,6 @@ static gint hf_spoolss_spoolss_UNIDRVEXTRA500_dwFlags = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_IO_ACTIVE = -1;
 static gint hf_spoolss_spoolss_PrinterInfo1_name = -1;
 static gint hf_spoolss_spoolss_PortData2_portname = -1;
-static gint hf_spoolss_spoolss_DocumentInfo_val1_info1 = -1;
 static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_PORT = -1;
 static gint hf_spoolss_spoolss_OEM_DMEXTRA_dwSize = -1;
 static gint hf_spoolss_spoolss_AddPort_server_name = -1;
@@ -1728,17 +1719,19 @@ static gint hf_spoolss_spoolss_SetJobInfo4_submitted = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PELSWIDTH = -1;
 static gint hf_spoolss_spoolss_SetJobInfo1_server_name = -1;
 static gint hf_spoolss_spoolss_DeviceMode_color = -1;
+static gint hf_spoolss_spoolss_ReplyPrinterInfo_info0 = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_OFFLINE = -1;
 static gint hf_spoolss_spoolss_GetPrinterData_needed = -1;
 static gint hf_spoolss_spoolss_EnumPrinterDrivers_info = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_fxScrFreq = -1;
 static gint hf_spoolss_spoolss_ReplyOpenPrinter_buffer = -1;
 static gint hf_spoolss_spoolss_AccessRights_SERVER_ACCESS_ADMINISTER = -1;
+static gint hf_spoolss_spoolss_JobInfo_info1 = -1;
 static gint hf_spoolss_spoolss_GetPrintProcessorDirectory_environment = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_caReferenceWhite = -1;
 static gint hf_spoolss_spoolss_MonitorContainer_info = -1;
+static gint hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra400 = -1;
 static gint hf_spoolss_spoolss_DriverInfo5_data_file = -1;
-static gint hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_SECURITYDESCRIPTOR_sd = -1;
 static gint hf_spoolss_spoolss_JobInfo2_total_pages = -1;
 static gint hf_spoolss_spoolss_SetJobInfo1_priority = -1;
 static gint hf_spoolss_opnum = -1;
@@ -1757,13 +1750,13 @@ static gint hf_spoolss_spoolss_PrinterInfo3_secdesc_ = -1;
 static gint hf_spoolss_spoolss_DeleteForm_handle = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_NO_TONER = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_dwOptions = -1;
+static gint hf_spoolss_spoolss_NotifyData_time = -1;
 static gint hf_spoolss_spoolss_AddPrinter_devmode_ctr = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_caFlags = -1;
 static gint hf_spoolss_spoolss_DeviceModeFields_DEVMODE_POSITION = -1;
 static gint hf_spoolss_spoolss_NotifyOption_flags = -1;
 static gint hf_spoolss_spoolss_SetJobInfo2_parameters = -1;
 static gint hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_ENABLE_DEVQ = -1;
-static gint hf_spoolss_spoolss_DriverInfo_val3_info3 = -1;
 static gint hf_spoolss_spoolss_EnumPorts_info = -1;
 static gint hf_spoolss_spoolss_DeviceMode_paperlength = -1;
 static gint hf_spoolss_spoolss_DriverInfo5_driver_version = -1;
@@ -1772,8 +1765,10 @@ static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_FAILED_CONNECTI
 static gint hf_spoolss_spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_ROTATE_180 = -1;
 static gint hf_spoolss_spoolss_AddDriverInfo2_data_file = -1;
 static gint hf_spoolss_spoolss_DeviceMode_specversion = -1;
+static gint hf_spoolss_spoolss_PortInfo_info2 = -1;
 static gint hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON1 = -1;
 static gint hf_spoolss_spoolss_WritePrinter__data_size = -1;
+static gint hf_spoolss_RPC_PrintPropertyValueUnion_propertyBlob = -1;
 static gint hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_SANDBOX_ENABLED = -1;
 static gint hf_spoolss_spoolss_GetCorePrinterDrivers_core_printer_drivers = -1;
 static gint hf_spoolss_spoolss_UserLevel1_size = -1;
@@ -1787,7 +1782,6 @@ static gint hf_spoolss_spoolss_AddDriverInfo4_dependent_files = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_num_error_not_ready = -1;
 static gint hf_spoolss_spoolss_SetPrinterInfo2_defaultpriority = -1;
 static gint hf_spoolss_spoolss_PrinterInfo0_printername = -1;
-static gint hf_spoolss_spoolss_AddFormInfo_val2_info2 = -1;
 static gint hf_spoolss__spoolss_EnumPrintProcDataTypes_offered = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA_dwNupDirection = -1;
 static gint hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PRINTING = -1;
@@ -1795,7 +1789,6 @@ static gint hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_SET_JOB = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA500_caFlags = -1;
 static gint hf_spoolss_spoolss_PrinterInfo2_status = -1;
 static gint hf_spoolss_spoolss_GetForm_info_ = -1;
-static gint hf_spoolss_spoolss_SetPortInfo_val0xff_infoFF = -1;
 static gint hf_spoolss_spoolss_PSDRVEXTRA400_wChecksum = -1;
 static gint hf_spoolss_RPC_PrintNamedProperty_propertyName = -1;
 
@@ -2309,15 +2302,15 @@ static int spoolss_dissect_element_OEM_DMEXTRA_dwSize(tvbuff_t *tvb _U_, int off
 static int spoolss_dissect_element_OEM_DMEXTRA_dwSignature(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_OEM_DMEXTRA_dwVersion(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_OEM_DMEXTRA_Data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0350_psdrvextra351(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0400_psdrvextra400(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0501_psdrvextra500(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0600_psdrvextra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataPostScript_valdefault_psblob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0301_unidrvextra3_4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0500_unidrvextra500(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0600_unidrvextra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DeviceModeExtraDataUniDriver_valdefault_uniblob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra351(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra400(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra500(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataPostScript_psblob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra3_4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra500(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DeviceModeExtraDataUniDriver_uniblob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static const true_false_string spoolss_DeviceModeFields_DEVMODE_ORIENTATION_tfs = {
    "DEVMODE_ORIENTATION is SET",
    "DEVMODE_ORIENTATION is NOT SET",
@@ -2882,16 +2875,16 @@ static int spoolss_dissect_element_PrinterInfo7_action(tvbuff_t *tvb _U_, int of
 static int spoolss_dissect_element_DeviceModeInfo_devmode(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DeviceModeInfo_devmode_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DeviceModeInfo_devmode__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterInfo_val9_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterInfo_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DevmodeContainer__ndr_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DevmodeContainer_devmode(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DevmodeContainer_devmode_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -2993,10 +2986,10 @@ static int spoolss_dissect_element_JobInfo4_submitted(tvbuff_t *tvb _U_, int off
 static int spoolss_dissect_element_JobInfo4_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_JobInfo4_pages_printed(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_JobInfo4_size_high(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_JobInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_JobInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_JobInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_JobInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_JobInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_JobInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_JobInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_JobInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetJobInfo1_job_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetJobInfo1_printer_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetJobInfo1_printer_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3087,14 +3080,14 @@ static int spoolss_dissect_element_SetJobInfo4_submitted(tvbuff_t *tvb _U_, int
 static int spoolss_dissect_element_SetJobInfo4_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetJobInfo4_pages_printed(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetJobInfo4_size_high(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetJobInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetJobInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetJobInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetJobInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetJobInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetJobInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetJobInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetJobInfo_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetJobInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetJobInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetJobInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetJobInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetJobInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetJobInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetJobInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetJobInfo_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_JobInfoContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_JobInfoContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 const value_string spoolss_spoolss_JobControl_vals[] = {
@@ -3211,26 +3204,26 @@ static int spoolss_dissect_element_SetPrinterInfo8_devmode_ptr(tvbuff_t *tvb _U_
 static int spoolss_dissect_element_SetPrinterInfo8_devmode_ptr_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPrinterInfo9_devmode_ptr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPrinterInfo9_devmode_ptr_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val5_info5_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val6_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val7_info7_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val8_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val9_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfo_val9_info9_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info5_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info7_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPrinterInfo_info9_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPrinterInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_SetPrinterInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_StringArray__ndr_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3438,18 +3431,18 @@ static int spoolss_dissect_element_AddDriverInfo8_core_driver_dependencies(tvbuf
 static int spoolss_dissect_element_AddDriverInfo8_core_driver_dependencies_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddDriverInfo8_min_inbox_driver_ver_date(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddDriverInfo8_min_inbox_driver_ver_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_val6_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfo_val8_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddDriverInfo_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddDriverInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_AddDriverInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_DriverInfo1_driver_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3639,32 +3632,32 @@ static int spoolss_dissect_element_DriverInfo101_hardware_id(tvbuff_t *tvb _U_,
 static int spoolss_dissect_element_DriverInfo101_hardware_id_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DriverInfo101_provider(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DriverInfo101_provider_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverInfo_val101_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverInfo_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DriverDirectoryInfo1_directory_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverDirectoryInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DriverDirectoryInfo_valdefault_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverDirectoryInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DriverDirectoryInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PrintProcessorInfo1_print_processor_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PrintProcessorInfo1_print_processor_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrintProcessorInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrintProcessorInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PrintProcessorDirectoryInfo1_directory_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrintProcessorDirectoryInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrintProcessorDirectoryInfo_valdefault_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrintProcessorDirectoryInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrintProcessorDirectoryInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DocumentInfo1_document_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DocumentInfo1_document_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DocumentInfo1_output_file(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DocumentInfo1_output_file_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DocumentInfo1_datatype(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DocumentInfo1_datatype_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DocumentInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DocumentInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DocumentInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_DocumentInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DocumentInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_DocumentInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_OSVersion__ndr_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3686,11 +3679,11 @@ static int spoolss_dissect_element_OSVersionEx_service_pack_minor(tvbuff_t *tvb
 static int spoolss_dissect_element_OSVersionEx_suite_mask(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_OSVersionEx_product_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_OSVersionEx_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterData_valREG_SZ_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterData_valREG_BINARY_binary(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterData_valREG_DWORD_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterData_valREG_MULTI_SZ_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrinterData_valdefault_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterData_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterData_binary(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterData_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterData_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrinterData_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 const value_string spoolss_spoolss_FormFlags_vals[] = {
        { SPOOLSS_FORM_USER, "SPOOLSS_FORM_USER" },
        { SPOOLSS_FORM_BUILTIN, "SPOOLSS_FORM_BUILTIN" },
@@ -3735,8 +3728,8 @@ static int spoolss_dissect_element_FormInfo2_display_name(tvbuff_t *tvb _U_, int
 static int spoolss_dissect_element_FormInfo2_display_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_FormInfo2_lang_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_FormInfo2_unused(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_FormInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_FormInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_FormInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_FormInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddFormInfo1_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddFormInfo1_form_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddFormInfo1_form_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3756,10 +3749,10 @@ static int spoolss_dissect_element_AddFormInfo2_ressource_id(tvbuff_t *tvb _U_,
 static int spoolss_dissect_element_AddFormInfo2_display_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddFormInfo2_display_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddFormInfo2_lang_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddFormInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddFormInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddFormInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddFormInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddFormInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddFormInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddFormInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddFormInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddFormInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_AddFormInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_PortInfo1_port_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3817,10 +3810,10 @@ static int spoolss_dissect_element_PortInfo3_severity(tvbuff_t *tvb _U_, int off
 static int spoolss_dissect_element_PortInfoFF_port_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PortInfoFF_port_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PortInfoFF_monitor_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PortInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PortInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PortInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PortInfo_val0xff_infoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PortInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PortInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PortInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PortInfo_infoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_MonitorInfo1_monitor_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_MonitorInfo1_monitor_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_MonitorInfo2_monitor_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3829,8 +3822,8 @@ static int spoolss_dissect_element_MonitorInfo2_environment(tvbuff_t *tvb _U_, i
 static int spoolss_dissect_element_MonitorInfo2_environment_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_MonitorInfo2_dll_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_MonitorInfo2_dll_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_MonitorInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_MonitorInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_MonitorInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_MonitorInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPortInfo1_port_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPortInfo1_port_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPortInfo2_port_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3848,14 +3841,14 @@ static int spoolss_dissect_element_SetPortInfo3_severity(tvbuff_t *tvb _U_, int
 static int spoolss_dissect_element_SetPortInfoFF_port_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPortInfoFF_port_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPortInfoFF_monitor_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPortInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPortInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPortInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPortInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPortInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPortInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPortInfo_val0xff_infoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPortInfo_val0xff_infoFF_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPortInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPortInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPortInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPortInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPortInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPortInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPortInfo_infoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_SetPortInfo_infoFF_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPortInfoContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_SetPortInfoContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_UNIVERSAL_FONT_ID_Checksum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3871,15 +3864,15 @@ static int spoolss_dissect_element_AddMonitorInfo2_environment(tvbuff_t *tvb _U_
 static int spoolss_dissect_element_AddMonitorInfo2_environment_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddMonitorInfo2_dll_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddMonitorInfo2_dll_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddMonitorInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddMonitorInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddMonitorInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddMonitorInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddMonitorInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddMonitorInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddMonitorInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_AddMonitorInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_MonitorContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_MonitorContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_PrintProcDataTypesInfo1_name_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PrintProcDataTypesInfo1_name_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_PrintProcDataTypesInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_PrintProcDataTypesInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static const true_false_string spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PRINTER_tfs = {
    "PRINTER_CHANGE_ADD_PRINTER is SET",
    "PRINTER_CHANGE_ADD_PRINTER is NOT SET",
@@ -4031,9 +4024,9 @@ const value_string spoolss_spoolss_NotifyType_vals[] = {
        { JOB_NOTIFY_TYPE, "JOB_NOTIFY_TYPE" },
 { 0, NULL }
 };
-static int spoolss_dissect_element_Field_valPRINTER_NOTIFY_TYPE_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_Field_valJOB_NOTIFY_TYPE_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_Field_valdefault_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_Field_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_Field_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_Field_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_NotifyOptionType_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *type);
 static int spoolss_dissect_element_NotifyOptionType_u1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_NotifyOptionType_u2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -4064,12 +4057,12 @@ const value_string spoolss_spoolss_NotifyTable_vals[] = {
        { NOTIFY_TABLE_SECURITYDESCRIPTOR, "NOTIFY_TABLE_SECURITYDESCRIPTOR" },
 { 0, NULL }
 };
-static int spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DWORD_integer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DWORD_integer_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_STRING_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DEVMODE_devmode(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_TIME_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_SECURITYDESCRIPTOR_sd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_NotifyData_integer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_NotifyData_integer_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_NotifyData_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_NotifyData_devmode(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_NotifyData_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_NotifyData_sd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_Notify_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_Notify_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
 static int spoolss_dissect_element_Notify_variable_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *variable_type);
@@ -4080,8 +4073,8 @@ static int spoolss_dissect_element_NotifyInfo_flags(tvbuff_t *tvb _U_, int offse
 static int spoolss_dissect_element_NotifyInfo_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_NotifyInfo_notifies(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_NotifyInfo_notifies_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_ReplyPrinterInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_ReplyPrinterInfo_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_ReplyPrinterInfo_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_ReplyPrinterInfo_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static const true_false_string spoolss_PrinterNotifyFlags_PRINTER_NOTIFY_INFO_DISCARDED_tfs = {
    "PRINTER_NOTIFY_INFO_DISCARDED is SET",
    "PRINTER_NOTIFY_INFO_DISCARDED is NOT SET",
@@ -4116,12 +4109,12 @@ static int spoolss_dissect_element_UserLevel3_major(tvbuff_t *tvb _U_, int offse
 static int spoolss_dissect_element_UserLevel3_minor(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_UserLevel3_processor(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_UserLevel3_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_UserLevel_val1_level1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_UserLevel_val1_level1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_UserLevel_val2_level2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_UserLevel_val2_level2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_UserLevel_val3_level3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_UserLevel_val3_level3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_UserLevel_level1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_UserLevel_level1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_UserLevel_level2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_UserLevel_level2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_UserLevel_level3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_UserLevel_level3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_UserLevelCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_UserLevelCtr_user_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static const true_false_string spoolss_AccessRights_SERVER_ACCESS_ADMINISTER_tfs = {
@@ -4156,7 +4149,7 @@ static int spoolss_dissect_element_PrinterEnumValues_data(tvbuff_t *tvb _U_, int
 static int spoolss_dissect_element_PrinterEnumValues_data_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PrinterEnumValues_data__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PrinterEnumValues_data_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_KeyNames_valdefault_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_KeyNames_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static const true_false_string spoolss_DeleteDriverFlags_DPD_DELETE_UNUSED_FILES_tfs = {
    "DPD_DELETE_UNUSED_FILES is SET",
    "DPD_DELETE_UNUSED_FILES is NOT SET",
@@ -4263,16 +4256,16 @@ static int spoolss_dissect_element_RPC_BINARY_CONTAINER_cbBuf(tvbuff_t *tvb _U_,
 static int spoolss_dissect_element_RPC_BINARY_CONTAINER_pszString(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_RPC_BINARY_CONTAINER_pszString_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_RPC_BINARY_CONTAINER_pszString__(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_NULL_bData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_BOOL_bData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_INT_iData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_STRING_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_STRING_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_TEXT_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_TEXT_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_ENUM_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_ENUM_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_BLOB_biData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_bData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_bData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_iData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u_biData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_RPC_BIDI_DATA_dwBidiType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *dwBidiType);
 static int spoolss_dissect_element_RPC_BIDI_DATA_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *dwBidiType);
 static int spoolss_dissect_element_RPC_BIDI_REQUEST_DATA_dwReqNumber(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -4313,12 +4306,12 @@ static int spoolss_dissect_element_propertyBlob_cbBuf(tvbuff_t *tvb _U_, int off
 static int spoolss_dissect_element_propertyBlob_pBuf(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_propertyBlob_pBuf_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_propertyBlob_pBuf__(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt32_propertyInt32(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt64_propertyInt64(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeByte_propertyByte(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeBuffer_propertyBlob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyString(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyString_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyInt32(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyInt64(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyByte(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyBlob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_RPC_PrintPropertyValue_ePropertyType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *ePropertyType);
 static int spoolss_dissect_element_RPC_PrintPropertyValue_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *ePropertyType);
 static int spoolss_dissect_element_RPC_PrintNamedProperty_propertyName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -8672,41 +8665,41 @@ spoolss_dissect_struct_OEM_DMEXTRA(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 /* IDL: } */
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0350_psdrvextra351(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra351(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PSDRVEXTRA351(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0350_psdrvextra351,0);
+       offset = spoolss_dissect_struct_PSDRVEXTRA351(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra351,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0400_psdrvextra400(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra400(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PSDRVEXTRA400(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0400_psdrvextra400,0);
+       offset = spoolss_dissect_struct_PSDRVEXTRA400(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra400,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0501_psdrvextra500(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra500(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PSDRVEXTRA500(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0501_psdrvextra500,0);
+       offset = spoolss_dissect_struct_PSDRVEXTRA500(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra500,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0600_psdrvextra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PSDRVEXTRA(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0600_psdrvextra,0);
+       offset = spoolss_dissect_struct_PSDRVEXTRA(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataPostScript_valdefault_psblob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataPostScript_psblob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_DeviceModeExtraDataPostScript_valdefault_psblob, 1);
+       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psblob, 1);
 
        return offset;
 }
@@ -8727,23 +8720,23 @@ spoolss_dissect_DeviceModeExtraDataPostScript(tvbuff_t *tvb _U_, int offset _U_,
 
        switch(level) {
                case 0x0350:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0350_psdrvextra351(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra351(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x0400:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0400_psdrvextra400(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra400(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x0501:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0501_psdrvextra500(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra500(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x0600:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_val0x0600_psdrvextra(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_psdrvextra(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_valdefault_psblob(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataPostScript_psblob(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -8760,33 +8753,33 @@ spoolss_dissect_DeviceModeExtraDataPostScript(tvbuff_t *tvb _U_, int offset _U_,
 /* IDL: } */
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0301_unidrvextra3_4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra3_4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_UNIDRVEXTRA3_4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0301_unidrvextra3_4,0);
+       offset = spoolss_dissect_struct_UNIDRVEXTRA3_4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra3_4,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0500_unidrvextra500(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra500(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_UNIDRVEXTRA500(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0500_unidrvextra500,0);
+       offset = spoolss_dissect_struct_UNIDRVEXTRA500(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra500,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0600_unidrvextra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_UNIDRVEXTRA(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0600_unidrvextra,0);
+       offset = spoolss_dissect_struct_UNIDRVEXTRA(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DeviceModeExtraDataUniDriver_valdefault_uniblob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DeviceModeExtraDataUniDriver_uniblob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_valdefault_uniblob, 1);
+       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_uniblob, 1);
 
        return offset;
 }
@@ -8807,19 +8800,19 @@ spoolss_dissect_DeviceModeExtraDataUniDriver(tvbuff_t *tvb _U_, int offset _U_,
 
        switch(level) {
                case 0x0301:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0301_unidrvextra3_4(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra3_4(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x0500:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0500_unidrvextra500(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra500(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0x0600:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataUniDriver_val0x0600_unidrvextra(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataUniDriver_unidrvextra(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = spoolss_dissect_element_DeviceModeExtraDataUniDriver_valdefault_uniblob(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DeviceModeExtraDataUniDriver_uniblob(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -11372,81 +11365,81 @@ spoolss_dissect_struct_DeviceModeInfo(tvbuff_t *tvb _U_, int offset _U_, packet_
 /* IDL: } */
 
 static int
-spoolss_dissect_element_PrinterInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrinterInfo0(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val0_info0,0);
+       offset = spoolss_dissect_struct_PrinterInfo0(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info0,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrinterInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val1_info1,0);
+       offset = spoolss_dissect_struct_PrinterInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrinterInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val2_info2,0);
+       offset = spoolss_dissect_struct_PrinterInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrinterInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val3_info3,0);
+       offset = spoolss_dissect_struct_PrinterInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info3,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrinterInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val4_info4,0);
+       offset = spoolss_dissect_struct_PrinterInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info4,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrinterInfo5(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val5_info5,0);
+       offset = spoolss_dissect_struct_PrinterInfo5(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info5,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrinterInfo6(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val6_info6,0);
+       offset = spoolss_dissect_struct_PrinterInfo6(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info6,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrinterInfo7(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val7_info7,0);
+       offset = spoolss_dissect_struct_PrinterInfo7(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info7,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DeviceModeInfo(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val8_info8,0);
+       offset = spoolss_dissect_struct_DeviceModeInfo(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info8,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterInfo_val9_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterInfo_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DeviceModeInfo(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_val9_info9,0);
+       offset = spoolss_dissect_struct_DeviceModeInfo(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterInfo_info9,0);
 
        return offset;
 }
@@ -11467,43 +11460,43 @@ spoolss_dissect_PrinterInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 
        switch(level) {
                case 0:
-                       offset = spoolss_dissect_element_PrinterInfo_val0_info0(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_info0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = spoolss_dissect_element_PrinterInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_PrinterInfo_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_PrinterInfo_val3_info3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = spoolss_dissect_element_PrinterInfo_val4_info4(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_info4(tvb, offset, pinfo, tree, drep);
                break;
 
                case 5:
-                       offset = spoolss_dissect_element_PrinterInfo_val5_info5(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_info5(tvb, offset, pinfo, tree, drep);
                break;
 
                case 6:
-                       offset = spoolss_dissect_element_PrinterInfo_val6_info6(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_info6(tvb, offset, pinfo, tree, drep);
                break;
 
                case 7:
-                       offset = spoolss_dissect_element_PrinterInfo_val7_info7(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_info7(tvb, offset, pinfo, tree, drep);
                break;
 
                case 8:
-                       offset = spoolss_dissect_element_PrinterInfo_val8_info8(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_info8(tvb, offset, pinfo, tree, drep);
                break;
 
                case 9:
-                       offset = spoolss_dissect_element_PrinterInfo_val9_info9(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterInfo_info9(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -12752,33 +12745,33 @@ spoolss_dissect_struct_JobInfo4(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 /* IDL: } */
 
 static int
-spoolss_dissect_element_JobInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_JobInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_JobInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_JobInfo_val1_info1,0);
+       offset = spoolss_dissect_struct_JobInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_JobInfo_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_JobInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_JobInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_JobInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_JobInfo_val2_info2,0);
+       offset = spoolss_dissect_struct_JobInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_JobInfo_info2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_JobInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_JobInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_JobInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_JobInfo_val3_info3,0);
+       offset = spoolss_dissect_struct_JobInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_JobInfo_info3,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_JobInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_JobInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_JobInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_JobInfo_val4_info4,0);
+       offset = spoolss_dissect_struct_JobInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_JobInfo_info4,0);
 
        return offset;
 }
@@ -12799,19 +12792,19 @@ spoolss_dissect_JobInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_JobInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_JobInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_JobInfo_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_JobInfo_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_JobInfo_val3_info3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_JobInfo_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = spoolss_dissect_element_JobInfo_val4_info4(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_JobInfo_info4(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -13906,65 +13899,65 @@ spoolss_dissect_struct_SetJobInfo4(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 /* IDL: } */
 
 static int
-spoolss_dissect_element_SetJobInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetJobInfo_info1(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, spoolss_dissect_element_SetJobInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_SetJobInfo1)",hf_spoolss_spoolss_SetJobInfo_val1_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetJobInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_SetJobInfo1)",hf_spoolss_spoolss_SetJobInfo_info1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetJobInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetJobInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetJobInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetJobInfo_val1_info1,0);
+       offset = spoolss_dissect_struct_SetJobInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetJobInfo_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetJobInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetJobInfo_info2(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, spoolss_dissect_element_SetJobInfo_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_SetJobInfo2)",hf_spoolss_spoolss_SetJobInfo_val2_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetJobInfo_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_SetJobInfo2)",hf_spoolss_spoolss_SetJobInfo_info2);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetJobInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetJobInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetJobInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetJobInfo_val2_info2,0);
+       offset = spoolss_dissect_struct_SetJobInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetJobInfo_info2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetJobInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetJobInfo_info3(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, spoolss_dissect_element_SetJobInfo_val3_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (spoolss_JobInfo3)",hf_spoolss_spoolss_SetJobInfo_val3_info3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetJobInfo_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (spoolss_JobInfo3)",hf_spoolss_spoolss_SetJobInfo_info3);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetJobInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetJobInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_JobInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetJobInfo_val3_info3,0);
+       offset = spoolss_dissect_struct_JobInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetJobInfo_info3,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetJobInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetJobInfo_info4(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, spoolss_dissect_element_SetJobInfo_val4_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (spoolss_SetJobInfo4)",hf_spoolss_spoolss_SetJobInfo_val4_info4);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetJobInfo_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (spoolss_SetJobInfo4)",hf_spoolss_spoolss_SetJobInfo_info4);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetJobInfo_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetJobInfo_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetJobInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetJobInfo_val4_info4,0);
+       offset = spoolss_dissect_struct_SetJobInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetJobInfo_info4,0);
 
        return offset;
 }
@@ -13988,19 +13981,19 @@ spoolss_dissect_SetJobInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_SetJobInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetJobInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_SetJobInfo_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetJobInfo_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_SetJobInfo_val3_info3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetJobInfo_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = spoolss_dissect_element_SetJobInfo_val4_info4(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetJobInfo_info4(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -15471,161 +15464,161 @@ spoolss_dissect_struct_SetPrinterInfo9(tvbuff_t *tvb _U_, int offset _U_, packet
 /* IDL: } */
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info0(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, spoolss_dissect_element_SetPrinterInfo_val0_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (spoolss_SetPrinterInfo0)",hf_spoolss_spoolss_SetPrinterInfo_val0_info0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (spoolss_SetPrinterInfo0)",hf_spoolss_spoolss_SetPrinterInfo_info0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo0(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val0_info0,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo0(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info0,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info1(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, spoolss_dissect_element_SetPrinterInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_SetPrinterInfo1)",hf_spoolss_spoolss_SetPrinterInfo_val1_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_SetPrinterInfo1)",hf_spoolss_spoolss_SetPrinterInfo_info1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val1_info1,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info2(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, spoolss_dissect_element_SetPrinterInfo_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_SetPrinterInfo2)",hf_spoolss_spoolss_SetPrinterInfo_val2_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_SetPrinterInfo2)",hf_spoolss_spoolss_SetPrinterInfo_info2);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val2_info2,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info3(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, spoolss_dissect_element_SetPrinterInfo_val3_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (spoolss_SetPrinterInfo3)",hf_spoolss_spoolss_SetPrinterInfo_val3_info3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (spoolss_SetPrinterInfo3)",hf_spoolss_spoolss_SetPrinterInfo_info3);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val3_info3,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info3,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info4(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, spoolss_dissect_element_SetPrinterInfo_val4_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (spoolss_SetPrinterInfo4)",hf_spoolss_spoolss_SetPrinterInfo_val4_info4);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (spoolss_SetPrinterInfo4)",hf_spoolss_spoolss_SetPrinterInfo_info4);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val4_info4,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info4,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info5(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, spoolss_dissect_element_SetPrinterInfo_val5_info5_, NDR_POINTER_UNIQUE, "Pointer to Info5 (spoolss_SetPrinterInfo5)",hf_spoolss_spoolss_SetPrinterInfo_val5_info5);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info5_, NDR_POINTER_UNIQUE, "Pointer to Info5 (spoolss_SetPrinterInfo5)",hf_spoolss_spoolss_SetPrinterInfo_info5);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val5_info5_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info5_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo5(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val5_info5,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo5(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info5,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info6(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, spoolss_dissect_element_SetPrinterInfo_val6_info6_, NDR_POINTER_UNIQUE, "Pointer to Info6 (spoolss_SetPrinterInfo6)",hf_spoolss_spoolss_SetPrinterInfo_val6_info6);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info6_, NDR_POINTER_UNIQUE, "Pointer to Info6 (spoolss_SetPrinterInfo6)",hf_spoolss_spoolss_SetPrinterInfo_info6);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val6_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo6(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val6_info6,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo6(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info6,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info7(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, spoolss_dissect_element_SetPrinterInfo_val7_info7_, NDR_POINTER_UNIQUE, "Pointer to Info7 (spoolss_SetPrinterInfo7)",hf_spoolss_spoolss_SetPrinterInfo_val7_info7);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info7_, NDR_POINTER_UNIQUE, "Pointer to Info7 (spoolss_SetPrinterInfo7)",hf_spoolss_spoolss_SetPrinterInfo_info7);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val7_info7_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info7_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo7(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val7_info7,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo7(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info7,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info8(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, spoolss_dissect_element_SetPrinterInfo_val8_info8_, NDR_POINTER_UNIQUE, "Pointer to Info8 (spoolss_SetPrinterInfo8)",hf_spoolss_spoolss_SetPrinterInfo_val8_info8);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info8_, NDR_POINTER_UNIQUE, "Pointer to Info8 (spoolss_SetPrinterInfo8)",hf_spoolss_spoolss_SetPrinterInfo_info8);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val8_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo8(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val8_info8,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo8(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info8,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val9_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info9(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, spoolss_dissect_element_SetPrinterInfo_val9_info9_, NDR_POINTER_UNIQUE, "Pointer to Info9 (spoolss_SetPrinterInfo9)",hf_spoolss_spoolss_SetPrinterInfo_val9_info9);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPrinterInfo_info9_, NDR_POINTER_UNIQUE, "Pointer to Info9 (spoolss_SetPrinterInfo9)",hf_spoolss_spoolss_SetPrinterInfo_info9);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfo_val9_info9_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPrinterInfo_info9_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPrinterInfo9(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_val9_info9,0);
+       offset = spoolss_dissect_struct_SetPrinterInfo9(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPrinterInfo_info9,0);
 
        return offset;
 }
@@ -15649,43 +15642,43 @@ spoolss_dissect_SetPrinterInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 
        switch(level) {
                case 0:
-                       offset = spoolss_dissect_element_SetPrinterInfo_val0_info0(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_info0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = spoolss_dissect_element_SetPrinterInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_SetPrinterInfo_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_SetPrinterInfo_val3_info3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = spoolss_dissect_element_SetPrinterInfo_val4_info4(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_info4(tvb, offset, pinfo, tree, drep);
                break;
 
                case 5:
-                       offset = spoolss_dissect_element_SetPrinterInfo_val5_info5(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_info5(tvb, offset, pinfo, tree, drep);
                break;
 
                case 6:
-                       offset = spoolss_dissect_element_SetPrinterInfo_val6_info6(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_info6(tvb, offset, pinfo, tree, drep);
                break;
 
                case 7:
-                       offset = spoolss_dissect_element_SetPrinterInfo_val7_info7(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_info7(tvb, offset, pinfo, tree, drep);
                break;
 
                case 8:
-                       offset = spoolss_dissect_element_SetPrinterInfo_val8_info8(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_info8(tvb, offset, pinfo, tree, drep);
                break;
 
                case 9:
-                       offset = spoolss_dissect_element_SetPrinterInfo_val9_info9(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPrinterInfo_info9(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -17827,97 +17820,97 @@ spoolss_dissect_struct_AddDriverInfo8(tvbuff_t *tvb _U_, int offset _U_, packet_
 /* IDL: } */
 
 static int
-spoolss_dissect_element_AddDriverInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_info1(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, spoolss_dissect_element_AddDriverInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_AddDriverInfo1)",hf_spoolss_spoolss_AddDriverInfo_val1_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_AddDriverInfo1)",hf_spoolss_spoolss_AddDriverInfo_info1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddDriverInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_val1_info1,0);
+       offset = spoolss_dissect_struct_AddDriverInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_info2(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, spoolss_dissect_element_AddDriverInfo_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_AddDriverInfo2)",hf_spoolss_spoolss_AddDriverInfo_val2_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_AddDriverInfo2)",hf_spoolss_spoolss_AddDriverInfo_info2);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddDriverInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_val2_info2,0);
+       offset = spoolss_dissect_struct_AddDriverInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_info2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_info3(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, spoolss_dissect_element_AddDriverInfo_val3_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (spoolss_AddDriverInfo3)",hf_spoolss_spoolss_AddDriverInfo_val3_info3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (spoolss_AddDriverInfo3)",hf_spoolss_spoolss_AddDriverInfo_info3);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddDriverInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_val3_info3,0);
+       offset = spoolss_dissect_struct_AddDriverInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_info3,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_info4(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, spoolss_dissect_element_AddDriverInfo_val4_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (spoolss_AddDriverInfo4)",hf_spoolss_spoolss_AddDriverInfo_val4_info4);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_info4_, NDR_POINTER_UNIQUE, "Pointer to Info4 (spoolss_AddDriverInfo4)",hf_spoolss_spoolss_AddDriverInfo_info4);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_val4_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddDriverInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_val4_info4,0);
+       offset = spoolss_dissect_struct_AddDriverInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_info4,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_info6(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, spoolss_dissect_element_AddDriverInfo_val6_info6_, NDR_POINTER_UNIQUE, "Pointer to Info6 (spoolss_AddDriverInfo6)",hf_spoolss_spoolss_AddDriverInfo_val6_info6);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_info6_, NDR_POINTER_UNIQUE, "Pointer to Info6 (spoolss_AddDriverInfo6)",hf_spoolss_spoolss_AddDriverInfo_info6);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_val6_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddDriverInfo6(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_val6_info6,0);
+       offset = spoolss_dissect_struct_AddDriverInfo6(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_info6,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_info8(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, spoolss_dissect_element_AddDriverInfo_val8_info8_, NDR_POINTER_UNIQUE, "Pointer to Info8 (spoolss_AddDriverInfo8)",hf_spoolss_spoolss_AddDriverInfo_val8_info8);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddDriverInfo_info8_, NDR_POINTER_UNIQUE, "Pointer to Info8 (spoolss_AddDriverInfo8)",hf_spoolss_spoolss_AddDriverInfo_info8);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddDriverInfo_val8_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddDriverInfo_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddDriverInfo8(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_val8_info8,0);
+       offset = spoolss_dissect_struct_AddDriverInfo8(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddDriverInfo_info8,0);
 
        return offset;
 }
@@ -17941,27 +17934,27 @@ spoolss_dissect_AddDriverInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_AddDriverInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddDriverInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_AddDriverInfo_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddDriverInfo_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_AddDriverInfo_val3_info3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddDriverInfo_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = spoolss_dissect_element_AddDriverInfo_val4_info4(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddDriverInfo_info4(tvb, offset, pinfo, tree, drep);
                break;
 
                case 6:
-                       offset = spoolss_dissect_element_AddDriverInfo_val6_info6(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddDriverInfo_info6(tvb, offset, pinfo, tree, drep);
                break;
 
                case 8:
-                       offset = spoolss_dissect_element_AddDriverInfo_val8_info8(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddDriverInfo_info8(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -20117,73 +20110,73 @@ spoolss_dissect_struct_DriverInfo101(tvbuff_t *tvb _U_, int offset _U_, packet_i
 /* IDL: } */
 
 static int
-spoolss_dissect_element_DriverInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val1_info1,0);
+       offset = spoolss_dissect_struct_DriverInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val2_info2,0);
+       offset = spoolss_dissect_struct_DriverInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val3_info3,0);
+       offset = spoolss_dissect_struct_DriverInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info3,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverInfo_val4_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val4_info4,0);
+       offset = spoolss_dissect_struct_DriverInfo4(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info4,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverInfo_val5_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_info5(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo5(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val5_info5,0);
+       offset = spoolss_dissect_struct_DriverInfo5(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info5,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverInfo_val6_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_info6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo6(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val6_info6,0);
+       offset = spoolss_dissect_struct_DriverInfo6(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info6,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverInfo_val7_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_info7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo7(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val7_info7,0);
+       offset = spoolss_dissect_struct_DriverInfo7(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info7,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverInfo_val8_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo8(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val8_info8,0);
+       offset = spoolss_dissect_struct_DriverInfo8(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info8,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverInfo_val101_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverInfo_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverInfo101(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_val101_info101,0);
+       offset = spoolss_dissect_struct_DriverInfo101(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverInfo_info101,0);
 
        return offset;
 }
@@ -20204,39 +20197,39 @@ spoolss_dissect_DriverInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_DriverInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_DriverInfo_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_DriverInfo_val3_info3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = spoolss_dissect_element_DriverInfo_val4_info4(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_info4(tvb, offset, pinfo, tree, drep);
                break;
 
                case 5:
-                       offset = spoolss_dissect_element_DriverInfo_val5_info5(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_info5(tvb, offset, pinfo, tree, drep);
                break;
 
                case 6:
-                       offset = spoolss_dissect_element_DriverInfo_val6_info6(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_info6(tvb, offset, pinfo, tree, drep);
                break;
 
                case 7:
-                       offset = spoolss_dissect_element_DriverInfo_val7_info7(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_info7(tvb, offset, pinfo, tree, drep);
                break;
 
                case 8:
-                       offset = spoolss_dissect_element_DriverInfo_val8_info8(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_info8(tvb, offset, pinfo, tree, drep);
                break;
 
                case 101:
-                       offset = spoolss_dissect_element_DriverInfo_val101_info101(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverInfo_info101(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -20297,17 +20290,17 @@ spoolss_dissect_struct_DriverDirectoryInfo1(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-spoolss_dissect_element_DriverDirectoryInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverDirectoryInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverDirectoryInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverDirectoryInfo_val1_info1,0);
+       offset = spoolss_dissect_struct_DriverDirectoryInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverDirectoryInfo_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DriverDirectoryInfo_valdefault_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DriverDirectoryInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DriverDirectoryInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverDirectoryInfo_valdefault_info1,0);
+       offset = spoolss_dissect_struct_DriverDirectoryInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DriverDirectoryInfo_info1,0);
 
        return offset;
 }
@@ -20328,11 +20321,11 @@ spoolss_dissect_DriverDirectoryInfo(tvbuff_t *tvb _U_, int offset _U_, packet_in
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_DriverDirectoryInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverDirectoryInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = spoolss_dissect_element_DriverDirectoryInfo_valdefault_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DriverDirectoryInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -20398,9 +20391,9 @@ spoolss_dissect_struct_PrintProcessorInfo1(tvbuff_t *tvb _U_, int offset _U_, pa
 /* IDL: } */
 
 static int
-spoolss_dissect_element_PrintProcessorInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrintProcessorInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrintProcessorInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrintProcessorInfo_val1_info1,0);
+       offset = spoolss_dissect_struct_PrintProcessorInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrintProcessorInfo_info1,0);
 
        return offset;
 }
@@ -20421,7 +20414,7 @@ spoolss_dissect_PrintProcessorInfo(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_PrintProcessorInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrintProcessorInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -20482,17 +20475,17 @@ spoolss_dissect_struct_PrintProcessorDirectoryInfo1(tvbuff_t *tvb _U_, int offse
 /* IDL: } */
 
 static int
-spoolss_dissect_element_PrintProcessorDirectoryInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrintProcessorDirectoryInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrintProcessorDirectoryInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrintProcessorDirectoryInfo_val1_info1,0);
+       offset = spoolss_dissect_struct_PrintProcessorDirectoryInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrintProcessorDirectoryInfo_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrintProcessorDirectoryInfo_valdefault_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrintProcessorDirectoryInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrintProcessorDirectoryInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrintProcessorDirectoryInfo_valdefault_info1,0);
+       offset = spoolss_dissect_struct_PrintProcessorDirectoryInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrintProcessorDirectoryInfo_info1,0);
 
        return offset;
 }
@@ -20513,11 +20506,11 @@ spoolss_dissect_PrintProcessorDirectoryInfo(tvbuff_t *tvb _U_, int offset _U_, p
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_PrintProcessorDirectoryInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrintProcessorDirectoryInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = spoolss_dissect_element_PrintProcessorDirectoryInfo_valdefault_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrintProcessorDirectoryInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -20632,17 +20625,17 @@ spoolss_dissect_struct_DocumentInfo1(tvbuff_t *tvb _U_, int offset _U_, packet_i
 /* IDL: } */
 
 static int
-spoolss_dissect_element_DocumentInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DocumentInfo_info1(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, spoolss_dissect_element_DocumentInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_DocumentInfo1)",hf_spoolss_spoolss_DocumentInfo_val1_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_DocumentInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_DocumentInfo1)",hf_spoolss_spoolss_DocumentInfo_info1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_DocumentInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_DocumentInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DocumentInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DocumentInfo_val1_info1,0);
+       offset = spoolss_dissect_struct_DocumentInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_DocumentInfo_info1,0);
 
        return offset;
 }
@@ -20666,7 +20659,7 @@ spoolss_dissect_DocumentInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_DocumentInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_DocumentInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
@@ -21042,41 +21035,41 @@ spoolss_dissect_struct_OSVersionEx(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 /* IDL: } */
 
 static int
-spoolss_dissect_element_PrinterData_valREG_SZ_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterData_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_null_term_wstring(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_PrinterData_valREG_SZ_string , 0);
+       offset = dissect_null_term_wstring(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_PrinterData_string , 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterData_valREG_BINARY_binary(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterData_binary(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_PrinterData_valREG_BINARY_binary, 1);
+       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_PrinterData_binary, 1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterData_valREG_DWORD_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterData_value(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_spoolss_spoolss_PrinterData_valREG_DWORD_value, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_PrinterData_value, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterData_valREG_MULTI_SZ_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterData_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_string_array(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterData_valREG_MULTI_SZ_string_array,0);
+       offset = spoolss_dissect_struct_string_array(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrinterData_string_array,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PrinterData_valdefault_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrinterData_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_PrinterData_valdefault_data, 1);
+       offset = dissect_ndr_datablob(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_PrinterData_data, 1);
 
        return offset;
 }
@@ -21100,23 +21093,23 @@ spoolss_dissect_PrinterData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
                break;
 
                case REG_SZ:
-                       offset = spoolss_dissect_element_PrinterData_valREG_SZ_string(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterData_string(tvb, offset, pinfo, tree, drep);
                break;
 
                case REG_BINARY:
-                       offset = spoolss_dissect_element_PrinterData_valREG_BINARY_binary(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterData_binary(tvb, offset, pinfo, tree, drep);
                break;
 
                case REG_DWORD:
-                       offset = spoolss_dissect_element_PrinterData_valREG_DWORD_value(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterData_value(tvb, offset, pinfo, tree, drep);
                break;
 
                case REG_MULTI_SZ:
-                       offset = spoolss_dissect_element_PrinterData_valREG_MULTI_SZ_string_array(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterData_string_array(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = spoolss_dissect_element_PrinterData_valdefault_data(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrinterData_data(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -21610,17 +21603,17 @@ spoolss_dissect_struct_FormInfo2(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-spoolss_dissect_element_FormInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_FormInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_FormInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_FormInfo_val1_info1,0);
+       offset = spoolss_dissect_struct_FormInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_FormInfo_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_FormInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_FormInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_FormInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_FormInfo_val2_info2,0);
+       offset = spoolss_dissect_struct_FormInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_FormInfo_info2,0);
 
        return offset;
 }
@@ -21641,11 +21634,11 @@ spoolss_dissect_FormInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_FormInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_FormInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_FormInfo_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_FormInfo_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -21936,33 +21929,33 @@ spoolss_dissect_struct_AddFormInfo2(tvbuff_t *tvb _U_, int offset _U_, packet_in
 /* IDL: } */
 
 static int
-spoolss_dissect_element_AddFormInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddFormInfo_info1(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, spoolss_dissect_element_AddFormInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_AddFormInfo1)",hf_spoolss_spoolss_AddFormInfo_val1_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddFormInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_AddFormInfo1)",hf_spoolss_spoolss_AddFormInfo_info1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddFormInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddFormInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddFormInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddFormInfo_val1_info1,0);
+       offset = spoolss_dissect_struct_AddFormInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddFormInfo_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddFormInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddFormInfo_info2(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, spoolss_dissect_element_AddFormInfo_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_AddFormInfo2)",hf_spoolss_spoolss_AddFormInfo_val2_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddFormInfo_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_AddFormInfo2)",hf_spoolss_spoolss_AddFormInfo_info2);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddFormInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddFormInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddFormInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddFormInfo_val2_info2,0);
+       offset = spoolss_dissect_struct_AddFormInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddFormInfo_info2,0);
 
        return offset;
 }
@@ -21986,11 +21979,11 @@ spoolss_dissect_AddFormInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_AddFormInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddFormInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_AddFormInfo_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddFormInfo_info2(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -22479,33 +22472,33 @@ spoolss_dissect_struct_PortInfoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-spoolss_dissect_element_PortInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PortInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PortInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PortInfo_val1_info1,0);
+       offset = spoolss_dissect_struct_PortInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PortInfo_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PortInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PortInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PortInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PortInfo_val2_info2,0);
+       offset = spoolss_dissect_struct_PortInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PortInfo_info2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PortInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PortInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PortInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PortInfo_val3_info3,0);
+       offset = spoolss_dissect_struct_PortInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PortInfo_info3,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_PortInfo_val0xff_infoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PortInfo_infoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PortInfoFF(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PortInfo_val0xff_infoFF,0);
+       offset = spoolss_dissect_struct_PortInfoFF(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PortInfo_infoFF,0);
 
        return offset;
 }
@@ -22526,19 +22519,19 @@ spoolss_dissect_PortInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_PortInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PortInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_PortInfo_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PortInfo_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_PortInfo_val3_info3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PortInfo_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0xff:
-                       offset = spoolss_dissect_element_PortInfo_val0xff_infoFF(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PortInfo_infoFF(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -22697,17 +22690,17 @@ spoolss_dissect_struct_MonitorInfo2(tvbuff_t *tvb _U_, int offset _U_, packet_in
 /* IDL: } */
 
 static int
-spoolss_dissect_element_MonitorInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_MonitorInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_MonitorInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_MonitorInfo_val1_info1,0);
+       offset = spoolss_dissect_struct_MonitorInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_MonitorInfo_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_MonitorInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_MonitorInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_MonitorInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_MonitorInfo_val2_info2,0);
+       offset = spoolss_dissect_struct_MonitorInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_MonitorInfo_info2,0);
 
        return offset;
 }
@@ -22728,11 +22721,11 @@ spoolss_dissect_MonitorInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_MonitorInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_MonitorInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_MonitorInfo_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_MonitorInfo_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -23067,65 +23060,65 @@ spoolss_dissect_struct_SetPortInfoFF(tvbuff_t *tvb _U_, int offset _U_, packet_i
 /* IDL: } */
 
 static int
-spoolss_dissect_element_SetPortInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPortInfo_info1(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, spoolss_dissect_element_SetPortInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_SetPortInfo1)",hf_spoolss_spoolss_SetPortInfo_val1_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPortInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_SetPortInfo1)",hf_spoolss_spoolss_SetPortInfo_info1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPortInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPortInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPortInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPortInfo_val1_info1,0);
+       offset = spoolss_dissect_struct_SetPortInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPortInfo_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPortInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPortInfo_info2(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, spoolss_dissect_element_SetPortInfo_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_SetPortInfo2)",hf_spoolss_spoolss_SetPortInfo_val2_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPortInfo_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_SetPortInfo2)",hf_spoolss_spoolss_SetPortInfo_info2);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPortInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPortInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPortInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPortInfo_val2_info2,0);
+       offset = spoolss_dissect_struct_SetPortInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPortInfo_info2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPortInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPortInfo_info3(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, spoolss_dissect_element_SetPortInfo_val3_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (spoolss_SetPortInfo3)",hf_spoolss_spoolss_SetPortInfo_val3_info3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPortInfo_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (spoolss_SetPortInfo3)",hf_spoolss_spoolss_SetPortInfo_info3);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPortInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPortInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPortInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPortInfo_val3_info3,0);
+       offset = spoolss_dissect_struct_SetPortInfo3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPortInfo_info3,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPortInfo_val0xff_infoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPortInfo_infoFF(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, spoolss_dissect_element_SetPortInfo_val0xff_infoFF_, NDR_POINTER_UNIQUE, "Pointer to Infoff (spoolss_SetPortInfoFF)",hf_spoolss_spoolss_SetPortInfo_val0xff_infoFF);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_SetPortInfo_infoFF_, NDR_POINTER_UNIQUE, "Pointer to Infoff (spoolss_SetPortInfoFF)",hf_spoolss_spoolss_SetPortInfo_infoFF);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_SetPortInfo_val0xff_infoFF_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_SetPortInfo_infoFF_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_SetPortInfoFF(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPortInfo_val0xff_infoFF,0);
+       offset = spoolss_dissect_struct_SetPortInfoFF(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_SetPortInfo_infoFF,0);
 
        return offset;
 }
@@ -23149,19 +23142,19 @@ spoolss_dissect_SetPortInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_SetPortInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPortInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_SetPortInfo_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPortInfo_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_SetPortInfo_val3_info3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPortInfo_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 0xff:
-                       offset = spoolss_dissect_element_SetPortInfo_val0xff_infoFF(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_SetPortInfo_infoFF(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -23498,33 +23491,33 @@ spoolss_dissect_struct_AddMonitorInfo2(tvbuff_t *tvb _U_, int offset _U_, packet
 /* IDL: } */
 
 static int
-spoolss_dissect_element_AddMonitorInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddMonitorInfo_info1(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, spoolss_dissect_element_AddMonitorInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_AddMonitorInfo1)",hf_spoolss_spoolss_AddMonitorInfo_val1_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddMonitorInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (spoolss_AddMonitorInfo1)",hf_spoolss_spoolss_AddMonitorInfo_info1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddMonitorInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddMonitorInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddMonitorInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddMonitorInfo_val1_info1,0);
+       offset = spoolss_dissect_struct_AddMonitorInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddMonitorInfo_info1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddMonitorInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddMonitorInfo_info2(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, spoolss_dissect_element_AddMonitorInfo_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_AddMonitorInfo2)",hf_spoolss_spoolss_AddMonitorInfo_val2_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_AddMonitorInfo_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (spoolss_AddMonitorInfo2)",hf_spoolss_spoolss_AddMonitorInfo_info2);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_AddMonitorInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_AddMonitorInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_AddMonitorInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddMonitorInfo_val2_info2,0);
+       offset = spoolss_dissect_struct_AddMonitorInfo2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_AddMonitorInfo_info2,0);
 
        return offset;
 }
@@ -23548,11 +23541,11 @@ spoolss_dissect_AddMonitorInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_AddMonitorInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddMonitorInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_AddMonitorInfo_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_AddMonitorInfo_info2(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -23673,9 +23666,9 @@ spoolss_dissect_struct_PrintProcDataTypesInfo1(tvbuff_t *tvb _U_, int offset _U_
 /* IDL: } */
 
 static int
-spoolss_dissect_element_PrintProcDataTypesInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_PrintProcDataTypesInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_PrintProcDataTypesInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrintProcDataTypesInfo_val1_info1,0);
+       offset = spoolss_dissect_struct_PrintProcDataTypesInfo1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_PrintProcDataTypesInfo_info1,0);
 
        return offset;
 }
@@ -23696,7 +23689,7 @@ spoolss_dissect_PrintProcDataTypesInfo(tvbuff_t *tvb _U_, int offset _U_, packet
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_PrintProcDataTypesInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_PrintProcDataTypesInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -24113,25 +24106,25 @@ spoolss_dissect_enum_NotifyType(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 /* IDL: } */
 
 static int
-spoolss_dissect_element_Field_valPRINTER_NOTIFY_TYPE_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_Field_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_enum_JobNotifyField(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_Field_valPRINTER_NOTIFY_TYPE_field, 0);
+       offset = spoolss_dissect_enum_JobNotifyField(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_Field_field, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_Field_valJOB_NOTIFY_TYPE_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_Field_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_enum_PrintNotifyField(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_Field_valJOB_NOTIFY_TYPE_field, 0);
+       offset = spoolss_dissect_enum_PrintNotifyField(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_Field_field, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_Field_valdefault_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_Field_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_Field_valdefault_field, 0);
+       offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_Field_field, 0);
 
        return offset;
 }
@@ -24152,15 +24145,15 @@ spoolss_dissect_Field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_,
 
        switch(level) {
                case PRINTER_NOTIFY_TYPE:
-                       offset = spoolss_dissect_element_Field_valPRINTER_NOTIFY_TYPE_field(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_Field_field(tvb, offset, pinfo, tree, drep);
                break;
 
                case JOB_NOTIFY_TYPE:
-                       offset = spoolss_dissect_element_Field_valJOB_NOTIFY_TYPE_field(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_Field_field(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
-                       offset = spoolss_dissect_element_Field_valdefault_field(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_Field_field(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -24518,53 +24511,53 @@ spoolss_dissect_enum_NotifyTable(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DWORD_integer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_NotifyData_integer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        int conformant = di->conformant_run;
        if (!conformant) {
-               offset = spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DWORD_integer_(tvb, offset, pinfo, tree, drep);
+               offset = spoolss_dissect_element_NotifyData_integer_(tvb, offset, pinfo, tree, drep);
        }
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DWORD_integer_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_NotifyData_integer_(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_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_DWORD_integer, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_NotifyData_integer, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_STRING_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_NotifyData_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_NotifyString(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_STRING_string,0);
+       offset = spoolss_dissect_struct_NotifyString(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_NotifyData_string,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DEVMODE_devmode(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_NotifyData_devmode(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_DevmodeContainer(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_DEVMODE_devmode,0);
+       offset = spoolss_dissect_struct_DevmodeContainer(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_NotifyData_devmode,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_TIME_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_NotifyData_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_TimeCtr(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_TIME_time,0);
+       offset = spoolss_dissect_struct_TimeCtr(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_NotifyData_time,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_SECURITYDESCRIPTOR_sd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_NotifyData_sd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_sec_desc_buf(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_SECURITYDESCRIPTOR_sd,0);
+       offset = spoolss_dissect_struct_sec_desc_buf(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_NotifyData_sd,0);
 
        return offset;
 }
@@ -24588,23 +24581,23 @@ spoolss_dissect_NotifyData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case NOTIFY_TABLE_DWORD:
-                       offset = spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DWORD_integer(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_NotifyData_integer(tvb, offset, pinfo, tree, drep);
                break;
 
                case NOTIFY_TABLE_STRING:
-                       offset = spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_STRING_string(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_NotifyData_string(tvb, offset, pinfo, tree, drep);
                break;
 
                case NOTIFY_TABLE_DEVMODE:
-                       offset = spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_DEVMODE_devmode(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_NotifyData_devmode(tvb, offset, pinfo, tree, drep);
                break;
 
                case NOTIFY_TABLE_TIME:
-                       offset = spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_TIME_time(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_NotifyData_time(tvb, offset, pinfo, tree, drep);
                break;
 
                case NOTIFY_TABLE_SECURITYDESCRIPTOR:
-                       offset = spoolss_dissect_element_NotifyData_valNOTIFY_TABLE_SECURITYDESCRIPTOR_sd(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_NotifyData_sd(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -24790,17 +24783,17 @@ spoolss_dissect_struct_NotifyInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-spoolss_dissect_element_ReplyPrinterInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_ReplyPrinterInfo_info0(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, spoolss_dissect_element_ReplyPrinterInfo_val0_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (spoolss_NotifyInfo)",hf_spoolss_spoolss_ReplyPrinterInfo_val0_info0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_ReplyPrinterInfo_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (spoolss_NotifyInfo)",hf_spoolss_spoolss_ReplyPrinterInfo_info0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_ReplyPrinterInfo_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_ReplyPrinterInfo_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_NotifyInfo(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_ReplyPrinterInfo_val0_info0,0);
+       offset = spoolss_dissect_struct_NotifyInfo(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_ReplyPrinterInfo_info0,0);
 
        return offset;
 }
@@ -24824,7 +24817,7 @@ spoolss_dissect_ReplyPrinterInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
        switch(level) {
                case 0:
-                       offset = spoolss_dissect_element_ReplyPrinterInfo_val0_info0(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_ReplyPrinterInfo_info0(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -25236,49 +25229,49 @@ spoolss_dissect_struct_UserLevel3(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-spoolss_dissect_element_UserLevel_val1_level1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_UserLevel_level1(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, spoolss_dissect_element_UserLevel_val1_level1_, NDR_POINTER_UNIQUE, "Pointer to Level1 (spoolss_UserLevel1)",hf_spoolss_spoolss_UserLevel_val1_level1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_UserLevel_level1_, NDR_POINTER_UNIQUE, "Pointer to Level1 (spoolss_UserLevel1)",hf_spoolss_spoolss_UserLevel_level1);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_UserLevel_val1_level1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_UserLevel_level1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_UserLevel1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_UserLevel_val1_level1,0);
+       offset = spoolss_dissect_struct_UserLevel1(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_UserLevel_level1,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_UserLevel_val2_level2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_UserLevel_level2(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, spoolss_dissect_element_UserLevel_val2_level2_, NDR_POINTER_UNIQUE, "Pointer to Level2 (spoolss_UserLevel2)",hf_spoolss_spoolss_UserLevel_val2_level2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_UserLevel_level2_, NDR_POINTER_UNIQUE, "Pointer to Level2 (spoolss_UserLevel2)",hf_spoolss_spoolss_UserLevel_level2);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_UserLevel_val2_level2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_UserLevel_level2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_UserLevel2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_UserLevel_val2_level2,0);
+       offset = spoolss_dissect_struct_UserLevel2(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_UserLevel_level2,0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_UserLevel_val3_level3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_UserLevel_level3(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, spoolss_dissect_element_UserLevel_val3_level3_, NDR_POINTER_UNIQUE, "Pointer to Level3 (spoolss_UserLevel3)",hf_spoolss_spoolss_UserLevel_val3_level3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_UserLevel_level3_, NDR_POINTER_UNIQUE, "Pointer to Level3 (spoolss_UserLevel3)",hf_spoolss_spoolss_UserLevel_level3);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_UserLevel_val3_level3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_UserLevel_level3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_UserLevel3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_UserLevel_val3_level3,0);
+       offset = spoolss_dissect_struct_UserLevel3(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_UserLevel_level3,0);
 
        return offset;
 }
@@ -25302,15 +25295,15 @@ spoolss_dissect_UserLevel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case 1:
-                       offset = spoolss_dissect_element_UserLevel_val1_level1(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_UserLevel_level1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = spoolss_dissect_element_UserLevel_val2_level2(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_UserLevel_level2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = spoolss_dissect_element_UserLevel_val3_level3(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_UserLevel_level3(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -25590,9 +25583,9 @@ spoolss_dissect_struct_PrinterEnumValues(tvbuff_t *tvb _U_, int offset _U_, pack
 /* IDL: } */
 
 static int
-spoolss_dissect_element_KeyNames_valdefault_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_KeyNames_string_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_string_array(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_KeyNames_valdefault_string_array,0);
+       offset = spoolss_dissect_struct_string_array(tvb,offset,pinfo,tree,drep,hf_spoolss_spoolss_KeyNames_string_array,0);
 
        return offset;
 }
@@ -25619,7 +25612,7 @@ spoolss_dissect_KeyNames(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _
                break;
 
                default:
-                       offset = spoolss_dissect_element_KeyNames_valdefault_string_array(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_KeyNames_string_array(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -26486,90 +26479,90 @@ spoolss_dissect_struct_RPC_BINARY_CONTAINER(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_NULL_bData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_bData(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_spoolss_RPC_BIDI_DATA_u_valBIDI_NULL_bData, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_BIDI_DATA_u_bData, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_BOOL_bData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_bData(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_spoolss_RPC_BIDI_DATA_u_valBIDI_BOOL_bData, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_BIDI_DATA_u_bData, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_INT_iData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_iData(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_spoolss_RPC_BIDI_DATA_u_valBIDI_INT_iData, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_BIDI_DATA_u_iData, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_STRING_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_sData(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, spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_STRING_sData_, NDR_POINTER_UNIQUE, "Pointer to Sdata (uint16)",hf_spoolss_RPC_BIDI_DATA_u_valBIDI_STRING_sData);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_RPC_BIDI_DATA_u_sData_, NDR_POINTER_UNIQUE, "Pointer to Sdata (uint16)",hf_spoolss_RPC_BIDI_DATA_u_sData);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_STRING_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_sData_(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_spoolss_RPC_BIDI_DATA_u_valBIDI_STRING_sData, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_spoolss_RPC_BIDI_DATA_u_sData, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_TEXT_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_sData(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, spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_TEXT_sData_, NDR_POINTER_UNIQUE, "Pointer to Sdata (uint16)",hf_spoolss_RPC_BIDI_DATA_u_valBIDI_TEXT_sData);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_RPC_BIDI_DATA_u_sData_, NDR_POINTER_UNIQUE, "Pointer to Sdata (uint16)",hf_spoolss_RPC_BIDI_DATA_u_sData);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_TEXT_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_sData_(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_spoolss_RPC_BIDI_DATA_u_valBIDI_TEXT_sData, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_spoolss_RPC_BIDI_DATA_u_sData, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_ENUM_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_sData(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, spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_ENUM_sData_, NDR_POINTER_UNIQUE, "Pointer to Sdata (uint16)",hf_spoolss_RPC_BIDI_DATA_u_valBIDI_ENUM_sData);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_RPC_BIDI_DATA_u_sData_, NDR_POINTER_UNIQUE, "Pointer to Sdata (uint16)",hf_spoolss_RPC_BIDI_DATA_u_sData);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_ENUM_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_sData_(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_spoolss_RPC_BIDI_DATA_u_valBIDI_ENUM_sData, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_spoolss_RPC_BIDI_DATA_u_sData, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_BLOB_biData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_BIDI_DATA_u_biData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_RPC_BINARY_CONTAINER(tvb,offset,pinfo,tree,drep,hf_spoolss_RPC_BIDI_DATA_u_valBIDI_BLOB_biData,0);
+       offset = spoolss_dissect_struct_RPC_BINARY_CONTAINER(tvb,offset,pinfo,tree,drep,hf_spoolss_RPC_BIDI_DATA_u_biData,0);
 
        return offset;
 }
@@ -26593,31 +26586,31 @@ spoolss_dissect_RPC_BIDI_DATA_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 
        switch(level) {
                case BIDI_NULL:
-                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_NULL_bData(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_bData(tvb, offset, pinfo, tree, drep);
                break;
 
                case BIDI_BOOL:
-                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_BOOL_bData(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_bData(tvb, offset, pinfo, tree, drep);
                break;
 
                case BIDI_INT:
-                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_INT_iData(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_iData(tvb, offset, pinfo, tree, drep);
                break;
 
                case BIDI_STRING:
-                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_STRING_sData(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_sData(tvb, offset, pinfo, tree, drep);
                break;
 
                case BIDI_TEXT:
-                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_TEXT_sData(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_sData(tvb, offset, pinfo, tree, drep);
                break;
 
                case BIDI_ENUM:
-                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_ENUM_sData(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_sData(tvb, offset, pinfo, tree, drep);
                break;
 
                case BIDI_BLOB:
-                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_valBIDI_BLOB_biData(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_BIDI_DATA_u_biData(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -27218,52 +27211,52 @@ spoolss_dissect_struct_propertyBlob(tvbuff_t *tvb _U_, int offset _U_, packet_in
 /* IDL: } */
 
 static int
-spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyString(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, spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString_, NDR_POINTER_UNIQUE, "Pointer to Propertystring (uint16)",hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyString_, NDR_POINTER_UNIQUE, "Pointer to Propertystring (uint16)",hf_spoolss_RPC_PrintPropertyValueUnion_propertyString);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyString_(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_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString, FALSE, &data);
+       offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint16), hf_spoolss_RPC_PrintPropertyValueUnion_propertyString, FALSE, &data);
        proto_item_append_text(tree, ": %s", data);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt32_propertyInt32(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyInt32(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_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt32_propertyInt32, 0);
+       offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_PrintPropertyValueUnion_propertyInt32, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt64_propertyInt64(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyInt64(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt64_propertyInt64, NULL);
+       offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_PrintPropertyValueUnion_propertyInt64, NULL);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeByte_propertyByte(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyByte(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_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeByte_propertyByte, 0);
+       offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_PrintPropertyValueUnion_propertyByte, 0);
 
        return offset;
 }
 
 static int
-spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeBuffer_propertyBlob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyBlob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = spoolss_dissect_struct_propertyBlob(tvb,offset,pinfo,tree,drep,hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeBuffer_propertyBlob,0);
+       offset = spoolss_dissect_struct_propertyBlob(tvb,offset,pinfo,tree,drep,hf_spoolss_RPC_PrintPropertyValueUnion_propertyBlob,0);
 
        return offset;
 }
@@ -27287,23 +27280,23 @@ spoolss_dissect_RPC_PrintPropertyValueUnion(tvbuff_t *tvb _U_, int offset _U_, p
 
        switch(level) {
                case kRpcPropertyTypeString:
-                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyString(tvb, offset, pinfo, tree, drep);
                break;
 
                case kRpcPropertyTypeInt32:
-                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt32_propertyInt32(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyInt32(tvb, offset, pinfo, tree, drep);
                break;
 
                case kRpcPropertyTypeInt64:
-                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt64_propertyInt64(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyInt64(tvb, offset, pinfo, tree, drep);
                break;
 
                case kRpcPropertyTypeByte:
-                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeByte_propertyByte(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyByte(tvb, offset, pinfo, tree, drep);
                break;
 
                case kRpcPropertyTypeBuffer:
-                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeBuffer_propertyBlob(tvb, offset, pinfo, tree, drep);
+                       offset = spoolss_dissect_element_RPC_PrintPropertyValueUnion_propertyBlob(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -38825,12 +38818,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Driver Path", "spoolss.spoolss_DriverInfo5.driver_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_drivername,
          { "Drivername", "spoolss.spoolss_SetPrinterInfo2.drivername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DocumentInfo_info1,
+         { "Info1", "spoolss.spoolss_DocumentInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddFormInfo2_ressource_id,
          { "Ressource Id", "spoolss.spoolss_AddFormInfo2.ressource_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UserLevel3_reserved,
          { "Reserved", "spoolss.spoolss_UserLevel3.reserved", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_TIME_time,
-         { "Time", "spoolss.spoolss_NotifyData_valNOTIFY_TABLE_TIME.time", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_FormInfo2_keyword,
          { "Keyword", "spoolss.spoolss_FormInfo2.keyword", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_NOT_SHAREABLE,
@@ -38849,6 +38842,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Data File", "spoolss.spoolss_DriverInfo8.data_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPortInfo2_monitor_name,
          { "Monitor Name", "spoolss.spoolss_SetPortInfo2.monitor_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PortInfo_infoFF,
+         { "Infoff", "spoolss.spoolss_PortInfo.infoFF", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo2_submitted,
          { "Submitted", "spoolss.spoolss_JobInfo2.submitted", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo6_architecture,
@@ -38877,10 +38872,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Location", "spoolss.spoolss_SetPrinterInfo2.location", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterData_data_needed,
          { "Data Needed", "spoolss.spoolss_EnumPrinterData.data_needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_NotifyData_integer,
+         { "Integer", "spoolss.spoolss_NotifyData.integer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo2_architecture,
          { "Architecture", "spoolss.spoolss_AddDriverInfo2.architecture", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterData_valREG_SZ_string,
-         { "String", "spoolss.spoolss_PrinterData_valREG_SZ.string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinter_devmode_ctr,
          { "Devmode Ctr", "spoolss.spoolss_SetPrinter.devmode_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_BIDI_RESPONSE_DATA_pSchema,
@@ -38893,12 +38888,16 @@ void proto_register_dcerpc_spoolss(void)
          { "Command", "spoolss.spoolss_SetPrinter.command", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_PrinterControl_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_CONNECTIONS,
          { "Printer Enum Connections", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_CONNECTIONS", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_CONNECTIONS_tfs), ( 0x00000004 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_info2,
+         { "Info2", "spoolss.spoolss_SetPrinterInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RpcGetJobNamedPropertyValue_JobId,
          { "Jobid", "spoolss.spoolss_RpcGetJobNamedPropertyValue.JobId", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode___driverextra_length,
          { "  Driverextra Length", "spoolss.spoolss_DeviceMode.__driverextra_length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_XcvData_function_name,
          { "Function Name", "spoolss.spoolss_XcvData.function_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddDriverInfo_info1,
+         { "Info1", "spoolss.spoolss_AddDriverInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2_position,
          { "Position", "spoolss.spoolss_SetJobInfo2.position", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo2_sepfile,
@@ -38909,10 +38908,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Count", "spoolss.__spoolss_EnumPrinterDataEx.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2__devmode_ptr,
          { " Devmode Ptr", "spoolss.spoolss_SetJobInfo2._devmode_ptr", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_Field_valdefault_field,
-         { "Field", "spoolss.spoolss_Field_valdefault.field", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_val9_info9,
-         { "Info9", "spoolss.spoolss_SetPrinterInfo_val9.info9", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo1_submitted,
          { "Submitted", "spoolss.spoolss_JobInfo1.submitted", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo5_driver_attributes,
@@ -38921,8 +38916,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Monitor Name", "spoolss.spoolss_AddDriverInfo8.monitor_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData2_size,
          { "Size", "spoolss.spoolss_PortData2.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_FormInfo_val1_info1,
-         { "Info1", "spoolss.spoolss_FormInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss___spoolss_EnumPrintProcDataTypes_count,
          { "Count", "spoolss.__spoolss_EnumPrintProcDataTypes.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PORT,
@@ -38937,8 +38930,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Until Time", "spoolss.spoolss_JobInfo4.until_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_SOFT_RESET_REQUIRED,
          { "Printer Driver Soft Reset Required", "spoolss.spoolss_DriverAttributes.PRINTER_DRIVER_SOFT_RESET_REQUIRED", FT_BOOLEAN, 32, TFS(&spoolss_DriverAttributes_PRINTER_DRIVER_SOFT_RESET_REQUIRED_tfs), ( 0x00000400 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_val5_info5,
-         { "Info5", "spoolss.spoolss_PrinterInfo_val5.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8_config_file,
          { "Config File", "spoolss.spoolss_AddDriverInfo8.config_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_wFeedDirection,
@@ -38949,8 +38940,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Provider", "spoolss.spoolss_AddDriverInfo6.provider", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2_text_status,
          { "Text Status", "spoolss.spoolss_SetJobInfo2.text_status", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_JobInfo_val1_info1,
-         { "Info1", "spoolss.spoolss_JobInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPorts_level,
          { "Level", "spoolss.spoolss_EnumPorts.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumForms_count,
@@ -39039,8 +39028,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Subcontext length", "spoolss.spoolss_PrinterInfo2.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_Notify_variable_type,
          { "Variable Type", "spoolss.spoolss_Notify.variable_type", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_NotifyTable_vals), 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString_propertyString,
-         { "Propertystring", "spoolss.RPC_PrintPropertyValueUnion_valkRpcPropertyTypeString.propertyString", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo1_description,
          { "Description", "spoolss.spoolss_SetPrinterInfo1.description", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo0_number_of_processors,
@@ -39105,28 +39092,26 @@ void proto_register_dcerpc_spoolss(void)
          { "Pages Printed", "spoolss.spoolss_JobInfo1.pages_printed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA351_caColorfulness,
          { "Cacolorfulness", "spoolss.spoolss_PSDRVEXTRA351.caColorfulness", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddFormInfo_val1_info1,
-         { "Info1", "spoolss.spoolss_AddFormInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterDrivers_buffer,
          { "Buffer", "spoolss.spoolss_EnumPrinterDrivers.buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriverPackagePath_language,
          { "Language", "spoolss.spoolss_GetPrinterDriverPackagePath.language", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo8_dependent_files,
          { "Dependent Files", "spoolss.spoolss_DriverInfo8.dependent_files", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_FormInfo_info1,
+         { "Info1", "spoolss.spoolss_FormInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetJobInfo_info3,
+         { "Info3", "spoolss.spoolss_SetJobInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_dwReserved3,
          { "Dwreserved3", "spoolss.spoolss_PSDRVEXTRA500.dwReserved3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_wReserved1,
          { "Wreserved1", "spoolss.spoolss_PSDRVEXTRA500.wReserved1", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_MonitorInfo_val2_info2,
-         { "Info2", "spoolss.spoolss_MonitorInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo5_config_version,
          { "Config Version", "spoolss.spoolss_AddDriverInfo5.config_version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo2_status,
          { "Status", "spoolss.spoolss_JobInfo2.status", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON2,
          { "Printer Enum Icon2", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_ICON2", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON2_tfs), ( 0x00020000 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_val0_info0,
-         { "Info0", "spoolss.spoolss_PrinterInfo_val0.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_bReversePrint,
          { "Breverseprint", "spoolss.spoolss_PSDRVEXTRA500.bReversePrint", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrintProcessorDirectory_offered,
@@ -39149,6 +39134,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Info", "spoolss.spoolss_GetPrinterDriver2.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_JOB,
          { "Printer Change Add Job", "spoolss.spoolss_PrinterChangeFlags.PRINTER_CHANGE_ADD_JOB", FT_BOOLEAN, 32, TFS(&spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_JOB_tfs), ( 0x00000100 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_info9,
+         { "Info9", "spoolss.spoolss_SetPrinterInfo.info9", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo4_driver_name,
          { "Driver Name", "spoolss.spoolss_SetJobInfo4.driver_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo2_sharename,
@@ -39169,14 +39156,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Session Counter", "spoolss.spoolss_SetPrinterInfo0.session_counter", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DocumentInfo1_output_file,
          { "Output File", "spoolss.spoolss_DocumentInfo1.output_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_BIDI_DATA_u_valBIDI_STRING_sData,
-         { "Sdata", "spoolss.RPC_BIDI_DATA_u_valBIDI_STRING.sData", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UserLevel3_user,
          { "User", "spoolss.spoolss_UserLevel3.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_info7,
+         { "Info7", "spoolss.spoolss_DriverInfo.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UserLevel1_minor,
          { "Minor", "spoolss.spoolss_UserLevel1.minor", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_MinorVersion_vals), 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_JobInfo_val3_info3,
-         { "Info3", "spoolss.spoolss_JobInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterDataEx_info,
          { "Info", "spoolss.spoolss_EnumPrinterDataEx.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriver_handle,
@@ -39189,8 +39174,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Access Mask", "spoolss.spoolss_OpenPrinterEx.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddFormInfo1_form_name,
          { "Form Name", "spoolss.spoolss_AddFormInfo1.form_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_UserLevel_val3_level3,
-         { "Level3", "spoolss.spoolss_UserLevel_val3.level3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData2_version,
          { "Version", "spoolss.spoolss_PortData2.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_ORIENTATION,
@@ -39199,8 +39182,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Handle", "spoolss.spoolss_OpenPrinter.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AccessRights_JOB_ACCESS_READ,
          { "Job Access Read", "spoolss.spoolss_AccessRights.JOB_ACCESS_READ", FT_BOOLEAN, 32, TFS(&spoolss_AccessRights_JOB_ACCESS_READ_tfs), ( 0x00000020 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0600_unidrvextra,
-         { "Unidrvextra", "spoolss.spoolss_DeviceModeExtraDataUniDriver_val0x0600.unidrvextra", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_BIDI_RESPONSE_DATA_dwResult,
          { "Dwresult", "spoolss.RPC_BIDI_RESPONSE_DATA.dwResult", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePerMachineConnection_server,
@@ -39231,8 +39212,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Reserved", "spoolss.spoolss_PortData2.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo2_location,
          { "Location", "spoolss.spoolss_PrinterInfo2.location", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_val3_info3,
-         { "Info3", "spoolss.spoolss_SetPrinterInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PELSHEIGHT,
          { "Devmode Pelsheight", "spoolss.spoolss_DeviceModeFields.DEVMODE_PELSHEIGHT", FT_BOOLEAN, 32, TFS(&spoolss_DeviceModeFields_DEVMODE_PELSHEIGHT_tfs), ( 0x00100000 ), NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrintProcDataTypes_servername,
@@ -39253,12 +39232,16 @@ void proto_register_dcerpc_spoolss(void)
          { "Month", "spoolss.spoolss_Time.month", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OpenPrinter_datatype,
          { "Datatype", "spoolss.spoolss_OpenPrinter.datatype", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_info0,
+         { "Info0", "spoolss.spoolss_SetPrinterInfo.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrinterDataEx_needed,
          { "Needed", "spoolss._spoolss_EnumPrinterDataEx.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrintProcDataTypes_buffer,
          { "Buffer", "spoolss._spoolss_EnumPrintProcDataTypes.buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData2_hostaddress,
          { "Hostaddress", "spoolss.spoolss_PortData2.hostaddress", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_UserLevel_level2,
+         { "Level2", "spoolss.spoolss_UserLevel.level2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8_min_inbox_driver_ver_date,
          { "Min Inbox Driver Ver Date", "spoolss.spoolss_AddDriverInfo8.min_inbox_driver_ver_date", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo3_config_file,
@@ -39267,8 +39250,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Version", "spoolss.spoolss_NotifyInfo.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriver2_needed,
          { "Needed", "spoolss.spoolss_GetPrinterDriver2.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddDriverInfo_val4_info4,
-         { "Info4", "spoolss.spoolss_AddDriverInfo_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_scale,
          { "Scale", "spoolss.spoolss_DeviceMode.scale", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePrinterData_handle,
@@ -39311,8 +39292,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Version", "spoolss.spoolss_DriverInfo3.version", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DriverOSVersion_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetJob_handle,
          { "Handle", "spoolss.spoolss_GetJob.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_val4_info4,
-         { "Info4", "spoolss.spoolss_PrinterInfo_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrinter_secdesc_ctr,
          { "Secdesc Ctr", "spoolss.spoolss_AddPrinter.secdesc_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_duplex,
@@ -39321,12 +39300,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Color", "spoolss.spoolss_RouterReplyPrinterEx.color", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePort_port_name,
          { "Port Name", "spoolss.spoolss_DeletePort.port_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddDriverInfo_val1_info1,
-         { "Info1", "spoolss.spoolss_AddDriverInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumForms_handle,
          { "Handle", "spoolss._spoolss_EnumForms.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_UserLevel_val2_level2,
-         { "Level2", "spoolss.spoolss_UserLevel_val2.level2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_FormInfo2_flags,
          { "Flags", "spoolss.spoolss_FormInfo2.flags", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_FormFlags_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_status,
@@ -39363,8 +39338,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Millisecond", "spoolss.spoolss_Time.millisecond", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumForms_needed,
          { "Needed", "spoolss.spoolss_EnumForms.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_val9_info9,
-         { "Info9", "spoolss.spoolss_PrinterInfo_val9.info9", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA_dwNupDirection,
          { "Dwnupdirection", "spoolss.spoolss_UNIDRVEXTRA.dwNupDirection", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DM_NupDirection_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8_min_inbox_driver_ver_version,
@@ -39377,18 +39350,22 @@ void proto_register_dcerpc_spoolss(void)
          { "Architecture", "spoolss.spoolss_GetPrinterDriver2.architecture", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinter_buffer,
          { "Buffer", "spoolss.spoolss_GetPrinter.buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterData_string,
+         { "String", "spoolss.spoolss_PrinterData.string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo4_print_processor,
          { "Print Processor", "spoolss.spoolss_JobInfo4.print_processor", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobStatus_JOB_STATUS_DELETED,
          { "Job Status Deleted", "spoolss.spoolss_JobStatus.JOB_STATUS_DELETED", FT_BOOLEAN, 32, TFS(&spoolss_JobStatus_JOB_STATUS_DELETED_tfs), ( 0x00000100 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_OEM_DMEXTRA_dwVersion,
          { "Dwversion", "spoolss.spoolss_OEM_DMEXTRA.dwVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPortInfo_info2,
+         { "Info2", "spoolss.spoolss_SetPortInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_JobInfo_info3,
+         { "Info3", "spoolss.spoolss_JobInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo4_architecture,
          { "Architecture", "spoolss.spoolss_AddDriverInfo4.architecture", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_PUBLISHED,
          { "Printer Attribute Published", "spoolss.spoolss_PrinterAttributes.PRINTER_ATTRIBUTE_PUBLISHED", FT_BOOLEAN, 32, TFS(&spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_PUBLISHED_tfs), ( 0x00002000 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_val8_info8,
-         { "Info8", "spoolss.spoolss_DriverInfo_val8.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterKey__ndr_size,
          { " Ndr Size", "spoolss.spoolss_EnumPrinterKey._ndr_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterDataEx_count,
@@ -39427,6 +39404,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Apd Dont Copy Files To Cluster", "spoolss.spoolss_AddPrinterDriverExFlags.APD_DONT_COPY_FILES_TO_CLUSTER", FT_BOOLEAN, 32, TFS(&spoolss_AddPrinterDriverExFlags_APD_DONT_COPY_FILES_TO_CLUSTER_tfs), ( 0x00001000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_UserLevel3_client,
          { "Client", "spoolss.spoolss_UserLevel3.client", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psblob,
+         { "Psblob", "spoolss.spoolss_DeviceModeExtraDataPostScript.psblob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PlayGDIScriptOnPrinterIC_cOut,
          { "Cout", "spoolss.spoolss_PlayGDIScriptOnPrinterIC.cOut", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo4_status,
@@ -39447,8 +39426,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Devmode Ptr", "spoolss.spoolss_SetPrinterInfo2.devmode_ptr", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2_status,
          { "Status", "spoolss.spoolss_SetJobInfo2.status", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterData_valdefault_data,
-         { "Data", "spoolss.spoolss_PrinterData_valdefault.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_NAME,
          { "Printer Enum Name", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_NAME", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_NAME_tfs), ( 0x00000008 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_RpcSendRecvBidiData_pReqData,
@@ -39473,8 +39450,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Caredgamma", "spoolss.spoolss_PSDRVEXTRA351.caRedGamma", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo1_priority,
          { "Priority", "spoolss.spoolss_JobInfo1.priority", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0501_psdrvextra500,
-         { "Psdrvextra500", "spoolss.spoolss_DeviceModeExtraDataPostScript_val0x0501.psdrvextra500", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo1_name,
          { "Name", "spoolss.spoolss_SetPrinterInfo1.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_OUT_OF_MEMORY,
@@ -39483,14 +39458,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Data Type", "spoolss.spoolss_JobInfo1.data_type", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON5,
          { "Printer Enum Icon5", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_ICON5", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON5_tfs), ( 0x00100000 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_ReplyPrinterInfo_val0_info0,
-         { "Info0", "spoolss.spoolss_ReplyPrinterInfo_val0.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_bitsperpel,
          { "Bitsperpel", "spoolss.spoolss_DeviceMode.bitsperpel", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OSVersionEx_extra_string,
          { "Extra String", "spoolss.spoolss_OSVersionEx.extra_string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_val2_info2,
-         { "Info2", "spoolss.spoolss_SetPrinterInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_info0,
+         { "Info0", "spoolss.spoolss_PrinterInfo.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_dwOptions,
          { "Dwoptions", "spoolss.spoolss_PSDRVEXTRA500.dwOptions", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_caRedGreenTint,
@@ -39511,6 +39484,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Level", "spoolss._spoolss_EnumPrintProcDataTypes.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DevmodeContainer_devmode,
          { "Devmode", "spoolss.spoolss_DevmodeContainer.devmode", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_BIDI_DATA_u_sData,
+         { "Sdata", "spoolss.RPC_BIDI_DATA_u.sData", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_dwNupBorderFlags,
          { "Dwnupborderflags", "spoolss.spoolss_PSDRVEXTRA.dwNupBorderFlags", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DM_NupBorderFlags_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo3_reserved,
@@ -39583,20 +39558,22 @@ void proto_register_dcerpc_spoolss(void)
          { "Flags", "spoolss.spoolss_SetPrinterInfo1.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddFormInfo2_form_name,
          { "Form Name", "spoolss.spoolss_AddFormInfo2.form_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_MonitorInfo_info2,
+         { "Info2", "spoolss.spoolss_MonitorInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetJobInfo_info4,
+         { "Info4", "spoolss.spoolss_SetJobInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_PrintPropertyValueUnion_propertyInt64,
+         { "Propertyint64", "spoolss.RPC_PrintPropertyValueUnion.propertyInt64", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JTEXP_wCoreMFOSize,
          { "Wcoremfosize", "spoolss.spoolss_JTEXP.wCoreMFOSize", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePrinterKey_handle,
          { "Handle", "spoolss.spoolss_DeletePrinterKey.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverDirectoryInfo_valdefault_info1,
-         { "Info1", "spoolss.spoolss_DriverDirectoryInfo_valdefault.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_reserved2,
          { "Reserved2", "spoolss.spoolss_PrinterInfo0.reserved2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_SERVER,
          { "Printer Change Server", "spoolss.spoolss_PrinterChangeFlags.PRINTER_CHANGE_SERVER", FT_BOOLEAN, 32, TFS(&spoolss_PrinterChangeFlags_PRINTER_CHANGE_SERVER_tfs), ( 0x08000000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo8_print_processor,
          { "Print Processor", "spoolss.spoolss_DriverInfo8.print_processor", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_val2_info2,
-         { "Info2", "spoolss.spoolss_PrinterInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinters_server,
          { "Server", "spoolss.spoolss_EnumPrinters.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumMonitors_count,
@@ -39631,6 +39608,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Free Build", "spoolss.spoolss_PrinterInfo0.free_build", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_Build_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriver2_buffer,
          { "Buffer", "spoolss.spoolss_GetPrinterDriver2.buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddDriverInfo_info3,
+         { "Info3", "spoolss.spoolss_AddDriverInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8_hardware_id,
          { "Hardware Id", "spoolss.spoolss_AddDriverInfo8.hardware_id", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss___spoolss_EnumPrinters_info,
@@ -39639,10 +39618,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Install Source Root", "spoolss.spoolss_DriverInfo7.install_source_root", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo4_position,
          { "Position", "spoolss.spoolss_SetJobInfo4.position", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_MonitorInfo_val1_info1,
-         { "Info1", "spoolss.spoolss_MonitorInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PRINTQUALITY,
          { "Devmode Printquality", "spoolss.spoolss_DeviceModeFields.DEVMODE_PRINTQUALITY", FT_BOOLEAN, 32, TFS(&spoolss_DeviceModeFields_DEVMODE_PRINTQUALITY_tfs), ( 0x00000400 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterData_string_array,
+         { "String Array", "spoolss.spoolss_PrinterData.string_array", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddFormInfoCtr_info,
          { "Info", "spoolss.spoolss_AddFormInfoCtr.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriverPackagePath_driver_package_cab,
@@ -39701,6 +39680,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Driver Attributes", "spoolss.spoolss_AddDriverInfo8.printer_driver_attributes", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_DOOR_OPEN,
          { "Printer Status Door Open", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_DOOR_OPEN", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_DOOR_OPEN_tfs), ( 0x00400000 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_MonitorInfo_info1,
+         { "Info1", "spoolss.spoolss_MonitorInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss___spoolss_EnumPrinterDrivers_info,
          { "Info", "spoolss.__spoolss_EnumPrinterDrivers.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8_previous_names,
@@ -39717,14 +39698,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Change Delete Printer", "spoolss.spoolss_PrinterChangeFlags.PRINTER_CHANGE_DELETE_PRINTER", FT_BOOLEAN, 32, TFS(&spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_PRINTER_tfs), ( 0x00000004 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo0_high_part_total_bytes,
          { "High Part Total Bytes", "spoolss.spoolss_SetPrinterInfo0.high_part_total_bytes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_val0_info0,
-         { "Info0", "spoolss.spoolss_SetPrinterInfo_val0.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2_time,
          { "Time", "spoolss.spoolss_SetJobInfo2.time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumForms_level,
          { "Level", "spoolss._spoolss_EnumForms.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrintProcessorDirectoryInfo_valdefault_info1,
-         { "Info1", "spoolss.spoolss_PrintProcessorDirectoryInfo_valdefault.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8_manufacturer_url,
          { "Manufacturer Url", "spoolss.spoolss_AddDriverInfo8.manufacturer_url", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddForm_info_ctr,
@@ -39733,8 +39710,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Cjobs", "spoolss.spoolss_PrinterInfo2.cjobs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetForm_needed,
          { "Needed", "spoolss.spoolss_GetForm.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_BIDI_DATA_u_valBIDI_BLOB_biData,
-         { "Bidata", "spoolss.RPC_BIDI_DATA_u_valBIDI_BLOB.biData", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA_wCoreFullSize,
          { "Wcorefullsize", "spoolss.spoolss_UNIDRVEXTRA.wCoreFullSize", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriver2_info_,
@@ -39759,8 +39734,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Data Type", "spoolss.spoolss_JobInfo4.data_type", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumJobs_firstjob,
          { "Firstjob", "spoolss.spoolss_EnumJobs.firstjob", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_valdefault_psblob,
-         { "Psblob", "spoolss.spoolss_DeviceModeExtraDataPostScript_valdefault.psblob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_info4,
+         { "Info4", "spoolss.spoolss_DriverInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo0_enumerate_network_printers,
          { "Enumerate Network Printers", "spoolss.spoolss_SetPrinterInfo0.enumerate_network_printers", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrinterDrivers_needed,
@@ -39773,8 +39748,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Offered", "spoolss.spoolss_EnumPrinterKey.offered", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPorts_offered,
          { "Offered", "spoolss._spoolss_EnumPorts.offered", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddDriverInfo_val3_info3,
-         { "Info3", "spoolss.spoolss_AddDriverInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_yresolution,
          { "Yresolution", "spoolss.spoolss_DeviceMode.yresolution", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinters_info,
@@ -39799,8 +39772,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Previous Names", "spoolss.spoolss_AddDriverInfo4.previous_names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePrinterData_value_name,
          { "Value Name", "spoolss.spoolss_DeletePrinterData.value_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetJobInfo_val2_info2,
-         { "Info2", "spoolss.spoolss_SetJobInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_dwSignature,
          { "Dwsignature", "spoolss.spoolss_PSDRVEXTRA.dwSignature", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DM_Signature_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_ERROR,
@@ -39819,8 +39790,6 @@ void proto_register_dcerpc_spoolss(void)
          { "U3", "spoolss.spoolss_NotifyOptionType.u3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo1_server_name,
          { "Server Name", "spoolss.spoolss_JobInfo1.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_val8_info8,
-         { "Info8", "spoolss.spoolss_SetPrinterInfo_val8.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA400_caColorfulness,
          { "Cacolorfulness", "spoolss.spoolss_PSDRVEXTRA400.caColorfulness", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA500_dwOptions,
@@ -39833,8 +39802,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Status User Intervention", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_USER_INTERVENTION", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_USER_INTERVENTION_tfs), ( 0x00100000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriverDirectory_server,
          { "Server", "spoolss.spoolss_GetPrinterDriverDirectory.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_val1_info1,
-         { "Info1", "spoolss.spoolss_SetPrinterInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2_notify_name,
          { "Notify Name", "spoolss.spoolss_SetJobInfo2.notify_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss___spoolss_EnumPrintProcDataTypes_info,
@@ -39867,8 +39834,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Offered", "spoolss.spoolss_EnumPrinterDrivers.offered", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobStatus_JOB_STATUS_SPOOLING,
          { "Job Status Spooling", "spoolss.spoolss_JobStatus.JOB_STATUS_SPOOLING", FT_BOOLEAN, 32, TFS(&spoolss_JobStatus_JOB_STATUS_SPOOLING_tfs), ( 0x00000008 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_JobInfo_val4_info4,
-         { "Info4", "spoolss.spoolss_JobInfo_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_BIDI_RESPONSE_CONTAINER_Count,
          { "Count", "spoolss.RPC_BIDI_RESPONSE_CONTAINER.Count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo4_parameters,
@@ -39879,8 +39844,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Level", "spoolss.spoolss_GetPrinter.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_papersize,
          { "Papersize", "spoolss.spoolss_DeviceMode.papersize", FT_UINT16, BASE_DEC, VALS(spoolss_spoolss_DeviceModePaperSize_vals), 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_Field_valPRINTER_NOTIFY_TYPE_field,
-         { "Field", "spoolss.spoolss_Field_valPRINTER_NOTIFY_TYPE.field", FT_UINT16, BASE_DEC, VALS(spoolss_spoolss_JobNotifyField_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePrinterKey_key_name,
          { "Key Name", "spoolss.spoolss_DeletePrinterKey.key_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA351_caContrast,
@@ -39889,14 +39852,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Apd Copy New Files", "spoolss.spoolss_AddPrinterDriverExFlags.APD_COPY_NEW_FILES", FT_BOOLEAN, 32, TFS(&spoolss_AddPrinterDriverExFlags_APD_COPY_NEW_FILES_tfs), ( 0x00000008 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2__secdesc_ptr,
          { " Secdesc Ptr", "spoolss.spoolss_SetJobInfo2._secdesc_ptr", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_val7_info7,
-         { "Info7", "spoolss.spoolss_DriverInfo_val7.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPerMachineConnection_printername,
          { "Printername", "spoolss.spoolss_AddPerMachineConnection.printername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrintProcessorDirectory_server,
          { "Server", "spoolss.spoolss_GetPrintProcessorDirectory.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterDataEx_value_name,
          { "Value Name", "spoolss.spoolss_SetPrinterDataEx.value_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_info5,
+         { "Info5", "spoolss.spoolss_PrinterInfo.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA_wReserved,
          { "Wreserved", "spoolss.spoolss_UNIDRVEXTRA.wReserved", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo1_pages_printed,
@@ -39921,8 +39884,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Job Status User Intervention", "spoolss.spoolss_JobStatus.JOB_STATUS_USER_INTERVENTION", FT_BOOLEAN, 32, TFS(&spoolss_JobStatus_JOB_STATUS_USER_INTERVENTION_tfs), ( 0x00000400 ), NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrintProcessors_needed,
          { "Needed", "spoolss._spoolss_EnumPrintProcessors.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddDriverInfo_val8_info8,
-         { "Info8", "spoolss.spoolss_AddDriverInfo_val8.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrintProcDataTypesInfo_info1,
+         { "Info1", "spoolss.spoolss_PrintProcDataTypesInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON6,
          { "Printer Enum Icon6", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_ICON6", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON6_tfs), ( 0x00200000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_SERVICE,
@@ -39963,10 +39926,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Status Warming Up", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_WARMING_UP", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_WARMING_UP_tfs), ( 0x00010000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrinterEx_devmode_ctr,
          { "Devmode Ctr", "spoolss.spoolss_AddPrinterEx.devmode_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_val2_info2,
-         { "Info2", "spoolss.spoolss_DriverInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_JobInfo_val2_info2,
-         { "Info2", "spoolss.spoolss_JobInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterDataEx_data,
          { "Data", "spoolss.spoolss_SetPrinterDataEx.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_CreatePrinterIC_handle,
@@ -39977,8 +39936,12 @@ void proto_register_dcerpc_spoolss(void)
          { " Ndr Size Color Profiles", "spoolss.spoolss_AddDriverInfo8._ndr_size_color_profiles", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrinters_flags,
          { "Flags", "spoolss._spoolss_EnumPrinters.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddDriverInfo_val2_info2,
-         { "Info2", "spoolss.spoolss_AddDriverInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra500,
+         { "Psdrvextra500", "spoolss.spoolss_DeviceModeExtraDataPostScript.psdrvextra500", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_info2,
+         { "Info2", "spoolss.spoolss_PrinterInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_info6,
+         { "Info6", "spoolss.spoolss_SetPrinterInfo.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrintProcessors_environment,
          { "Environment", "spoolss.spoolss_EnumPrintProcessors.environment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OSVersion_build,
@@ -39995,14 +39958,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Size", "spoolss.spoolss_DriverInfo7.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA400_caIlluminantIndex,
          { "Cailluminantindex", "spoolss.spoolss_PSDRVEXTRA400.caIlluminantIndex", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_FormInfo_val2_info2,
-         { "Info2", "spoolss.spoolss_FormInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPorts_offered,
          { "Offered", "spoolss.spoolss_EnumPorts.offered", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData1_ip_address,
          { "Ip Address", "spoolss.spoolss_PortData1.ip_address", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PortInfo_val2_info2,
-         { "Info2", "spoolss.spoolss_PortInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_Time_minute,
          { "Minute", "spoolss.spoolss_Time.minute", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPortEx_monitor_name,
@@ -40043,8 +40002,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Cacontrast", "spoolss.spoolss_PSDRVEXTRA400.caContrast", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrinterEx_info_ctr,
          { "Info Ctr", "spoolss.spoolss_AddPrinterEx.info_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrintProcessorInfo_val1_info1,
-         { "Info1", "spoolss.spoolss_PrintProcessorInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_wFeedDirection,
          { "Wfeeddirection", "spoolss.spoolss_PSDRVEXTRA.wFeedDirection", FT_UINT1632, BASE_DEC, VALS(spoolss_spoolss_DMPS_FeedDirection_vals), 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrintProcessors_buffer,
@@ -40055,6 +40012,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Size", "spoolss.spoolss_NotifyString.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_status,
          { "Status", "spoolss.spoolss_PrinterInfo0.status", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_info3,
+         { "Info3", "spoolss.spoolss_SetPrinterInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_c_setprinter,
          { "C Setprinter", "spoolss.spoolss_PrinterInfo0.c_setprinter", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrintProcessors_environment,
@@ -40107,12 +40066,18 @@ void proto_register_dcerpc_spoolss(void)
          { "Snmpcommunity", "spoolss.spoolss_PortData1.snmpcommunity", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UserLevel1_client,
          { "Client", "spoolss.spoolss_UserLevel1.client", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_KeyNames_string_array,
+         { "String Array", "spoolss.spoolss_KeyNames.string_array", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriverPackagePath_architecture,
          { "Architecture", "spoolss.spoolss_GetPrinterDriverPackagePath.architecture", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumMonitors_servername,
          { "Servername", "spoolss._spoolss_EnumMonitors.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddMonitorInfo_info2,
+         { "Info2", "spoolss.spoolss_AddMonitorInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_sharename,
          { "Sharename", "spoolss.spoolss_SetPrinterInfo2.sharename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_info4,
+         { "Info4", "spoolss.spoolss_SetPrinterInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumForms_level,
          { "Level", "spoolss.spoolss_EnumForms.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_ReadPrinter_handle,
@@ -40121,6 +40086,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Inf Path", "spoolss.spoolss_DriverInfo8.inf_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo6_driver_version,
          { "Driver Version", "spoolss.spoolss_AddDriverInfo6.driver_version", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetJobInfo_info2,
+         { "Info2", "spoolss.spoolss_SetJobInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriverDirectory_environment,
          { "Environment", "spoolss.spoolss_GetPrinterDriverDirectory.environment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_DERIVED,
@@ -40143,10 +40110,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Lang Id", "spoolss.spoolss_AddFormInfo2.lang_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_FormStringType_SPOOLSS_FORM_STRING_TYPE_LANG_PAIR,
          { "Spoolss Form String Type Lang Pair", "spoolss.spoolss_FormStringType.SPOOLSS_FORM_STRING_TYPE_LANG_PAIR", FT_BOOLEAN, 32, TFS(&spoolss_FormStringType_SPOOLSS_FORM_STRING_TYPE_LANG_PAIR_tfs), ( 0x00000004 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_JobInfo_info2,
+         { "Info2", "spoolss.spoolss_JobInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrinterDrivers_count,
          { "Count", "spoolss._spoolss_EnumPrinterDrivers.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_DWORD_integer,
-         { "Integer", "spoolss.spoolss_NotifyData_valNOTIFY_TABLE_DWORD.integer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PortInfo_info1,
+         { "Info1", "spoolss.spoolss_PortInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumForms_buffer,
          { "Buffer", "spoolss.spoolss_EnumForms.buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData1_snmp_enabled,
@@ -40159,8 +40128,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Buffer", "spoolss.spoolss_EnumMonitors.buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo2_parameters,
          { "Parameters", "spoolss.spoolss_PrinterInfo2.parameters", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0600_psdrvextra,
-         { "Psdrvextra", "spoolss.spoolss_DeviceModeExtraDataPostScript_val0x0600.psdrvextra", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_CorePrinterDriver_driver_date,
          { "Driver Date", "spoolss.spoolss_CorePrinterDriver.driver_date", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinters_flags,
@@ -40173,6 +40140,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Dwchecksum32", "spoolss.spoolss_UNIDRVEXTRA500.dwChecksum32", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_ReadPrinter_data,
          { "Data", "spoolss.spoolss_ReadPrinter.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_info2,
+         { "Info2", "spoolss.spoolss_DriverInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo5_version,
          { "Version", "spoolss.spoolss_DriverInfo5.version", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DriverOSVersion_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo4_start_time,
@@ -40227,8 +40196,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Type", "spoolss.spoolss_Notify.type", FT_UINT16, BASE_DEC, VALS(spoolss_spoolss_NotifyType_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData2_port_number,
          { "Port Number", "spoolss.spoolss_PortData2.port_number", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_val1_info1,
-         { "Info1", "spoolss.spoolss_DriverInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_max_spooling,
          { "Max Spooling", "spoolss.spoolss_PrinterInfo0.max_spooling", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_caColorfulness,
@@ -40255,8 +40222,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Woemextra", "spoolss.spoolss_UNIDRVEXTRA500.wOEMExtra", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverFileInfo_file_type,
          { "File Type", "spoolss.spoolss_DriverFileInfo.file_type", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DriverFileType_vals), 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddMonitorInfo_val1_info1,
-         { "Info1", "spoolss.spoolss_AddMonitorInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_BIDI_DATA_u_iData,
+         { "Idata", "spoolss.RPC_BIDI_DATA_u.iData", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo8_driver_path,
          { "Driver Path", "spoolss.spoolss_DriverInfo8.driver_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_XPS,
@@ -40265,8 +40232,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Idialect", "spoolss.spoolss_PSDRVEXTRA500.iDialect", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DMPS_Dialect_vals), 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumMonitors_info,
          { "Info", "spoolss._spoolss_EnumMonitors.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_val4_info4,
-         { "Info4", "spoolss.spoolss_DriverInfo_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrinterEx_handle,
          { "Handle", "spoolss.spoolss_AddPrinterEx.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo1_status,
@@ -40277,8 +40242,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Secdesc", "spoolss.spoolss_JobInfo4.secdesc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddFormInfo1_size,
          { "Size", "spoolss.spoolss_AddFormInfo1.size", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetJobInfo_val3_info3,
-         { "Info3", "spoolss.spoolss_SetJobInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8__ndr_size_core_driver_dependencies,
          { " Ndr Size Core Driver Dependencies", "spoolss.spoolss_AddDriverInfo8._ndr_size_core_driver_dependencies", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrinterDrivers_server,
@@ -40295,12 +40258,18 @@ void proto_register_dcerpc_spoolss(void)
          { "Fields", "spoolss.spoolss_NotifyOptionType.fields", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_FAX,
          { "Printer Driver Category Fax", "spoolss.spoolss_DriverAttributes.PRINTER_DRIVER_CATEGORY_FAX", FT_BOOLEAN, 32, TFS(&spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_FAX_tfs), ( 0x00000040 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra351,
+         { "Psdrvextra351", "spoolss.spoolss_DeviceModeExtraDataPostScript.psdrvextra351", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_dwX,
          { "Dwx", "spoolss.spoolss_PSDRVEXTRA500.dwX", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DevmodeContainer_devmode_,
          { "Subcontext length", "spoolss.spoolss_DevmodeContainer.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinter_info,
          { "Info", "spoolss.spoolss_GetPrinter.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_PrintPropertyValueUnion_propertyInt32,
+         { "Propertyint32", "spoolss.RPC_PrintPropertyValueUnion.propertyInt32", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_NotifyData_devmode,
+         { "Devmode", "spoolss.spoolss_NotifyData.devmode", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo8_config_file,
          { "Config File", "spoolss.spoolss_DriverInfo8.config_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterDataEx_key_name,
@@ -40339,14 +40308,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Ilayout", "spoolss.spoolss_PSDRVEXTRA.iLayout", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DM_Layout_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetForm_info_ctr,
          { "Info Ctr", "spoolss.spoolss_SetForm.info_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddFormInfo_info1,
+         { "Info1", "spoolss.spoolss_AddFormInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_Time_year,
          { "Year", "spoolss.spoolss_Time.year", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPorts_servername,
          { "Servername", "spoolss.spoolss_EnumPorts.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_DRV_ERROR_HANDLER,
          { "Spoolss Dm Ps Flags Drv Error Handler", "spoolss.spoolss_DMPS_Flags.SPOOLSS_DM_PS_FLAGS_DRV_ERROR_HANDLER", FT_BOOLEAN, 32, TFS(&spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_DRV_ERROR_HANDLER_tfs), ( 0x00000002 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetJobInfo_val4_info4,
-         { "Info4", "spoolss.spoolss_SetJobInfo_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo4_data_file,
          { "Data File", "spoolss.spoolss_AddDriverInfo4.data_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON4,
@@ -40357,6 +40326,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Info", "spoolss._spoolss_EnumPorts.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_BIDI_REQUEST_CONTAINER_Version,
          { "Version", "spoolss.RPC_BIDI_REQUEST_CONTAINER.Version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_info7,
+         { "Info7", "spoolss.spoolss_PrinterInfo.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_caContrast,
          { "Cacontrast", "spoolss.spoolss_PSDRVEXTRA500.caContrast", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OSVersionEx_suite_mask,
@@ -40365,8 +40336,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Wcutsheet", "spoolss.spoolss_PSDRVEXTRA.wCutSheet", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RouterReplyPrinter_handle,
          { "Handle", "spoolss.spoolss_RouterReplyPrinter.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_DEVMODE_devmode,
-         { "Devmode", "spoolss.spoolss_NotifyData_valNOTIFY_TABLE_DEVMODE.devmode", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo7_version,
          { "Version", "spoolss.spoolss_DriverInfo7.version", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DriverOSVersion_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrinterDriverExFlags_APD_COPY_ALL_FILES,
@@ -40379,8 +40348,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Printername", "spoolss.spoolss_OpenPrinterEx.printername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePrinterDataEx_value_name,
          { "Value Name", "spoolss.spoolss_DeletePrinterDataEx.value_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddMonitorInfo_val2_info2,
-         { "Info2", "spoolss.spoolss_AddMonitorInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrintProcDataTypes_count,
          { "Count", "spoolss.spoolss_EnumPrintProcDataTypes.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_UNIVERSAL_FONT_ID_Index,
@@ -40395,6 +40362,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Major", "spoolss.spoolss_OSVersion.major", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PAPERLENGTH,
          { "Devmode Paperlength", "spoolss.spoolss_DeviceModeFields.DEVMODE_PAPERLENGTH", FT_BOOLEAN, 32, TFS(&spoolss_DeviceModeFields_DEVMODE_PAPERLENGTH_tfs), ( 0x00000004 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_NotifyData_string,
+         { "String", "spoolss.spoolss_NotifyData.string", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_NETWORK,
          { "Printer Enum Network", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_NETWORK", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_NETWORK_tfs), ( 0x00000040 ), NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumMonitors_level,
@@ -40417,8 +40386,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Cagreengamma", "spoolss.spoolss_PSDRVEXTRA351.caGreenGamma", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss___spoolss_EnumPorts_count,
          { "Count", "spoolss.__spoolss_EnumPorts.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_KeyNames_valdefault_string_array,
-         { "String Array", "spoolss.spoolss_KeyNames_valdefault.string_array", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinters_needed,
          { "Needed", "spoolss.spoolss_EnumPrinters.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PRINTER,
@@ -40441,8 +40408,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Driver Name", "spoolss.spoolss_JobInfo4.driver_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_iDialect,
          { "Idialect", "spoolss.spoolss_PSDRVEXTRA.iDialect", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DMPS_Dialect_vals), 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_val6_info6,
-         { "Info6", "spoolss.spoolss_SetPrinterInfo_val6.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo4_time,
          { "Time", "spoolss.spoolss_JobInfo4.time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_SET_PRINTER_DRIVER,
@@ -40451,14 +40416,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Form Name", "spoolss.spoolss_GetForm.form_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA351_caReferenceBlack,
          { "Careferenceblack", "spoolss.spoolss_PSDRVEXTRA351.caReferenceBlack", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_info1,
+         { "Info1", "spoolss.spoolss_PrinterInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_logpixels,
          { "Logpixels", "spoolss.spoolss_DeviceMode.logpixels", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo3_default_datatype,
          { "Default Datatype", "spoolss.spoolss_AddDriverInfo3.default_datatype", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePort_ptr,
          { "Ptr", "spoolss.spoolss_DeletePort.ptr", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_BIDI_DATA_u_valBIDI_ENUM_sData,
-         { "Sdata", "spoolss.RPC_BIDI_DATA_u_valBIDI_ENUM.sData", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterEnumValues_data_length,
          { "Data Length", "spoolss.spoolss_PrinterEnumValues.data_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_BIDI_REQUEST_DATA_pSchema,
@@ -40497,8 +40462,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Dpd Delete Specific Version", "spoolss.spoolss_DeleteDriverFlags.DPD_DELETE_SPECIFIC_VERSION", FT_BOOLEAN, 32, TFS(&spoolss_DeleteDriverFlags_DPD_DELETE_SPECIFIC_VERSION_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo6_driver_path,
          { "Driver Path", "spoolss.spoolss_AddDriverInfo6.driver_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_val3_info3,
-         { "Info3", "spoolss.spoolss_PrinterInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddFormInfo_info2,
+         { "Info2", "spoolss.spoolss_AddFormInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_printername,
          { "Printername", "spoolss.spoolss_SetPrinterInfo2.printername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_XcvData_in_data,
@@ -40565,6 +40530,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Wreserved", "spoolss.spoolss_UNIDRVEXTRA3_4.wReserved", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrinter_info_ctr,
          { "Info Ctr", "spoolss.spoolss_AddPrinter.info_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra3_4,
+         { "Unidrvextra3 4", "spoolss.spoolss_DeviceModeExtraDataUniDriver.unidrvextra3_4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterData_value,
+         { "Value", "spoolss.spoolss_PrinterData.value", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8_inf_path,
          { "Inf Path", "spoolss.spoolss_AddDriverInfo8.inf_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA_wCoreJTExpSize,
@@ -40581,8 +40550,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Device Not Selected Timeout", "spoolss.spoolss_PrinterInfo5.device_not_selected_timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeInfo_devmode,
          { "Devmode", "spoolss.spoolss_DeviceModeInfo.devmode", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterData_valREG_BINARY_binary,
-         { "Binary", "spoolss.spoolss_PrinterData_valREG_BINARY.binary", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OSVersion_extra_string,
          { "Extra String", "spoolss.spoolss_OSVersion.extra_string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_SCALE,
@@ -40593,10 +40560,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Wchepsfile", "spoolss.spoolss_PSDRVEXTRA.wchEPSFile", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo101_previous_names,
          { "Previous Names", "spoolss.spoolss_DriverInfo101.previous_names", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPortInfo_info1,
+         { "Info1", "spoolss.spoolss_SetPortInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrintProcessor_print_processor_name,
          { "Print Processor Name", "spoolss.spoolss_AddPrintProcessor.print_processor_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo0_reserved3,
          { "Reserved3", "spoolss.spoolss_SetPrinterInfo0.reserved3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_info8,
+         { "Info8", "spoolss.spoolss_DriverInfo.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo2_drivername,
          { "Drivername", "spoolss.spoolss_PrinterInfo2.drivername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RemoteFindFirstPrinterChangeNotifyEx_flags,
@@ -40631,20 +40602,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Environment", "spoolss.spoolss_MonitorInfo2.environment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo3_data_file,
          { "Data File", "spoolss.spoolss_DriverInfo3.data_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0350_psdrvextra351,
-         { "Psdrvextra351", "spoolss.spoolss_DeviceModeExtraDataPostScript_val0x0350.psdrvextra351", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_LOCAL,
          { "Printer Attribute Local", "spoolss.spoolss_PrinterAttributes.PRINTER_ATTRIBUTE_LOCAL", FT_BOOLEAN, 32, TFS(&spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_LOCAL_tfs), ( 0x00000040 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_CorePrinterDriver_formname,
          { "Formname", "spoolss.spoolss_CorePrinterDriver.formname", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrintProcDataTypes_count,
          { "Count", "spoolss._spoolss_EnumPrintProcDataTypes.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeByte_propertyByte,
-         { "Propertybyte", "spoolss.RPC_PrintPropertyValueUnion_valkRpcPropertyTypeByte.propertyByte", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverDirectoryInfo_val1_info1,
-         { "Info1", "spoolss.spoolss_DriverDirectoryInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_val7_info7,
-         { "Info7", "spoolss.spoolss_SetPrinterInfo_val7.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPortEx_port_ctr,
          { "Port Ctr", "spoolss.spoolss_AddPortEx.port_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriverPackagePath_package_id,
@@ -40655,12 +40618,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Size", "spoolss.spoolss_TimeCtr.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA_iQuality,
          { "Iquality", "spoolss.spoolss_UNIDRVEXTRA.iQuality", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DMUNI_Quality_vals), 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_Field_valJOB_NOTIFY_TYPE_field,
-         { "Field", "spoolss.spoolss_Field_valJOB_NOTIFY_TYPE.field", FT_UINT16, BASE_DEC, VALS(spoolss_spoolss_PrintNotifyField_vals), 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_info8,
+         { "Info8", "spoolss.spoolss_SetPrinterInfo.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterEnumValues_value_name_len,
          { "Value Name Len", "spoolss.spoolss_PrinterEnumValues.value_name_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrinterDrivers_info,
          { "Info", "spoolss._spoolss_EnumPrinterDrivers.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrintProcessorDirectoryInfo_info1,
+         { "Info1", "spoolss.spoolss_PrintProcessorDirectoryInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss___spoolss_EnumForms_info,
          { "Info", "spoolss.__spoolss_EnumForms.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterDataEx_handle,
@@ -40721,8 +40686,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Version", "spoolss.spoolss_DriverInfo4.version", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DriverOSVersion_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo4_size_high,
          { "Size High", "spoolss.spoolss_SetJobInfo4.size_high", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrintProcessorDirectoryInfo_val1_info1,
-         { "Info1", "spoolss.spoolss_PrintProcessorDirectoryInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrinterDriverExFlags_APD_STRICT_UPGRADE,
          { "Apd Strict Upgrade", "spoolss.spoolss_AddPrinterDriverExFlags.APD_STRICT_UPGRADE", FT_BOOLEAN, 32, TFS(&spoolss_AddPrinterDriverExFlags_APD_STRICT_UPGRADE_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_ReplyClosePrinter_handle,
@@ -40733,8 +40696,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Dsprint Unpublish", "spoolss.spoolss_DsPrintAction.DSPRINT_UNPUBLISH", FT_BOOLEAN, 32, TFS(&spoolss_DsPrintAction_DSPRINT_UNPUBLISH_tfs), ( 0x00000004 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo8_monitor_name,
          { "Monitor Name", "spoolss.spoolss_DriverInfo8.monitor_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_val6_info6,
-         { "Info6", "spoolss.spoolss_DriverInfo_val6.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_devicename,
          { "Devicename", "spoolss.spoolss_DeviceMode.devicename", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo8_driver_name,
@@ -40757,16 +40718,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Servername", "spoolss.spoolss_PrinterInfo4.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RpcDeleteJobNamedProperty_pszName,
          { "Pszname", "spoolss.spoolss_RpcDeleteJobNamedProperty.pszName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPortInfo_val2_info2,
-         { "Info2", "spoolss.spoolss_SetPortInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPorts_servername,
          { "Servername", "spoolss._spoolss_EnumPorts.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_COMPRESS_BITMAP,
          { "Spoolss Dm Ps Flags Compress Bitmap", "spoolss.spoolss_DMPS_Flags.SPOOLSS_DM_PS_FLAGS_COMPRESS_BITMAP", FT_BOOLEAN, 32, TFS(&spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_COMPRESS_BITMAP_tfs), ( 0x00000040 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_GetJob_needed,
          { "Needed", "spoolss.spoolss_GetJob.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_BIDI_DATA_u_valBIDI_INT_iData,
-         { "Idata", "spoolss.RPC_BIDI_DATA_u_valBIDI_INT.iData", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData1_reserved,
          { "Reserved", "spoolss.spoolss_PortData1.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo1_status,
@@ -40783,8 +40740,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Status Busy", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_BUSY", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_BUSY_tfs), ( 0x00000200 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_NETWORK,
          { "Printer Attribute Network", "spoolss.spoolss_PrinterAttributes.PRINTER_ATTRIBUTE_NETWORK", FT_BOOLEAN, 32, TFS(&spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_NETWORK_tfs), ( 0x00000010 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_STRING_string,
-         { "String", "spoolss.spoolss_NotifyData_valNOTIFY_TABLE_STRING.string", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo6_dependent_files,
          { "Dependent Files", "spoolss.spoolss_DriverInfo6.dependent_files", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_FormSize_height,
@@ -40817,18 +40772,16 @@ void proto_register_dcerpc_spoolss(void)
          { "Keyword", "spoolss.spoolss_AddFormInfo2.keyword", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo4_monitor_name,
          { "Monitor Name", "spoolss.spoolss_DriverInfo4.monitor_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_val5_info5,
-         { "Info5", "spoolss.spoolss_SetPrinterInfo_val5.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DocumentInfo1_datatype,
          { "Datatype", "spoolss.spoolss_DocumentInfo1.datatype", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo5_driver_name,
          { "Driver Name", "spoolss.spoolss_AddDriverInfo5.driver_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt32_propertyInt32,
-         { "Propertyint32", "spoolss.RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt32.propertyInt32", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RpcSetJobNamedProperty_hPrinter,
          { "Hprinter", "spoolss.spoolss_RpcSetJobNamedProperty.hPrinter", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrintProcessor_architecture,
          { "Architecture", "spoolss.spoolss_AddPrintProcessor.architecture", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_UserLevel_level3,
+         { "Level3", "spoolss.spoolss_UserLevel.level3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PROCESSING,
          { "Printer Status Processing", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_PROCESSING", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_PROCESSING_tfs), ( 0x00004000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData2_snmp_enabled,
@@ -40841,6 +40794,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Status Paper Out", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_PAPER_OUT", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_PAPER_OUT_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_FormInfo1_area,
          { "Area", "spoolss.spoolss_FormInfo1.area", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_PrintPropertyValueUnion_propertyByte,
+         { "Propertybyte", "spoolss.RPC_PrintPropertyValueUnion.propertyByte", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData2_protocol,
          { "Protocol", "spoolss.spoolss_PortData2.protocol", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_PortProtocol_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_wOEMExtra,
@@ -40863,6 +40818,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Cabrightness", "spoolss.spoolss_PSDRVEXTRA400.caBrightness", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_EXPAND,
          { "Printer Enum Expand", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_EXPAND", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_EXPAND_tfs), ( 0x00004000 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra,
+         { "Psdrvextra", "spoolss.spoolss_DeviceModeExtraDataPostScript.psdrvextra", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JTEXP_dwVersion,
          { "Dwversion", "spoolss.spoolss_JTEXP.dwVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo4_driver_name,
@@ -40881,20 +40838,18 @@ void proto_register_dcerpc_spoolss(void)
          { "Data Type", "spoolss.spoolss_SetJobInfo1.data_type", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterKey_key_name,
          { "Key Name", "spoolss.spoolss_EnumPrinterKey.key_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_info3,
+         { "Info3", "spoolss.spoolss_PrinterInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo1_printer_name,
          { "Printer Name", "spoolss.spoolss_JobInfo1.printer_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo4_start_time,
          { "Start Time", "spoolss.spoolss_SetJobInfo4.start_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PortInfo_val3_info3,
-         { "Info3", "spoolss.spoolss_PortInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddDriverInfo_info4,
+         { "Info4", "spoolss.spoolss_AddDriverInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RemoteFindFirstPrinterChangeNotifyEx_notify_options,
          { "Notify Options", "spoolss.spoolss_RemoteFindFirstPrinterChangeNotifyEx.notify_options", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PAUSED,
          { "Printer Status Paused", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_PAUSED", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_PAUSED_tfs), ( 0x00000001 ), NULL, HFILL }},
-       { &hf_spoolss_RPC_BIDI_DATA_u_valBIDI_BOOL_bData,
-         { "Bdata", "spoolss.RPC_BIDI_DATA_u_valBIDI_BOOL.bData", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetJobInfo_val1_info1,
-         { "Info1", "spoolss.spoolss_SetJobInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_fields,
          { "Fields", "spoolss.spoolss_DeviceMode.fields", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_BIDI_RESPONSE_CONTAINER_Version,
@@ -40907,6 +40862,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Wreserved", "spoolss.spoolss_UNIDRVEXTRA500.wReserved", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo0_job_error,
          { "Job Error", "spoolss.spoolss_SetPrinterInfo0.job_error", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_info1,
+         { "Info1", "spoolss.spoolss_DriverInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_StartDocPrinter_info_ctr,
          { "Info Ctr", "spoolss.spoolss_StartDocPrinter.info_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_MonitorUi_dll_name,
@@ -40925,8 +40882,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Datatype", "spoolss.spoolss_PrinterInfo2.datatype", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DsPrintAction_DSPRINT_PUBLISH,
          { "Dsprint Publish", "spoolss.spoolss_DsPrintAction.DSPRINT_PUBLISH", FT_BOOLEAN, 32, TFS(&spoolss_DsPrintAction_DSPRINT_PUBLISH_tfs), ( 0x00000001 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_valdefault_uniblob,
-         { "Uniblob", "spoolss.spoolss_DeviceModeExtraDataUniDriver_valdefault.uniblob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfoContainer_info,
          { "Info", "spoolss.spoolss_JobInfoContainer.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_XcvData_needed,
@@ -40935,12 +40890,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Position", "spoolss.spoolss_SetJobInfo1.position", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo4_notify_name,
          { "Notify Name", "spoolss.spoolss_SetJobInfo4.notify_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPortInfo_val3_info3,
-         { "Info3", "spoolss.spoolss_SetPortInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDataEx_needed,
          { "Needed", "spoolss.spoolss_GetPrinterDataEx.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePrinterDriver_driver,
          { "Driver", "spoolss.spoolss_DeletePrinterDriver.driver", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra500,
+         { "Unidrvextra500", "spoolss.spoolss_DeviceModeExtraDataUniDriver.unidrvextra500", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_caReferenceBlack,
          { "Careferenceblack", "spoolss.spoolss_PSDRVEXTRA.caReferenceBlack", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPort_unknown,
@@ -40965,8 +40920,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Info", "spoolss.__spoolss_EnumPrinterDataEx.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OSVersionEx_extra_string_,
          { "Subcontext length", "spoolss.spoolss_OSVersionEx.subcontext", FT_UINT0, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddDriverInfo_val6_info6,
-         { "Info6", "spoolss.spoolss_AddDriverInfo_val6.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_info7,
+         { "Info7", "spoolss.spoolss_SetPrinterInfo.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo6_monitor_name,
          { "Monitor Name", "spoolss.spoolss_DriverInfo6.monitor_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OSVersion__ndr_size,
@@ -40975,8 +40930,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Hardware Id", "spoolss.spoolss_DriverInfo8.hardware_id", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumJobs_handle,
          { "Handle", "spoolss.spoolss_EnumJobs.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_info6,
+         { "Info6", "spoolss.spoolss_DriverInfo.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterKey_handle,
          { "Handle", "spoolss.spoolss_EnumPrinterKey.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPortInfo_infoFF,
+         { "Infoff", "spoolss.spoolss_SetPortInfo.infoFF", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo6__ndr_size_dependent_files,
          { " Ndr Size Dependent Files", "spoolss.spoolss_AddDriverInfo6._ndr_size_dependent_files", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriver_offered,
@@ -40995,8 +40954,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Servername", "spoolss.spoolss_AddPortEx.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_fxScrAngle,
          { "Fxscrangle", "spoolss.spoolss_PSDRVEXTRA.fxScrAngle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_info8,
+         { "Info8", "spoolss.spoolss_PrinterInfo.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo8_manufacturer_url,
          { "Manufacturer Url", "spoolss.spoolss_DriverInfo8.manufacturer_url", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_unidrvextra,
+         { "Unidrvextra", "spoolss.spoolss_DeviceModeExtraDataUniDriver.unidrvextra", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo4_position,
          { "Position", "spoolss.spoolss_JobInfo4.position", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumJobs_handle,
@@ -41005,8 +40968,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Defaultpriority", "spoolss.spoolss_PrinterInfo2.defaultpriority", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo7_action,
          { "Action", "spoolss.spoolss_SetPrinterInfo7.action", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterData_data,
+         { "Data", "spoolss.spoolss_PrinterData.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AbortPrinter_handle,
          { "Handle", "spoolss.spoolss_AbortPrinter.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_BIDI_DATA_u_bData,
+         { "Bdata", "spoolss.RPC_BIDI_DATA_u.bData", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_FormInfo1_flags,
          { "Flags", "spoolss.spoolss_FormInfo1.flags", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_FormFlags_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData1_portname,
@@ -41029,8 +40996,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Status Page Punt", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_PAGE_PUNT", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_PAGE_PUNT_tfs), ( 0x00080000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo6_version,
          { "Version", "spoolss.spoolss_AddDriverInfo6.version", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DriverOSVersion_vals), 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_val5_info5,
-         { "Info5", "spoolss.spoolss_DriverInfo_val5.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OSVersionEx_minor,
          { "Minor", "spoolss.spoolss_OSVersionEx.minor", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_BIDI_REQUEST_CONTAINER_aData,
@@ -41053,6 +41018,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Port Name", "spoolss.spoolss_SetPortInfoFF.port_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPerMachineConnection_provider,
          { "Provider", "spoolss.spoolss_AddPerMachineConnection.provider", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_UserLevel_level1,
+         { "Level1", "spoolss.spoolss_UserLevel.level1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AccessRights_JOB_ACCESS_ADMINISTER,
          { "Job Access Administer", "spoolss.spoolss_AccessRights.JOB_ACCESS_ADMINISTER", FT_BOOLEAN, 32, TFS(&spoolss_AccessRights_JOB_ACCESS_ADMINISTER_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_DITHERTYPE,
@@ -41063,6 +41030,8 @@ void proto_register_dcerpc_spoolss(void)
          { " Secdesc Ptr", "spoolss.spoolss_SetJobInfo4._secdesc_ptr", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_PANNINGWIDTH,
          { "Devmode Panningwidth", "spoolss.spoolss_DeviceModeFields.DEVMODE_PANNINGWIDTH", FT_BOOLEAN, 32, TFS(&spoolss_DeviceModeFields_DEVMODE_PANNINGWIDTH_tfs), ( 0x08000000 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPortInfo_info3,
+         { "Info3", "spoolss.spoolss_SetPortInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_total_bytes,
          { "Total Bytes", "spoolss.spoolss_PrinterInfo0.total_bytes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2_driver_name,
@@ -41119,6 +41088,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Spoolss Dm Ps Flags Print Negative", "spoolss.spoolss_DMPS_Flags.SPOOLSS_DM_PS_FLAGS_PRINT_NEGATIVE", FT_BOOLEAN, 32, TFS(&spoolss_DMPS_Flags_SPOOLSS_DM_PS_FLAGS_PRINT_NEGATIVE_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_FindClosePrinterNotify_handle,
          { "Handle", "spoolss.spoolss_FindClosePrinterNotify.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_info1,
+         { "Info1", "spoolss.spoolss_SetPrinterInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo2_driver_name,
          { "Driver Name", "spoolss.spoolss_AddDriverInfo2.driver_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumForms_handle,
@@ -41165,6 +41136,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Enumerate Network Printers", "spoolss.spoolss_PrinterInfo0.enumerate_network_printers", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinter_needed,
          { "Needed", "spoolss.spoolss_GetPrinter.needed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_JobInfo_info4,
+         { "Info4", "spoolss.spoolss_JobInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_info5,
+         { "Info5", "spoolss.spoolss_DriverInfo.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo1_job_id,
          { "Job Id", "spoolss.spoolss_JobInfo1.job_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_FORMNAME,
@@ -41183,6 +41158,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Job Id", "spoolss.spoolss_SetJobInfo2.job_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RouterRefreshPrinterChangeNotify_options,
          { "Options", "spoolss.spoolss_RouterRefreshPrinterChangeNotify.options", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PortInfo_info3,
+         { "Info3", "spoolss.spoolss_PortInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_BIDI_DATA_u_biData,
+         { "Bidata", "spoolss.RPC_BIDI_DATA_u.biData", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA_dwSignature,
          { "Dwsignature", "spoolss.spoolss_UNIDRVEXTRA.dwSignature", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DM_Signature_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_caReferenceBlack,
@@ -41199,8 +41178,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Level", "spoolss.spoolss_GetPrinterDriverDirectory.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OpenPrinter_printername,
          { "Printername", "spoolss.spoolss_OpenPrinter.printername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PortInfo_val0xff_infoFF,
-         { "Infoff", "spoolss.spoolss_PortInfo_val0xff.infoFF", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo0_total_pages,
          { "Total Pages", "spoolss.spoolss_SetPrinterInfo0.total_pages", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo5_driver_version,
@@ -41225,6 +41202,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Second", "spoolss.spoolss_Time.second", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_FILE,
          { "Printer Driver Category File", "spoolss.spoolss_DriverAttributes.PRINTER_DRIVER_CATEGORY_FILE", FT_BOOLEAN, 32, TFS(&spoolss_DriverAttributes_PRINTER_DRIVER_CATEGORY_FILE_tfs), ( 0x00000080 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverDirectoryInfo_info1,
+         { "Info1", "spoolss.spoolss_DriverDirectoryInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_cjobs,
          { "Cjobs", "spoolss.spoolss_SetPrinterInfo2.cjobs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DsPrintAction_DSPRINT_UPDATE,
@@ -41261,8 +41240,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Help File", "spoolss.spoolss_DriverInfo3.help_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo4_dependent_files,
          { "Dependent Files", "spoolss.spoolss_DriverInfo4.dependent_files", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PortInfo_val1_info1,
-         { "Info1", "spoolss.spoolss_PortInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo5_config_file,
          { "Config File", "spoolss.spoolss_AddDriverInfo5.config_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_BIDI_DATA_dwBidiType,
@@ -41291,6 +41268,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Ittdlfmt", "spoolss.spoolss_PSDRVEXTRA500.iTTDLFmt", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DMPS_TTDLFmt_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo101_manufacturer_name,
          { "Manufacturer Name", "spoolss.spoolss_DriverInfo101.manufacturer_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_NotifyData_sd,
+         { "Sd", "spoolss.spoolss_NotifyData.sd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_printprocessor,
          { "Printprocessor", "spoolss.spoolss_SetPrinterInfo2.printprocessor", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_CreatePrinterIC_gdi_handle,
@@ -41299,8 +41278,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Buffer", "spoolss.spoolss_EnumJobs.buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AccessRights_SERVER_ACCESS_ENUMERATE,
          { "Server Access Enumerate", "spoolss.spoolss_AccessRights.SERVER_ACCESS_ENUMERATE", FT_BOOLEAN, 32, TFS(&spoolss_AccessRights_SERVER_ACCESS_ENUMERATE_tfs), ( 0x00000002 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_val6_info6,
-         { "Info6", "spoolss.spoolss_PrinterInfo_val6.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DMUNI_Flags_SPOOLSS_DM_UNI_FLAGS_PRINT_TEXT_AS_GRAPHICS,
          { "Spoolss Dm Uni Flags Print Text As Graphics", "spoolss.spoolss_DMUNI_Flags.SPOOLSS_DM_UNI_FLAGS_PRINT_TEXT_AS_GRAPHICS", FT_BOOLEAN, 32, TFS(&spoolss_DMUNI_Flags_SPOOLSS_DM_UNI_FLAGS_PRINT_TEXT_AS_GRAPHICS_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_servername,
@@ -41309,8 +41286,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Size2", "spoolss.spoolss_UserLevel3.size2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfoCtr_info,
          { "Info", "spoolss.spoolss_SetPrinterInfoCtr.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_BIDI_DATA_u_valBIDI_TEXT_sData,
-         { "Sdata", "spoolss.RPC_BIDI_DATA_u_valBIDI_TEXT.sData", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_info4,
+         { "Info4", "spoolss.spoolss_PrinterInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_NotifyOption_count,
          { "Count", "spoolss.spoolss_NotifyOption.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetJob_offered,
@@ -41319,14 +41296,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Guid", "spoolss.spoolss_SetPrinterInfo7.guid", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_total_jobs,
          { "Total Jobs", "spoolss.spoolss_PrinterInfo0.total_jobs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_UserLevel_val1_level1,
-         { "Level1", "spoolss.spoolss_UserLevel_val1.level1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0500_unidrvextra500,
-         { "Unidrvextra500", "spoolss.spoolss_DeviceModeExtraDataUniDriver_val0x0500.unidrvextra500", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_parameters,
          { "Parameters", "spoolss.spoolss_SetPrinterInfo2.parameters", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeletePort_server_name,
          { "Server Name", "spoolss.spoolss_DeletePort.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetPrinterInfo_info5,
+         { "Info5", "spoolss.spoolss_SetPrinterInfo.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddFormInfo2_string_type,
          { "String Type", "spoolss.spoolss_AddFormInfo2.string_type", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceModeFields_DEVMODE_NUP,
@@ -41361,8 +41336,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Driver Date", "spoolss.spoolss_DriverInfo101.driver_date", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetForm_handle,
          { "Handle", "spoolss.spoolss_SetForm.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt64_propertyInt64,
-         { "Propertyint64", "spoolss.RPC_PrintPropertyValueUnion_valkRpcPropertyTypeInt64.propertyInt64", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo4_architecture,
          { "Architecture", "spoolss.spoolss_DriverInfo4.architecture", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_num_error_out_of_paper,
@@ -41391,8 +41364,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Handle", "spoolss.spoolss_EnumPrinterData.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_job_error,
          { "Job Error", "spoolss.spoolss_PrinterInfo0.job_error", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPortInfo_val1_info1,
-         { "Info1", "spoolss.spoolss_SetPortInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_PACKAGE_AWARE,
          { "Printer Driver Package Aware", "spoolss.spoolss_DriverAttributes.PRINTER_DRIVER_PACKAGE_AWARE", FT_BOOLEAN, 32, TFS(&spoolss_DriverAttributes_PRINTER_DRIVER_PACKAGE_AWARE_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_PAPER_PROBLEM,
@@ -41411,6 +41382,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Handle", "spoolss.spoolss_SetPrinter.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_caRedGamma,
          { "Caredgamma", "spoolss.spoolss_PSDRVEXTRA500.caRedGamma", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_PrintPropertyValueUnion_propertyString,
+         { "Propertystring", "spoolss.RPC_PrintPropertyValueUnion.propertyString", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo2_portname,
          { "Portname", "spoolss.spoolss_SetPrinterInfo2.portname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterData_data,
@@ -41419,6 +41392,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Info", "spoolss._spoolss_EnumPrintProcessors.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DocumentInfoCtr_info,
          { "Info", "spoolss.spoolss_DocumentInfoCtr.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterData_binary,
+         { "Binary", "spoolss.spoolss_PrinterData.binary", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA400_caRedGreenTint,
          { "Caredgreentint", "spoolss.spoolss_PSDRVEXTRA400.caRedGreenTint", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_RAW_ONLY,
@@ -41477,8 +41452,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Attribute Default", "spoolss.spoolss_PrinterAttributes.PRINTER_ATTRIBUTE_DEFAULT", FT_BOOLEAN, 32, TFS(&spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_DEFAULT_tfs), ( 0x00000004 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo3__ndr_size_dependent_files,
          { " Ndr Size Dependent Files", "spoolss.spoolss_AddDriverInfo3._ndr_size_dependent_files", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_val101_info101,
-         { "Info101", "spoolss.spoolss_DriverInfo_val101.info101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetForm_form_name,
          { "Form Name", "spoolss.spoolss_SetForm.form_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrintProcessorDirectory_level,
@@ -41489,16 +41462,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Port Monitor Mib Index", "spoolss.spoolss_PortData2.port_monitor_mib_index", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddDriverInfo4_driver_path,
          { "Driver Path", "spoolss.spoolss_AddDriverInfo4.driver_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddDriverInfo_info6,
+         { "Info6", "spoolss.spoolss_AddDriverInfo.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo4_help_file,
          { "Help File", "spoolss.spoolss_DriverInfo4.help_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss___spoolss_EnumJobs_count,
          { "Count", "spoolss.__spoolss_EnumJobs.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_val8_info8,
-         { "Info8", "spoolss.spoolss_PrinterInfo_val8.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA500_caReferenceWhite,
          { "Careferencewhite", "spoolss.spoolss_PSDRVEXTRA500.caReferenceWhite", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPrinterInfo_val4_info4,
-         { "Info4", "spoolss.spoolss_SetPrinterInfo_val4.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetCorePrinterDrivers_core_printer_driver_count,
          { "Core Printer Driver Count", "spoolss.spoolss_GetCorePrinterDrivers.core_printer_driver_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_ReplyOpenPrinter_handle,
@@ -41525,16 +41496,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Ttoption", "spoolss.spoolss_DeviceMode.ttoption", FT_UINT16, BASE_DEC, VALS(spoolss_spoolss_DeviceModeTTOption_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriver_info_,
          { "Subcontext length", "spoolss.spoolss_GetPrinterDriver.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_val1_info1,
-         { "Info1", "spoolss.spoolss_PrinterInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA_aOptions,
          { "Aoptions", "spoolss.spoolss_UNIDRVEXTRA.aOptions", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RpcGetJobNamedPropertyValue_pValue,
          { "Pvalue", "spoolss.spoolss_RpcGetJobNamedPropertyValue.pValue", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_info3,
+         { "Info3", "spoolss.spoolss_DriverInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA500_wVer,
          { "Wver", "spoolss.spoolss_UNIDRVEXTRA500.wVer", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterData_valREG_DWORD_value,
-         { "Value", "spoolss.spoolss_PrinterData_valREG_DWORD.value", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_UNIDRVEXTRA500_iLayout,
          { "Ilayout", "spoolss.spoolss_UNIDRVEXTRA500.iLayout", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DM_Layout_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData1_device_type,
@@ -41545,10 +41514,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Displayflags", "spoolss.spoolss_DeviceMode.displayflags", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_DeviceModeNUp_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA351_wchEPSFile,
          { "Wchepsfile", "spoolss.spoolss_PSDRVEXTRA351.wchEPSFile", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_info9,
+         { "Info9", "spoolss.spoolss_PrinterInfo.info9", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_Time_day_of_week,
          { "Day Of Week", "spoolss.spoolss_Time.day_of_week", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_BIDI_DATA_u_valBIDI_NULL_bData,
-         { "Bdata", "spoolss.RPC_BIDI_DATA_u_valBIDI_NULL.bData", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo1_text_status,
          { "Text Status", "spoolss.spoolss_JobInfo1.text_status", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo2_servername,
@@ -41561,6 +41530,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Processor Type", "spoolss.spoolss_PrinterInfo0.processor_type", FT_UINT32, BASE_DEC, VALS(spoolss_spoolss_ProcessorType_vals), 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo5_transmission_retry_timeout,
          { "Transmission Retry Timeout", "spoolss.spoolss_SetPrinterInfo5.transmission_retry_timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_FormInfo_info2,
+         { "Info2", "spoolss.spoolss_FormInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobStatus_JOB_STATUS_ERROR,
          { "Job Status Error", "spoolss.spoolss_JobStatus.JOB_STATUS_ERROR", FT_BOOLEAN, 32, TFS(&spoolss_JobStatus_JOB_STATUS_ERROR_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterDrivers_needed,
@@ -41605,12 +41576,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Until Time", "spoolss.spoolss_SetJobInfo4.until_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss___spoolss_EnumForms_count,
          { "Count", "spoolss.__spoolss_EnumForms.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DriverInfo_info101,
+         { "Info101", "spoolss.spoolss_DriverInfo.info101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PRINTER_DRIVER,
          { "Printer Change Add Printer Driver", "spoolss.spoolss_PrinterChangeFlags.PRINTER_CHANGE_ADD_PRINTER_DRIVER", FT_BOOLEAN, 32, TFS(&spoolss_PrinterChangeFlags_PRINTER_CHANGE_ADD_PRINTER_DRIVER_tfs), ( 0x10000000 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_SetJobInfo_info1,
+         { "Info1", "spoolss.spoolss_SetJobInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_MonitorInfo2_dll_name,
          { "Dll Name", "spoolss.spoolss_MonitorInfo2.dll_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_val0x0400_psdrvextra400,
-         { "Psdrvextra400", "spoolss.spoolss_DeviceModeExtraDataPostScript_val0x0400.psdrvextra400", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_RouterReplyPrinter_flags,
          { "Flags", "spoolss.spoolss_RouterReplyPrinter.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriver2_client_minor_version,
@@ -41649,8 +41622,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Numjobs", "spoolss.spoolss_EnumJobs.numjobs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumJobs_firstjob,
          { "Firstjob", "spoolss._spoolss_EnumJobs.firstjob", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_RPC_PrintPropertyValueUnion_valkRpcPropertyTypeBuffer_propertyBlob,
-         { "Propertyblob", "spoolss.RPC_PrintPropertyValueUnion_valkRpcPropertyTypeBuffer.propertyBlob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_XcvData__in_data_length,
          { " In Data Length", "spoolss.spoolss_XcvData._in_data_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinter_info_ctr,
@@ -41671,8 +41642,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Dwoptions", "spoolss.spoolss_UNIDRVEXTRA.dwOptions", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_dwX,
          { "Dwx", "spoolss.spoolss_PSDRVEXTRA.dwX", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterData_valREG_MULTI_SZ_string_array,
-         { "String Array", "spoolss.spoolss_PrinterData_valREG_MULTI_SZ.string_array", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo0_cjobs,
          { "Cjobs", "spoolss.spoolss_SetPrinterInfo0.cjobs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_JOB,
@@ -41691,8 +41660,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Level", "spoolss.spoolss_AddJob.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AccessRights_PRINTER_ACCESS_USE,
          { "Printer Access Use", "spoolss.spoolss_AccessRights.PRINTER_ACCESS_USE", FT_BOOLEAN, 32, TFS(&spoolss_AccessRights_PRINTER_ACCESS_USE_tfs), ( 0x00000008 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrintProcDataTypesInfo_val1_info1,
-         { "Info1", "spoolss.spoolss_PrintProcDataTypesInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2_data_type,
          { "Data Type", "spoolss.spoolss_SetJobInfo2.data_type", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddMonitorInfo2_environment,
@@ -41741,14 +41708,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Pcproperties", "spoolss.spoolss_RpcEnumJobNamedProperties.pcProperties", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JTEXP_ModelName,
          { "Modelname", "spoolss.spoolss_JTEXP.ModelName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_PrinterInfo_val7_info7,
-         { "Info7", "spoolss.spoolss_PrinterInfo_val7.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA400_caFlags,
          { "Caflags", "spoolss.spoolss_PSDRVEXTRA400.caFlags", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_SHARED,
          { "Printer Enum Shared", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_SHARED", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_SHARED_tfs), ( 0x00000020 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_RouterReplyPrinterEx_handle,
          { "Handle", "spoolss.spoolss_RouterReplyPrinterEx.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrintProcessorInfo_info1,
+         { "Info1", "spoolss.spoolss_PrintProcessorInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_DEFAULT,
          { "Printer Enum Default", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_DEFAULT", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_DEFAULT_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterDriver2_server_minor_version,
@@ -41761,6 +41728,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Devmode Collate", "spoolss.spoolss_DeviceModeFields.DEVMODE_COLLATE", FT_BOOLEAN, 32, TFS(&spoolss_DeviceModeFields_DEVMODE_COLLATE_tfs), ( 0x00008000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumMonitors_offered,
          { "Offered", "spoolss.spoolss_EnumMonitors.offered", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_uniblob,
+         { "Uniblob", "spoolss.spoolss_DeviceModeExtraDataUniDriver.uniblob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_WritePrinter_handle,
          { "Handle", "spoolss.spoolss_WritePrinter.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA400_dwSignature,
@@ -41769,6 +41738,12 @@ void proto_register_dcerpc_spoolss(void)
          { "Driver Path", "spoolss.spoolss_AddDriverInfo5.driver_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetPrinterInfo5_portname,
          { "Portname", "spoolss.spoolss_SetPrinterInfo5.portname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_Field_field,
+         { "Field", "spoolss.spoolss_Field.field", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddDriverInfo_info2,
+         { "Info2", "spoolss.spoolss_AddDriverInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddMonitorInfo_info1,
+         { "Info1", "spoolss.spoolss_AddMonitorInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_OSVersionEx_major,
          { "Major", "spoolss.spoolss_OSVersionEx.major", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddFormInfo2_mui_dll,
@@ -41805,10 +41780,10 @@ void proto_register_dcerpc_spoolss(void)
          { "Handle", "spoolss.spoolss_RouterRefreshPrinterChangeNotify.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobStatus_JOB_STATUS_COMPLETE,
          { "Job Status Complete", "spoolss.spoolss_JobStatus.JOB_STATUS_COMPLETE", FT_BOOLEAN, 32, TFS(&spoolss_JobStatus_JOB_STATUS_COMPLETE_tfs), ( 0x00001000 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_AddDriverInfo_info8,
+         { "Info8", "spoolss.spoolss_AddDriverInfo.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_collate,
          { "Collate", "spoolss.spoolss_DeviceMode.collate", FT_UINT16, BASE_DEC, VALS(spoolss_spoolss_DeviceModeCollate_vals), 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DeviceModeExtraDataUniDriver_val0x0301_unidrvextra3_4,
-         { "Unidrvextra3 4", "spoolss.spoolss_DeviceModeExtraDataUniDriver_val0x0301.unidrvextra3_4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeleteForm_form_name,
          { "Form Name", "spoolss.spoolss_DeleteForm.form_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_Time_day,
@@ -41817,6 +41792,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Directory Name", "spoolss.spoolss_DriverDirectoryInfo1.directory_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo2_start_time,
          { "Start Time", "spoolss.spoolss_SetJobInfo2.start_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PrinterInfo_info6,
+         { "Info6", "spoolss.spoolss_PrinterInfo.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo2_printprocessor,
          { "Printprocessor", "spoolss.spoolss_PrinterInfo2.printprocessor", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_dwWidthOffset,
@@ -41853,8 +41830,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Name", "spoolss.spoolss_PrinterInfo1.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PortData2_portname,
          { "Portname", "spoolss.spoolss_PortData2.portname", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_DocumentInfo_val1_info1,
-         { "Info1", "spoolss.spoolss_DocumentInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_PORT,
          { "Printer Change Delete Port", "spoolss.spoolss_PrinterChangeFlags.PRINTER_CHANGE_DELETE_PORT", FT_BOOLEAN, 32, TFS(&spoolss_PrinterChangeFlags_PRINTER_CHANGE_DELETE_PORT_tfs), ( 0x00400000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_OEM_DMEXTRA_dwSize,
@@ -41885,6 +41860,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Server Name", "spoolss.spoolss_SetJobInfo1.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_color,
          { "Color", "spoolss.spoolss_DeviceMode.color", FT_UINT16, BASE_DEC, VALS(spoolss_spoolss_DeviceModeColor_vals), 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_ReplyPrinterInfo_info0,
+         { "Info0", "spoolss.spoolss_ReplyPrinterInfo.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterStatus_PRINTER_STATUS_OFFLINE,
          { "Printer Status Offline", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_OFFLINE", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_OFFLINE_tfs), ( 0x00000080 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrinterData_needed,
@@ -41897,16 +41874,18 @@ void proto_register_dcerpc_spoolss(void)
          { "Buffer", "spoolss.spoolss_ReplyOpenPrinter.buffer", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AccessRights_SERVER_ACCESS_ADMINISTER,
          { "Server Access Administer", "spoolss.spoolss_AccessRights.SERVER_ACCESS_ADMINISTER", FT_BOOLEAN, 32, TFS(&spoolss_AccessRights_SERVER_ACCESS_ADMINISTER_tfs), ( 0x00000001 ), NULL, HFILL }},
+       { &hf_spoolss_spoolss_JobInfo_info1,
+         { "Info1", "spoolss.spoolss_JobInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetPrintProcessorDirectory_environment,
          { "Environment", "spoolss.spoolss_GetPrintProcessorDirectory.environment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA400_caReferenceWhite,
          { "Careferencewhite", "spoolss.spoolss_PSDRVEXTRA400.caReferenceWhite", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_MonitorContainer_info,
          { "Info", "spoolss.spoolss_MonitorContainer.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_DeviceModeExtraDataPostScript_psdrvextra400,
+         { "Psdrvextra400", "spoolss.spoolss_DeviceModeExtraDataPostScript.psdrvextra400", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverInfo5_data_file,
          { "Data File", "spoolss.spoolss_DriverInfo5.data_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_NotifyData_valNOTIFY_TABLE_SECURITYDESCRIPTOR_sd,
-         { "Sd", "spoolss.spoolss_NotifyData_valNOTIFY_TABLE_SECURITYDESCRIPTOR.sd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_JobInfo2_total_pages,
          { "Total Pages", "spoolss.spoolss_JobInfo2.total_pages", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_SetJobInfo1_priority,
@@ -41943,6 +41922,8 @@ void proto_register_dcerpc_spoolss(void)
          { "Printer Status No Toner", "spoolss.spoolss_PrinterStatus.PRINTER_STATUS_NO_TONER", FT_BOOLEAN, 32, TFS(&spoolss_PrinterStatus_PRINTER_STATUS_NO_TONER_tfs), ( 0x00040000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_dwOptions,
          { "Dwoptions", "spoolss.spoolss_PSDRVEXTRA.dwOptions", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_NotifyData_time,
+         { "Time", "spoolss.spoolss_NotifyData.time", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_AddPrinter_devmode_ctr,
          { "Devmode Ctr", "spoolss.spoolss_AddPrinter.devmode_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_caFlags,
@@ -41955,8 +41936,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Parameters", "spoolss.spoolss_SetJobInfo2.parameters", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_ENABLE_DEVQ,
          { "Printer Attribute Enable Devq", "spoolss.spoolss_PrinterAttributes.PRINTER_ATTRIBUTE_ENABLE_DEVQ", FT_BOOLEAN, 32, TFS(&spoolss_PrinterAttributes_PRINTER_ATTRIBUTE_ENABLE_DEVQ_tfs), ( 0x00000080 ), NULL, HFILL }},
-       { &hf_spoolss_spoolss_DriverInfo_val3_info3,
-         { "Info3", "spoolss.spoolss_DriverInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPorts_info,
          { "Info", "spoolss.spoolss_EnumPorts.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_paperlength,
@@ -41973,10 +41952,14 @@ void proto_register_dcerpc_spoolss(void)
          { "Data File", "spoolss.spoolss_AddDriverInfo2.data_file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DeviceMode_specversion,
          { "Specversion", "spoolss.spoolss_DeviceMode.specversion", FT_UINT16, BASE_DEC, VALS(spoolss_spoolss_DeviceModeSpecVersion_vals), 0, NULL, HFILL }},
+       { &hf_spoolss_spoolss_PortInfo_info2,
+         { "Info2", "spoolss.spoolss_PortInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON1,
          { "Printer Enum Icon1", "spoolss.spoolss_EnumPrinterFlags.PRINTER_ENUM_ICON1", FT_BOOLEAN, 32, TFS(&spoolss_EnumPrinterFlags_PRINTER_ENUM_ICON1_tfs), ( 0x00010000 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_WritePrinter__data_size,
          { " Data Size", "spoolss.spoolss_WritePrinter._data_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_spoolss_RPC_PrintPropertyValueUnion_propertyBlob,
+         { "Propertyblob", "spoolss.RPC_PrintPropertyValueUnion.propertyBlob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_DriverAttributes_PRINTER_DRIVER_SANDBOX_ENABLED,
          { "Printer Driver Sandbox Enabled", "spoolss.spoolss_DriverAttributes.PRINTER_DRIVER_SANDBOX_ENABLED", FT_BOOLEAN, 32, TFS(&spoolss_DriverAttributes_PRINTER_DRIVER_SANDBOX_ENABLED_tfs), ( 0x00000004 ), NULL, HFILL }},
        { &hf_spoolss_spoolss_GetCorePrinterDrivers_core_printer_drivers,
@@ -42003,8 +41986,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Defaultpriority", "spoolss.spoolss_SetPrinterInfo2.defaultpriority", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PrinterInfo0_printername,
          { "Printername", "spoolss.spoolss_PrinterInfo0.printername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_AddFormInfo_val2_info2,
-         { "Info2", "spoolss.spoolss_AddFormInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss__spoolss_EnumPrintProcDataTypes_offered,
          { "Offered", "spoolss._spoolss_EnumPrintProcDataTypes.offered", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA_dwNupDirection,
@@ -42019,8 +42000,6 @@ void proto_register_dcerpc_spoolss(void)
          { "Status", "spoolss.spoolss_PrinterInfo2.status", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_GetForm_info_,
          { "Subcontext length", "spoolss.spoolss_GetForm.subcontext", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_spoolss_spoolss_SetPortInfo_val0xff_infoFF,
-         { "Infoff", "spoolss.spoolss_SetPortInfo_val0xff.infoFF", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_spoolss_PSDRVEXTRA400_wChecksum,
          { "Wchecksum", "spoolss.spoolss_PSDRVEXTRA400.wChecksum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_spoolss_RPC_PrintNamedProperty_propertyName,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-srvsvc.c b/bin/default/librpc/gen_ndr/packet-dcerpc-srvsvc.c
index 31c8b4c400ae5a45c0cb39848cdb45f971fa49c5..bd0801e9d373c311f155761b9d2436fa92881a83 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-srvsvc.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-srvsvc.c
@@ -173,49 +173,47 @@ static gint ett_srvsvc_srvsvc_NetTransportInfo = -1;
 
 /* Header field declarations */
 static gint hf_srvsvc_srvsvc_NetDiskInfo0_disk = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1107_info1107 = -1;
 static gint hf_srvsvc_srvsvc_NetConnInfo1_user = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_val1007_info1007 = -1;
 static gint hf_srvsvc_srvsvc_NetTransportCtr1_count = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1536 = -1;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info502 = -1;
 static gint hf_srvsvc_srvsvc_NetFileEnum_resume_handle = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_threadcountadd = -1;
 static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_hunds = -1;
 static gint hf_srvsvc_srvsvc_NetShareAdd_level = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1537_info1537 = -1;
 static gint hf_srvsvc_srvsvc_NetShareDelCommit_hnd = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_networkerrortreshold = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1016_info1016 = -1;
 static gint hf_srvsvc_srvsvc_NetServerTransportAddEx_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxkeepcomplsearch = -1;
 static gint hf_srvsvc_srvsvc_NetDiskEnum_maxlen = -1;
 static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_mins = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_accessalert = -1;
+static gint hf_srvsvc_srvsvc_NetTransportInfo_info0 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_initsesstable = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo1_num_open = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1509_maxrawbuflen = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_sesssvc = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1553_info1553 = -1;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1007 = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQCtr1_count = -1;
 static gint hf_srvsvc_srvsvc_NetShareSetInfo_share_name = -1;
 static gint hf_srvsvc_srvsvc_NetShareCtr1501_count = -1;
 static gint hf_srvsvc_srvsvc_NetFileInfoCtr_ctr = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo3_vcs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1501_info1501 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_minfreeconnections = -1;
 static gint hf_srvsvc_srvsvc_NetPRNameCompare_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxfreeconnections = -1;
 static gint hf_srvsvc_srvsvc_Statistics_bytessent_low = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1529 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_alertsched = -1;
 static gint hf_srvsvc_srvsvc_NetDiskInfo0___disk_length = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_numfiletasks = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_diskspacetreshold = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo_val1_info1 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo102_announce = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_accessalert = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo502_transport = -1;
 static gint hf_srvsvc_srvsvc_NetShareEnum_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetTransportCtr1_array = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1522_info1522 = -1;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info1501 = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo3_name = -1;
 static gint hf_srvsvc_srvsvc_NetFileInfoCtr_level = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfoCtr_level = -1;
@@ -223,20 +221,19 @@ static gint hf_srvsvc_srvsvc_NetFileClose_fid = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_auditedevents = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1554_linkinfovalidtime = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo2_user_flags = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1545_info1545 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxlinkdelay = -1;
 static gint hf_srvsvc_srvsvc_NetSessCtr2_count = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1540_enablesharednetdrives = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr_val2_ctr2 = -1;
+static gint hf_srvsvc_srvsvc_NetFileInfo_info3 = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo2_comment = -1;
 static gint hf_srvsvc_srvsvc_Statistics_start = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_val1006_info1006 = -1;
 static gint hf_srvsvc_srvsvc_NetShareEnumAll_totalentries = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo502_user = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_numfiletasks = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQGetInfo_queue_name = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_sessconns = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_sesssvc = -1;
+static gint hf_srvsvc_srvsvc_NetCharDevInfo_info1 = -1;
 static gint hf_srvsvc_srvsvc_NetGetFileSecurity_sd_buf = -1;
 static gint hf_srvsvc_srvsvc_NetConnInfo0_conn_id = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxmpxct = -1;
@@ -245,9 +242,9 @@ static gint hf_srvsvc_srvsvc_NetTransportInfo3_unknown1 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_rawworkitems = -1;
 static gint hf_srvsvc_srvsvc_NetShareEnumAll_max_buffer = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_minrcvqueue = -1;
+static gint hf_srvsvc_srvsvc_NetTransportInfo_info1 = -1;
 static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ENCRYPT_DATA = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_threadcountadd = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1502_info1502 = -1;
 static gint hf_srvsvc_srvsvc_NetFileInfo3_user = -1;
 static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_weekday = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo3_addr_len = -1;
@@ -256,39 +253,44 @@ static gint hf_srvsvc_srvsvc_NetSrvInfo1549_networkerrortreshold = -1;
 static gint hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_servicebitsofinterest = -1;
 static gint hf_srvsvc_srvsvc_NetTransportEnum_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1542_maxfreeconnections = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1529_info1529 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_enableoplockforceclose = -1;
 static gint hf_srvsvc_srvsvc_NetSrvGetInfo_info = -1;
 static gint hf_srvsvc_srvsvc_NetNameValidate_name = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1511 = -1;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr501 = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo0_addr = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_opensearch = -1;
 static gint hf_srvsvc_srvsvc_NetFileCtr3_array = -1;
+static gint hf_srvsvc_srvsvc_NetSessCtr_ctr0 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1552_maxlinkdelay = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxkeepcomplsearch = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_enablefcbopens = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1017_info1017 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo102_version_minor = -1;
-static gint hf_srvsvc_srvsvc_NetConnCtr_val0_ctr0 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1501 = -1;
 static gint hf_srvsvc_srvsvc_NetDiskEnum_totalentries = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1107 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1520 = -1;
 static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_FORCE_LEVELII_OPLOCK = -1;
+static gint hf_srvsvc_srvsvc_NetCharDevInfo_info0 = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo1006_max_users = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_openfiles = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo502_rawworkitems = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_val1_info1 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_oplockbreakresponsewait = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQEnum_totalentries = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info502 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_initworkitems = -1;
 static gint hf_srvsvc_srvsvc_NetTransportAdd_level = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo502_timesource = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevInfoCtr_ctr = -1;
 static gint hf_srvsvc_srvsvc_NetFileEnum_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetSetServiceBits_updateimmediately = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1556_info1556 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1537 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1534 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1525_maxkeepcomplsearch = -1;
 static gint hf_srvsvc_srvsvc_NetFileCtr3_count = -1;
 static gint hf_srvsvc_srvsvc_NetShareCheck_device_name = -1;
 static gint hf_srvsvc_srvsvc_NetFileEnum_totalentries = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1512_info1512 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1528 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_scavtimeout = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_guestaccount = -1;
 static gint hf_srvsvc_srvsvc_NetShareEnum_resume_handle = -1;
@@ -297,24 +299,22 @@ static gint hf_srvsvc_srvsvc_NetSrvInfo402_alist_mtime = -1;
 static gint hf_srvsvc_srvsvc_NetTransportCtr0_count = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_alertsched = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1529_minrcvqueue = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr_val1_ctr1 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_erroralert = -1;
 static gint hf_srvsvc_srvsvc_NetConnInfo1_share = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info599 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxcopywritelen = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_val2_ctr2 = -1;
 static gint hf_srvsvc_srvsvc_NetShareSetInfo_info = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1544_info1544 = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo502_num_open = -1;
 static gint hf_srvsvc_srvsvc_NetGetFileSecurity_share = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_enablesharednetdrives = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxcopyreadlen = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1509 = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo1_client = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_val1_ctr1 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1540 = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo1005_dfs_flags = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_sessusers = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevInfo0_device = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo3_domain = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val403_info403 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_chdevjobs = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_threadpriority = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevCtr1_count = -1;
@@ -326,24 +326,22 @@ static gint hf_srvsvc_srvsvc_NetShareDel_share_name = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxmpxct = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevCtr0_array = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_alerts = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1503_info1503 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxpagedmemoryusage = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo101_comment = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1556_maxworkitemidletime = -1;
 static gint hf_srvsvc_srvsvc_NetShareDelStart_hnd = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info403 = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo501_csc_policy = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo1_addr_len = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1520_info1520 = -1;
 static gint hf_srvsvc_srvsvc_NetSetServiceBits_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_srvheuristics = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo102_version_major = -1;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1004 = -1;
 static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ENABLE_CA = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1510 = -1;
+static gint hf_srvsvc_srvsvc_NetFileInfo_info2 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvGetInfo_level = -1;
 static gint hf_srvsvc_srvsvc_NetShareDelSticky_share_name = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQInfo_val1_info1 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1513_info1513 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val102_info102 = -1;
-static gint hf_srvsvc_srvsvc_NetConnCtr_val1_ctr1 = -1;
 static gint hf_srvsvc_srvsvc_NetConnEnum_totalentries = -1;
 static gint hf_srvsvc_srvsvc_NetShareCtr501_count = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_enableoplockforceclose = -1;
@@ -355,14 +353,11 @@ static gint hf_srvsvc_srvsvc_NetSrvInfo402_diskalert = -1;
 static gint hf_srvsvc_srvsvc_NetFileGetInfo_fid = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1544_initconntable = -1;
 static gint hf_srvsvc_srvsvc_NetTransportAdd_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val502_info502 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1538_info1538 = -1;
 static gint hf_srvsvc_srvsvc_NetShareDelStart_reserved = -1;
 static gint hf_srvsvc_srvsvc_NetNameValidate_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQCtr1_array = -1;
 static gint hf_srvsvc_srvsvc_NetShareCtr1_array = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo501_type = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1535_info1535 = -1;
 static gint hf_srvsvc_srvsvc_NetConnEnum_max_buffer = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_minfreeworkitems = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo502_initworkitems = -1;
@@ -373,7 +368,6 @@ static gint hf_srvsvc_srvsvc_NetSrvInfo503_minfreeconnections = -1;
 static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_elapsed = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_maxaudits = -1;
 static gint hf_srvsvc_srvsvc_NetConnInfoCtr_level = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1018_info1018 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_timesource = -1;
 static gint hf_srvsvc_srvsvc_NetSessDel_client = -1;
 static gint hf_srvsvc_srvsvc_NetServerStatisticsGet_stats = -1;
@@ -382,6 +376,7 @@ static gint hf_srvsvc_srvsvc_NetTransportInfo0_name = -1;
 static gint hf_srvsvc_srvsvc_NetSessEnum_info_ctr = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQSetInfo_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1534_oplockbreakwait = -1;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info0 = -1;
 static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_secs = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo1007_flags = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfoCtr_level = -1;
@@ -393,7 +388,6 @@ static gint hf_srvsvc_srvsvc_NetShareInfo0_name = -1;
 static gint hf_srvsvc_srvsvc_NetTransportCtr2_count = -1;
 static gint hf_srvsvc_srvsvc_NetRemoteTOD_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo0_addr_len = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1010_info1010 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxcopyreadlen = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQInfo0_device = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo502_sesssvc = -1;
@@ -401,6 +395,7 @@ static gint hf_srvsvc_srvsvc_NetTransportInfo3_unknown3 = -1;
 static gint hf_srvsvc_srvsvc_NetShareCtr1501_array = -1;
 static gint hf_srvsvc_srvsvc_NetShareSetInfo_parm_error = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo102_platform_id = -1;
+static gint hf_srvsvc_srvsvc_NetSessCtr_ctr10 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo101_version_minor = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQSetInfo_parm_error = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1550_diskspacetreshold = -1;
@@ -409,26 +404,24 @@ static gint hf_srvsvc_srvsvc_NetShareCtr501_array = -1;
 static gint hf_srvsvc_srvsvc_NetShareDel_reserved = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_acceptdownlevelapis = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_security = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val599_info599 = -1;
 static gint hf_srvsvc_srvsvc_NetConnInfo1_conn_id = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo502_user_flags = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1502 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1541_minfreeconnections = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_linkinfovalidtime = -1;
 static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_CSC_CACHE_AUTO_REINT = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_sessreqs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1546_info1546 = -1;
 static gint hf_srvsvc_srvsvc_NetShareAdd_parm_error = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info100 = -1;
 static gint hf_srvsvc_srvsvc_NetShareCtr502_count = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1514_enablesoftcompat = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_minlinkthroughput = -1;
 static gint hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_updateimmediately = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_val1005_info1005 = -1;
 static gint hf_srvsvc_srvsvc_NetConnInfo1_conn_time = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1543_initsesstable = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_xactmemsize = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevGetInfo_level = -1;
 static gint hf_srvsvc_srvsvc_Statistics_stimeouts = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1534_info1534 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_sessopen = -1;
 static gint hf_srvsvc_srvsvc_Statistics_bytessent_high = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo1_domain = -1;
@@ -440,19 +433,17 @@ static gint hf_srvsvc_srvsvc_NetShareCtr2_array = -1;
 static gint hf_srvsvc_srvsvc_NetGetFileSecurity_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo502_maxpagedmemoryusage = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo10_client = -1;
+static gint hf_srvsvc_srvsvc_NetTransportCtr_ctr0 = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQPurge_queue_name = -1;
-static gint hf_srvsvc_srvsvc_NetFileInfo_val3_info3 = -1;
 static gint hf_srvsvc_srvsvc_Statistics_jobsqueued = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo_val3_info3 = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_val501_ctr501 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1550 = -1;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info1007 = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQGetInfo_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1530_info1530 = -1;
-static gint hf_srvsvc_srvsvc_NetFileInfo_val2_info2 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1513 = -1;
 static gint hf_srvsvc_srvsvc_NetSetFileSecurity_file = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_activelocks = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo2_addr = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo102_anndelta = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr_val10_ctr10 = -1;
 static gint hf_srvsvc_srvsvc_NetFileGetInfo_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo2_unknown = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_threadpriority = -1;
@@ -465,17 +456,17 @@ static gint hf_srvsvc_srvsvc_NetSrvSetInfo_parm_error = -1;
 static gint hf_srvsvc_srvsvc_NetShareEnumAll_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_glist_mtime = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo502_comment = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1528_info1528 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1552 = -1;
 static gint hf_srvsvc_srvsvc_NetShareCtr1004_count = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_minkeepcomplsearch = -1;
 static gint hf_srvsvc_srvsvc_NetConnInfo1_conn_type = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1533_info1533 = -1;
 static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_year = -1;
+static gint hf_srvsvc_srvsvc_NetTransportCtr_ctr1 = -1;
 static gint hf_srvsvc_srvsvc_NetFileInfo2_fid = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevInfo1_time = -1;
 static gint hf_srvsvc_srvsvc_NetPathCanonicalize_prefix = -1;
 static gint hf_srvsvc_srvsvc_Statistics_syserrors = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_val1004_info1004 = -1;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr0 = -1;
 static gint hf_srvsvc_srvsvc_NetPathCanonicalize_path = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQSetInfo_level = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQInfo1_device = -1;
@@ -486,20 +477,16 @@ static gint hf_srvsvc_srvsvc_NetPathCanonicalize_pathflags = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_logonalert = -1;
 static gint hf_srvsvc_srvsvc_NetShareGetInfo_info = -1;
 static gint hf_srvsvc_srvsvc_NetDiskEnum_level = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1547_info1547 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_minfreeworkitems = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_connections = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_val1501_info1501 = -1;
+static gint hf_srvsvc_srvsvc_NetCharDevQCtr_ctr1 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxfreeconnections = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_lanmask = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_val502_ctr502 = -1;
 static gint hf_srvsvc_srvsvc_NetShareEnum_totalentries = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo10_idle_time = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_val2_info2 = -1;
 static gint hf_srvsvc_srvsvc_NetSetServiceBits_transport = -1;
 static gint hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_emulated_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_tinterval = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1549_info1549 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1536_enableoplocks = -1;
 static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_hours = -1;
 static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ENABLE_HASH = -1;
@@ -507,15 +494,18 @@ static gint hf_srvsvc_srvsvc_NetCharDevQInfo1_num_ahead = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_timesource = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_domain = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_opensearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val402_info402 = -1;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1006 = -1;
 static gint hf_srvsvc_srvsvc_NetTransportEnum_max_buffer = -1;
 static gint hf_srvsvc_srvsvc_NetShareAdd_info = -1;
 static gint hf_srvsvc_srvsvc_NetTransportCtr0_array = -1;
+static gint hf_srvsvc_srvsvc_NetConnCtr_ctr1 = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQSetInfo_queue_name = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo100_server_name = -1;
 static gint hf_srvsvc_srvsvc_NetShareEnum_max_buffer = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1535 = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo1_time = -1;
 static gint hf_srvsvc_srvsvc_NetSetFileSecurity_sd_buf = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1521 = -1;
 static gint hf_srvsvc_srvsvc_NetShareGetInfo_level = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo10_time = -1;
 static gint hf_srvsvc_srvsvc_NetShareCtr1004_array = -1;
@@ -526,30 +516,31 @@ static gint hf_srvsvc_srvsvc_NetDiskInfo_disks = -1;
 static gint hf_srvsvc_srvsvc_NetSessCtr10_array = -1;
 static gint hf_srvsvc_opnum = -1;
 static gint hf_srvsvc_srvsvc_NetConnCtr1_array = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1510_info1510 = -1;
 static gint hf_srvsvc_srvsvc_NetShareCtr1006_count = -1;
 static gint hf_srvsvc_srvsvc_NetShareCheck_type = -1;
 static gint hf_srvsvc_srvsvc_NetSrvGetInfo_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetShareCtr0_array = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_diskalert = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo102_server_type = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1542 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1512 = -1;
 static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_RESTRICT_EXCLUSIVE_OPENS = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_val1007_ctr1007 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1503 = -1;
 static gint hf_srvsvc_srvsvc_NetSessEnum_client = -1;
-static gint hf_srvsvc_srvsvc_NetFileCtr_val2_ctr2 = -1;
 static gint hf_srvsvc_srvsvc_NetShareCtr1_count = -1;
 static gint hf_srvsvc_srvsvc_NetTransportDel_info0 = -1;
 static gint hf_srvsvc_srvsvc_NetConnCtr0_array = -1;
 static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ALLOW_NAMESPACE_CACHING = -1;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr502 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_ulist_mtime = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_val501_info501 = -1;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info1006 = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo1_type = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevEnum_totalentries = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_shares = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1016_hidden = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo1_user = -1;
 static gint hf_srvsvc_srvsvc_NetFileGetInfo_level = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1005_info1005 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1543 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxrawbuflen = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_opensearch = -1;
 static gint hf_srvsvc_srvsvc_NetDiskEnum_server_unc = -1;
@@ -561,10 +552,11 @@ static gint hf_srvsvc_srvsvc_NetSessDel_user = -1;
 static gint hf_srvsvc_srvsvc_NetTransportCtr3_count = -1;
 static gint hf_srvsvc_srvsvc_NetSrvSetInfo_info = -1;
 static gint hf_srvsvc_srvsvc_Statistics_serrorout = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1552_info1552 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1005_comment = -1;
 static gint hf_srvsvc_srvsvc_Statistics_sopens = -1;
-static gint hf_srvsvc_srvsvc_NetFileCtr_val3_ctr3 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1544 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1010 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1515 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_numbigbufs = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo3_addr = -1;
 static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_CSC_CACHE_NONE = -1;
@@ -575,62 +567,64 @@ static gint hf_srvsvc_srvsvc_NetSetFileSecurity_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo502_acceptdownlevelapis = -1;
 static gint hf_srvsvc_srvsvc_NetGetFileSecurity_file = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_ulist_mtime = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1522 = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevEnum_info_ctr = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo101_version_major = -1;
 static gint hf_srvsvc_srvsvc_NetNameValidate_name_type = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_scavqosinfoupdatetime = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_enablesoftcompat = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_xactmemsize = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1540_info1540 = -1;
 static gint hf_srvsvc_srvsvc_NetShareGetInfo_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetPRNameCompare_name2 = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo502_time = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxrawbuflen = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_oplockbreakwait = -1;
 static gint hf_srvsvc_srvsvc_NetShareDelSticky_server_unc = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1524 = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQInfoCtr_level = -1;
 static gint hf_srvsvc_srvsvc_NetConnInfoCtr_ctr = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_maxaudits = -1;
 static gint hf_srvsvc_srvsvc_NetDiskEnum_info = -1;
+static gint hf_srvsvc_srvsvc_NetFileCtr_ctr2 = -1;
 static gint hf_srvsvc_srvsvc_NetSetFileSecurity_securityinformation = -1;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info2 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1525 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1539_enableraw = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1539_info1539 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_alist_mtime = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1515_enableforcedlogoff = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevGetInfo_device_name = -1;
 static gint hf_srvsvc_srvsvc_NetFileCtr2_array = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1518_info1518 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1516 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo102_licenses = -1;
 static gint hf_srvsvc_srvsvc_NetConnEnum_resume_handle = -1;
+static gint hf_srvsvc_srvsvc_NetConnCtr_ctr0 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo101_platform_id = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1554_info1554 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_chdevs = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxnonpagedmemoryusage = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_domain = -1;
 static gint hf_srvsvc_srvsvc_NetPathCanonicalize_pathtype = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_sizereqbufs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1516_info1516 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1018 = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfoCtr_ctr = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevInfo1_device = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_openfiles = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo0_net_addr = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1550_info1550 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_shares = -1;
 static gint hf_srvsvc_srvsvc_Statistics_pwerrors = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1512_maxnonpagedmemoryusage = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1533 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo502_maxworkitems = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1509_info1509 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val100_info100 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1549 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_numlockthreads = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info101 = -1;
 static gint hf_srvsvc_srvsvc_NetPathCompare_pathtype = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1548_info1548 = -1;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info1005 = -1;
 static gint hf_srvsvc_srvsvc_NetShareCtr1007_count = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_val1004_ctr1004 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1005 = -1;
 static gint hf_srvsvc_srvsvc_NetPathType_pathflags = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_oplockbreakwait = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevCtr1_array = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQCtr0_array = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1511_info1511 = -1;
 static gint hf_srvsvc_srvsvc_NetServerTransportAddEx_info = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQEnum_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetFileCtr2_count = -1;
@@ -638,19 +632,18 @@ static gint hf_srvsvc_srvsvc_NetPathCompare_pathflags = -1;
 static gint hf_srvsvc_srvsvc_NetShareDelStart_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetConnInfo1_num_open = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo501_name = -1;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info501 = -1;
 static gint hf_srvsvc_srvsvc_NetPathCompare_path2 = -1;
 static gint hf_srvsvc_srvsvc_NetShareAdd_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevCtr_val0_ctr0 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo502_maxnonpagedmemoryusage = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo2_client_type = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1554 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxworkitemidletime = -1;
 static gint hf_srvsvc_srvsvc_NetPathType_path = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo_val2_info2 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1523_info1523 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo102_users = -1;
+static gint hf_srvsvc_srvsvc_NetTransportCtr_ctr2 = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo502_sd_buf = -1;
 static gint hf_srvsvc_srvsvc_NetFileEnum_info_ctr = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_val502_info502 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_enableforcedlogoff = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo2_time = -1;
 static gint hf_srvsvc_srvsvc_NetPRNameCompare_name_type = -1;
@@ -662,6 +655,7 @@ static gint hf_srvsvc_srvsvc_NetShareCtr1005_array = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1524_minkeepcomplsearch = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_numlockthreads = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo502_enableforcedlogoff = -1;
+static gint hf_srvsvc_srvsvc_NetCharDevCtr_ctr1 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_errortreshold = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo1_user_flags = -1;
 static gint hf_srvsvc_srvsvc_Statistics_reqbufneed = -1;
@@ -678,12 +672,12 @@ static gint hf_srvsvc_srvsvc_NetServerTransportAddEx_level = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevControl_opcode = -1;
 static gint hf_srvsvc_srvsvc_NetConnCtr1_count = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1516_timesource = -1;
-static gint hf_srvsvc_srvsvc_NetTransportCtr_val1_ctr1 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1506_info1506 = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQGetInfo_info = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1515_info1515 = -1;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info503 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_chdevqs = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_rawworkitems = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1017 = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo3_unknown2 = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo2_idle_time = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo102_comment = -1;
@@ -692,20 +686,21 @@ static gint hf_srvsvc_srvsvc_NetCharDevInfo1_status = -1;
 static gint hf_srvsvc_srvsvc_NetSessEnum_max_buffer = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQPurge_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetFileEnum_path = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val503_info503 = -1;
 static gint hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_servicebits = -1;
 static gint hf_srvsvc_srvsvc_NetSessCtr0_array = -1;
 static gint hf_srvsvc_srvsvc_NetPathCompare_path1 = -1;
 static gint hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetFileGetInfo_info = -1;
+static gint hf_srvsvc_srvsvc_NetCharDevQCtr_ctr0 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_connections = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_sizereqbufs = -1;
+static gint hf_srvsvc_srvsvc_NetFileCtr_ctr3 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_initfiletable = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1528_scavtimeout = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevEnum_resume_handle = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevInfo_val1_info1 = -1;
 static gint hf_srvsvc_srvsvc_NetPathCanonicalize_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo2_password = -1;
+static gint hf_srvsvc_srvsvc_NetCharDevCtr_ctr0 = -1;
 static gint hf_srvsvc_srvsvc_NetFileClose_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_lmannounce = -1;
 static gint hf_srvsvc_srvsvc_NetTransportEnum_resume_handle = -1;
@@ -713,17 +708,18 @@ static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_CSC_CACHE_VDO = -1;
 static gint hf_srvsvc_srvsvc_NetShareDelStart_share = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo2_num_open = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo101_server_name = -1;
+static gint hf_srvsvc_srvsvc_NetTransportCtr_ctr3 = -1;
 static gint hf_srvsvc_srvsvc_NetShareCtr2_count = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_val0_info0 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1514_info1514 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1518 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_netioalert = -1;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info1004 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_numadmin = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_lmannounce = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val101_info101 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_sizereqbufs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1542_info1542 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1523 = -1;
 static gint hf_srvsvc_srvsvc_NetSetFileSecurity_share = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo502_maxrawbuflen = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1548 = -1;
 static gint hf_srvsvc_srvsvc_NetRemoteTOD_info = -1;
 static gint hf_srvsvc_srvsvc_NetSessCtr1_count = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1518_lmannounce = -1;
@@ -737,27 +733,29 @@ static gint hf_srvsvc_srvsvc_NetCharDevCtr0_count = -1;
 static gint hf_srvsvc_srvsvc_NetSessCtr1_array = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_initconntable = -1;
 static gint hf_srvsvc_srvsvc_NetShareSetInfo_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1543_info1543 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1545 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1553 = -1;
 static gint hf_srvsvc_srvsvc_NetSessEnum_resume_handle = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1514 = -1;
 static gint hf_srvsvc_srvsvc_NetShareSetInfo_level = -1;
 static gint hf_srvsvc_srvsvc_Statistics_fopens = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1016 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxworkitems = -1;
 static gint hf_srvsvc_srvsvc_NetDiskInfo_count = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_glist_mtime = -1;
 static gint hf_srvsvc_srvsvc_Statistics_bigbufneed = -1;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr2 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1510_sessusers = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo502_enablesoftcompat = -1;
 static gint hf_srvsvc_srvsvc_NetPathType_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1521_info1521 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1513_maxpagedmemoryusage = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1525_info1525 = -1;
 static gint hf_srvsvc_srvsvc_NetServerStatisticsGet_service = -1;
 static gint hf_srvsvc_srvsvc_NetTransportCtr3_array = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQInfo1_devices = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo502_client_type = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_activelocks = -1;
 static gint hf_srvsvc_srvsvc_NetServerStatisticsGet_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevInfo_val0_info0 = -1;
+static gint hf_srvsvc_srvsvc_NetSessCtr_ctr502 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_netioalert = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1553_minlinkthroughput = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo2_current_users = -1;
@@ -767,7 +765,6 @@ static gint hf_srvsvc_srvsvc_NetCharDevQSetInfo_info = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_sizereqbufs = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1530_minfreeworkitems = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo2_max_users = -1;
-static gint hf_srvsvc_srvsvc_NetTransportCtr_val3_ctr3 = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo2_domain = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo2_type = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_minrcvqueue = -1;
@@ -779,16 +776,12 @@ static gint hf_srvsvc_srvsvc_NetCharDevGetInfo_info = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo502_sizereqbufs = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevInfo1_user = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_security = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr_val0_ctr0 = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevGetInfo_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_val1006_ctr1006 = -1;
 static gint hf_srvsvc_srvsvc_NetSessDel_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1547_alertsched = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1546 = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQGetInfo_level = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQCtr_val1_ctr1 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1536_info1536 = -1;
 static gint hf_srvsvc_srvsvc_Statistics_avresponse = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr_val502_ctr502 = -1;
 static gint hf_srvsvc_srvsvc_NetShareDel_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo2_addr_len = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_alerts = -1;
@@ -798,11 +791,10 @@ static gint hf_srvsvc_srvsvc_NetSrvInfo599_enableraw = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1523_maxkeepsearch = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_sessopen = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1107_users = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1555_info1555 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_scavtimeout = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1520_maxcopyreadlen = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1506 = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo0_client = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo_val0_info0 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_initsearchtable = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxworkitems = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_reserved = -1;
@@ -811,6 +803,7 @@ static gint hf_srvsvc_srvsvc_NetFileEnum_user = -1;
 static gint hf_srvsvc_srvsvc_Statistics_permerrors = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo502_path = -1;
 static gint hf_srvsvc_srvsvc_NetFileInfo3_fid = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1538 = -1;
 static gint hf_srvsvc_srvsvc_NetTransportAdd_info = -1;
 static gint hf_srvsvc_srvsvc_NetDiskEnum_resume_handle = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo0_vcs = -1;
@@ -818,32 +811,34 @@ static gint hf_srvsvc_srvsvc_NetFileInfo3_path = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo1_name = -1;
 static gint hf_srvsvc_srvsvc_NetShareEnum_info_ctr = -1;
 static gint hf_srvsvc_srvsvc_NetSessCtr10_count = -1;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1005 = -1;
 static gint hf_srvsvc_srvsvc_NetTransportDel_level = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_sessconns = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_initworkitems = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevEnum_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo502_password = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1521_maxcopywritelen = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1524_info1524 = -1;
-static gint hf_srvsvc_srvsvc_NetTransportCtr_val2_ctr2 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_minkeepsearch = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_srvheuristics = -1;
+static gint hf_srvsvc_srvsvc_NetTransportInfo_info2 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_lanmask = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1541 = -1;
+static gint hf_srvsvc_srvsvc_NetSessCtr_ctr2 = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo1_comment = -1;
 static gint hf_srvsvc_srvsvc_NetSessCtr502_count = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1506_maxworkitems = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo502_current_users = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfoCtr_ctr = -1;
-static gint hf_srvsvc_srvsvc_NetTransportCtr_val0_ctr0 = -1;
+static gint hf_srvsvc_srvsvc_NetCharDevQInfo_info1 = -1;
 static gint hf_srvsvc_srvsvc_NetSessEnum_totalentries = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_chdevs = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevCtr_val1_ctr1 = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevEnum_max_buffer = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info402 = -1;
 static gint hf_srvsvc_srvsvc_NetConnEnum_info_ctr = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo2_name = -1;
 static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ACCESS_BASED_DIRECTORY_ENUM = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQInfo_val0_info0 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_enablesoftcompat = -1;
+static gint hf_srvsvc_srvsvc_NetTransportInfo_info3 = -1;
 static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_month = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1501_sessopens = -1;
 static gint hf_srvsvc_werror = -1;
@@ -856,27 +851,26 @@ static gint hf_srvsvc_srvsvc_NetSrvInfo503_enableoplocks = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo100_platform_id = -1;
 static gint hf_srvsvc_srvsvc_NetSessCtr502_array = -1;
 static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_msecs = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_val1005_ctr1005 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_irpstacksize = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo503_enableraw = -1;
 static gint hf_srvsvc_srvsvc_NetServerStatisticsGet_level = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfoCtr_level = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfoCtr_ctr = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_sesssvc = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_val0_ctr0 = -1;
 static gint hf_srvsvc_srvsvc_NetServerStatisticsGet_options = -1;
 static gint hf_srvsvc_srvsvc_Statistics_bytesrcvd_high = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info102 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_numbigbufs = -1;
 static gint hf_srvsvc_srvsvc_NetPathCanonicalize_can_path = -1;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info1 = -1;
 static gint hf_srvsvc_srvsvc_NetTransportEnum_totalentries = -1;
 static gint hf_srvsvc_srvsvc_NetShareCtr1007_array = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQCtr_val0_ctr0 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_val1541_info1541 = -1;
 static gint hf_srvsvc_srvsvc_NetShareEnumAll_resume_handle = -1;
 static gint hf_srvsvc_srvsvc_NetPRNameCompare_flags = -1;
 static gint hf_srvsvc_srvsvc_NetPathType_pathtype = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1533_maxmpxct = -1;
 static gint hf_srvsvc_srvsvc_Statistics_devopens = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1556 = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQEnum_max_buffer = -1;
 static gint hf_srvsvc_srvsvc_NetConnEnum_path = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_sessopen = -1;
@@ -890,7 +884,6 @@ static gint hf_srvsvc_srvsvc_NetSrvInfo403_autopath = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo102_server_name = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1546_initsearchtable = -1;
 static gint hf_srvsvc_srvsvc_NetShareCtr1005_count = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_val1501_ctr1501 = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo2_path = -1;
 static gint hf_srvsvc_srvsvc_NetSessEnum_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_chdevqs = -1;
@@ -909,23 +902,29 @@ static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxkeepsearch = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQCtr0_count = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1503_opensearch = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo102_userpath = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1555 = -1;
 static gint hf_srvsvc_srvsvc_NetSessInfo10_user = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo599_alertsched = -1;
 static gint hf_srvsvc_srvsvc_NetPathCompare_server_unc = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1547 = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQEnum_info_ctr = -1;
 static gint hf_srvsvc_srvsvc_NetTransportInfo1_name = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo502_max_users = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo502_opensearch = -1;
+static gint hf_srvsvc_srvsvc_NetCharDevQInfo_info0 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo402_numreqbufs = -1;
 static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_DFS_ROOT = -1;
 static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_IN_DFS = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo102_hidden = -1;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1501 = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1539 = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo501_comment = -1;
 static gint hf_srvsvc_srvsvc_NetTransportEnum_transports = -1;
 static gint hf_srvsvc_srvsvc_NetTransportCtr2_array = -1;
 static gint hf_srvsvc_srvsvc_NetShareInfo502_name = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1535_oplockbreakresponsewait = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQInfo1_users = -1;
+static gint hf_srvsvc_srvsvc_NetSessCtr_ctr1 = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_erroralert = -1;
 static gint hf_srvsvc_srvsvc_NetCharDevQPurgeSelf_server_unc = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo1010_disc = -1;
@@ -933,6 +932,7 @@ static gint hf_srvsvc_srvsvc_NetCharDevQPurgeSelf_computer_name = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo101_server_type = -1;
 static gint hf_srvsvc_srvsvc_NetShareCtr502_array = -1;
 static gint hf_srvsvc_srvsvc_NetSrvInfo403_numreqbufs = -1;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1530 = -1;
 
 static gint proto_dcerpc_srvsvc = -1;
 /* Version information */
@@ -960,14 +960,14 @@ static int srvsvc_dissect_element_NetCharDevCtr1_count(tvbuff_t *tvb _U_, int of
 static int srvsvc_dissect_element_NetCharDevCtr1_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetCharDevCtr1_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetCharDevCtr1_array__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevInfo_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevCtr_val0_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevCtr_val0_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevCtr_val1_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetCharDevInfo_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetCharDevInfo_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetCharDevInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetCharDevInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetCharDevCtr_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetCharDevCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetCharDevCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetCharDevCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetCharDevInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int srvsvc_dissect_element_NetCharDevInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int srvsvc_dissect_element_NetCharDevQInfo0_device(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -987,14 +987,14 @@ static int srvsvc_dissect_element_NetCharDevQCtr1_count(tvbuff_t *tvb _U_, int o
 static int srvsvc_dissect_element_NetCharDevQCtr1_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetCharDevQCtr1_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetCharDevQCtr1_array__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevQInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevQInfo_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevQInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevQInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevQCtr_val0_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevQCtr_val0_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevQCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevQCtr_val1_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetCharDevQInfo_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetCharDevQInfo_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetCharDevQInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetCharDevQInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetCharDevQCtr_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetCharDevQCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetCharDevQCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetCharDevQCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetCharDevQInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int srvsvc_dissect_element_NetCharDevQInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int srvsvc_dissect_element_NetConnInfo0_conn_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1015,10 +1015,10 @@ static int srvsvc_dissect_element_NetConnCtr1_count(tvbuff_t *tvb _U_, int offse
 static int srvsvc_dissect_element_NetConnCtr1_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetConnCtr1_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetConnCtr1_array__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetConnCtr_val0_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetConnCtr_val0_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetConnCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetConnCtr_val1_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetConnCtr_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetConnCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetConnCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetConnCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetConnInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int srvsvc_dissect_element_NetConnInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int srvsvc_dissect_element_NetFileInfo2_fid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1037,14 +1037,14 @@ static int srvsvc_dissect_element_NetFileCtr3_count(tvbuff_t *tvb _U_, int offse
 static int srvsvc_dissect_element_NetFileCtr3_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetFileCtr3_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetFileCtr3_array__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetFileInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetFileInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetFileInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetFileInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetFileCtr_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetFileCtr_val2_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetFileCtr_val3_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetFileCtr_val3_ctr3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetFileInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetFileInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetFileInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetFileInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetFileCtr_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetFileCtr_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetFileCtr_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetFileCtr_ctr3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetFileInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int srvsvc_dissect_element_NetFileInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int srvsvc_dissect_element_NetSessInfo0_client(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1105,16 +1105,16 @@ static int srvsvc_dissect_element_NetSessCtr502_count(tvbuff_t *tvb _U_, int off
 static int srvsvc_dissect_element_NetSessCtr502_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetSessCtr502_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetSessCtr502_array__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSessCtr_val0_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSessCtr_val0_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSessCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSessCtr_val1_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSessCtr_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSessCtr_val2_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSessCtr_val10_ctr10(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSessCtr_val10_ctr10_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSessCtr_val502_ctr502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSessCtr_val502_ctr502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSessCtr_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSessCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSessCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSessCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSessCtr_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSessCtr_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSessCtr_ctr10(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSessCtr_ctr10_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSessCtr_ctr502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSessCtr_ctr502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetSessInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int srvsvc_dissect_element_NetSessInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 const value_string srvsvc_srvsvc_ShareType_vals[] = {
@@ -1269,46 +1269,46 @@ static int srvsvc_dissect_element_NetShareCtr1501_count(tvbuff_t *tvb _U_, int o
 static int srvsvc_dissect_element_NetShareCtr1501_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetShareCtr1501_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetShareCtr1501_array__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val501_info501(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val501_info501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val502_info502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val502_info502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val1004_info1004(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val1004_info1004_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val1005_info1005(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val1005_info1005_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val1006_info1006(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val1006_info1006_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val1007_info1007(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val1007_info1007_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val1501_info1501(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfo_val1501_info1501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val0_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val0_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val1_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val2_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val501_ctr501(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val501_ctr501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val502_ctr502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val502_ctr502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val1004_ctr1004(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val1004_ctr1004_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val1005_ctr1005(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val1005_ctr1005_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val1006_ctr1006(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val1006_ctr1006_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val1007_ctr1007(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val1007_ctr1007_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val1501_ctr1501(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareCtr_val1501_ctr1501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info501(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info1004(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info1004_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info1005(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info1005_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info1006(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info1006_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info1007(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info1007_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info1501(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareInfo_info1501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr501(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr1004(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr1004_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr1005(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr1005_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr1006(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr1006_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr1007(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr1007_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr1501(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetShareCtr_ctr1501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetShareInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int srvsvc_dissect_element_NetShareInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 const value_string srvsvc_srvsvc_PlatformId_vals[] = {
@@ -1587,124 +1587,124 @@ static int srvsvc_dissect_element_NetSrvInfo1553_minlinkthroughput(tvbuff_t *tvb
 static int srvsvc_dissect_element_NetSrvInfo1554_linkinfovalidtime(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetSrvInfo1555_scavqosinfoupdatetime(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetSrvInfo1556_maxworkitemidletime(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val100_info100(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val100_info100_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val101_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val101_info101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val102_info102(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val102_info102_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val402_info402(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val402_info402_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val403_info403(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val403_info403_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val502_info502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val502_info502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val503_info503(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val503_info503_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val599_info599(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val599_info599_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1005_info1005(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1005_info1005_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1010_info1010(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1010_info1010_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1016_info1016(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1016_info1016_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1017_info1017(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1017_info1017_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1018_info1018(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1018_info1018_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1107_info1107(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1107_info1107_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1501_info1501(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1501_info1501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1502_info1502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1502_info1502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1503_info1503(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1503_info1503_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1506_info1506(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1506_info1506_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1509_info1509(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1509_info1509_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1510_info1510(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1510_info1510_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1511_info1511(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1511_info1511_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1512_info1512(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1512_info1512_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1513_info1513(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1513_info1513_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1514_info1514(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1514_info1514_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1515_info1515(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1515_info1515_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1516_info1516(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1516_info1516_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1518_info1518(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1518_info1518_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1520_info1520(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1520_info1520_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1521_info1521(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1521_info1521_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1522_info1522(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1522_info1522_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1523_info1523(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1523_info1523_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1524_info1524(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1524_info1524_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1525_info1525(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1525_info1525_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1528_info1528(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1528_info1528_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1529_info1529(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1529_info1529_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1530_info1530(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1530_info1530_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1533_info1533(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1533_info1533_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1534_info1534(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1534_info1534_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1535_info1535(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1535_info1535_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1536_info1536(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1536_info1536_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1537_info1537(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1537_info1537_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1538_info1538(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1538_info1538_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1539_info1539(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1539_info1539_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1540_info1540(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1540_info1540_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1541_info1541(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1541_info1541_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1542_info1542(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1542_info1542_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1543_info1543(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1543_info1543_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1544_info1544(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1544_info1544_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1545_info1545(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1545_info1545_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1546_info1546(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1546_info1546_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1547_info1547(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1547_info1547_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1548_info1548(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1548_info1548_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1549_info1549(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1549_info1549_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1550_info1550(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1550_info1550_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1552_info1552(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1552_info1552_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1553_info1553(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1553_info1553_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1554_info1554(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1554_info1554_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1555_info1555(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1555_info1555_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1556_info1556(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSrvInfo_val1556_info1556_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info100(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info100_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info102(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info102_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info402(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info402_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info403(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info403_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info503(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info503_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info599(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info599_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1005(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1005_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1010(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1010_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1016(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1016_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1017(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1017_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1018(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1018_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1107(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1107_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1501(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1503(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1503_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1506(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1506_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1509(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1509_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1510(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1510_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1511(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1511_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1512(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1512_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1513(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1513_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1514(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1514_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1515(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1515_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1516(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1516_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1518(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1518_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1520(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1520_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1521(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1521_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1522(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1522_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1523(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1523_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1524(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1524_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1525(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1525_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1528(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1528_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1529(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1529_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1530(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1530_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1533(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1533_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1534(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1534_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1535(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1535_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1536(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1536_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1537(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1537_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1538(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1538_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1539(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1539_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1540(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1540_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1541(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1541_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1542(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1542_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1543(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1543_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1544(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1544_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1545(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1545_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1546(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1546_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1547(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1547_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1548(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1548_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1549(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1549_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1550(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1550_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1552(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1552_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1553(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1553_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1554(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1554_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1555(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1555_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1556(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetSrvInfo_info1556_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetDiskInfo0___disk_offset(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetDiskInfo0___disk_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetDiskInfo0_disk(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1793,14 +1793,14 @@ static int srvsvc_dissect_element_NetTransportCtr3_count(tvbuff_t *tvb _U_, int
 static int srvsvc_dissect_element_NetTransportCtr3_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetTransportCtr3_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetTransportCtr3_array__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetTransportCtr_val0_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetTransportCtr_val0_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetTransportCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetTransportCtr_val1_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetTransportCtr_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetTransportCtr_val2_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetTransportCtr_val3_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetTransportCtr_val3_ctr3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetTransportCtr_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetTransportCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetTransportCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetTransportCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetTransportCtr_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetTransportCtr_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetTransportCtr_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetTransportCtr_ctr3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetTransportInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int srvsvc_dissect_element_NetTransportInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int srvsvc_dissect_element_NetRemoteTODInfo_elapsed(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1815,10 +1815,10 @@ static int srvsvc_dissect_element_NetRemoteTODInfo_day(tvbuff_t *tvb _U_, int of
 static int srvsvc_dissect_element_NetRemoteTODInfo_month(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetRemoteTODInfo_year(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetRemoteTODInfo_weekday(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetTransportInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetTransportInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetTransportInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetTransportInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetTransportInfo_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetTransportInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetTransportInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int srvsvc_dissect_element_NetTransportInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetCharDevEnum_server_unc(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetCharDevEnum_server_unc_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetCharDevEnum_info_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -2468,33 +2468,33 @@ srvsvc_dissect_struct_NetCharDevCtr1(tvbuff_t *tvb _U_, int offset _U_, packet_i
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetCharDevInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetCharDevInfo_info0(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, srvsvc_dissect_element_NetCharDevInfo_val0_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (srvsvc_NetCharDevInfo0)",hf_srvsvc_srvsvc_NetCharDevInfo_val0_info0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetCharDevInfo_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (srvsvc_NetCharDevInfo0)",hf_srvsvc_srvsvc_NetCharDevInfo_info0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetCharDevInfo_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetCharDevInfo_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetCharDevInfo0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetCharDevInfo_val0_info0,0);
+       offset = srvsvc_dissect_struct_NetCharDevInfo0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetCharDevInfo_info0,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetCharDevInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetCharDevInfo_info1(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, srvsvc_dissect_element_NetCharDevInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (srvsvc_NetCharDevInfo1)",hf_srvsvc_srvsvc_NetCharDevInfo_val1_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetCharDevInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (srvsvc_NetCharDevInfo1)",hf_srvsvc_srvsvc_NetCharDevInfo_info1);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetCharDevInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetCharDevInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetCharDevInfo1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetCharDevInfo_val1_info1,0);
+       offset = srvsvc_dissect_struct_NetCharDevInfo1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetCharDevInfo_info1,0);
 
        return offset;
 }
@@ -2518,11 +2518,11 @@ srvsvc_dissect_NetCharDevInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 
        switch(level) {
                case 0:
-                       offset = srvsvc_dissect_element_NetCharDevInfo_val0_info0(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetCharDevInfo_info0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = srvsvc_dissect_element_NetCharDevInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetCharDevInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -2541,33 +2541,33 @@ srvsvc_dissect_NetCharDevInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetCharDevCtr_val0_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetCharDevCtr_ctr0(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, srvsvc_dissect_element_NetCharDevCtr_val0_ctr0_, NDR_POINTER_UNIQUE, "Pointer to Ctr0 (srvsvc_NetCharDevCtr0)",hf_srvsvc_srvsvc_NetCharDevCtr_val0_ctr0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetCharDevCtr_ctr0_, NDR_POINTER_UNIQUE, "Pointer to Ctr0 (srvsvc_NetCharDevCtr0)",hf_srvsvc_srvsvc_NetCharDevCtr_ctr0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetCharDevCtr_val0_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetCharDevCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetCharDevCtr0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetCharDevCtr_val0_ctr0,0);
+       offset = srvsvc_dissect_struct_NetCharDevCtr0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetCharDevCtr_ctr0,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetCharDevCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetCharDevCtr_ctr1(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, srvsvc_dissect_element_NetCharDevCtr_val1_ctr1_, NDR_POINTER_UNIQUE, "Pointer to Ctr1 (srvsvc_NetCharDevCtr1)",hf_srvsvc_srvsvc_NetCharDevCtr_val1_ctr1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetCharDevCtr_ctr1_, NDR_POINTER_UNIQUE, "Pointer to Ctr1 (srvsvc_NetCharDevCtr1)",hf_srvsvc_srvsvc_NetCharDevCtr_ctr1);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetCharDevCtr_val1_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetCharDevCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetCharDevCtr1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetCharDevCtr_val1_ctr1,0);
+       offset = srvsvc_dissect_struct_NetCharDevCtr1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetCharDevCtr_ctr1,0);
 
        return offset;
 }
@@ -2591,11 +2591,11 @@ srvsvc_dissect_NetCharDevCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
 
        switch(level) {
                case 0:
-                       offset = srvsvc_dissect_element_NetCharDevCtr_val0_ctr0(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetCharDevCtr_ctr0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = srvsvc_dissect_element_NetCharDevCtr_val1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetCharDevCtr_ctr1(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -2972,33 +2972,33 @@ srvsvc_dissect_struct_NetCharDevQCtr1(tvbuff_t *tvb _U_, int offset _U_, packet_
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetCharDevQInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetCharDevQInfo_info0(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, srvsvc_dissect_element_NetCharDevQInfo_val0_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (srvsvc_NetCharDevQInfo0)",hf_srvsvc_srvsvc_NetCharDevQInfo_val0_info0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetCharDevQInfo_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (srvsvc_NetCharDevQInfo0)",hf_srvsvc_srvsvc_NetCharDevQInfo_info0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetCharDevQInfo_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetCharDevQInfo_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetCharDevQInfo0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetCharDevQInfo_val0_info0,0);
+       offset = srvsvc_dissect_struct_NetCharDevQInfo0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetCharDevQInfo_info0,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetCharDevQInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetCharDevQInfo_info1(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, srvsvc_dissect_element_NetCharDevQInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (srvsvc_NetCharDevQInfo1)",hf_srvsvc_srvsvc_NetCharDevQInfo_val1_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetCharDevQInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (srvsvc_NetCharDevQInfo1)",hf_srvsvc_srvsvc_NetCharDevQInfo_info1);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetCharDevQInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetCharDevQInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetCharDevQInfo1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetCharDevQInfo_val1_info1,0);
+       offset = srvsvc_dissect_struct_NetCharDevQInfo1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetCharDevQInfo_info1,0);
 
        return offset;
 }
@@ -3022,11 +3022,11 @@ srvsvc_dissect_NetCharDevQInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 
        switch(level) {
                case 0:
-                       offset = srvsvc_dissect_element_NetCharDevQInfo_val0_info0(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetCharDevQInfo_info0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = srvsvc_dissect_element_NetCharDevQInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetCharDevQInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -3045,33 +3045,33 @@ srvsvc_dissect_NetCharDevQInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetCharDevQCtr_val0_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetCharDevQCtr_ctr0(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, srvsvc_dissect_element_NetCharDevQCtr_val0_ctr0_, NDR_POINTER_UNIQUE, "Pointer to Ctr0 (srvsvc_NetCharDevQCtr0)",hf_srvsvc_srvsvc_NetCharDevQCtr_val0_ctr0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetCharDevQCtr_ctr0_, NDR_POINTER_UNIQUE, "Pointer to Ctr0 (srvsvc_NetCharDevQCtr0)",hf_srvsvc_srvsvc_NetCharDevQCtr_ctr0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetCharDevQCtr_val0_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetCharDevQCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetCharDevQCtr0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetCharDevQCtr_val0_ctr0,0);
+       offset = srvsvc_dissect_struct_NetCharDevQCtr0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetCharDevQCtr_ctr0,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetCharDevQCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetCharDevQCtr_ctr1(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, srvsvc_dissect_element_NetCharDevQCtr_val1_ctr1_, NDR_POINTER_UNIQUE, "Pointer to Ctr1 (srvsvc_NetCharDevQCtr1)",hf_srvsvc_srvsvc_NetCharDevQCtr_val1_ctr1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetCharDevQCtr_ctr1_, NDR_POINTER_UNIQUE, "Pointer to Ctr1 (srvsvc_NetCharDevQCtr1)",hf_srvsvc_srvsvc_NetCharDevQCtr_ctr1);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetCharDevQCtr_val1_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetCharDevQCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetCharDevQCtr1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetCharDevQCtr_val1_ctr1,0);
+       offset = srvsvc_dissect_struct_NetCharDevQCtr1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetCharDevQCtr_ctr1,0);
 
        return offset;
 }
@@ -3095,11 +3095,11 @@ srvsvc_dissect_NetCharDevQCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 
        switch(level) {
                case 0:
-                       offset = srvsvc_dissect_element_NetCharDevQCtr_val0_ctr0(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetCharDevQCtr_ctr0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = srvsvc_dissect_element_NetCharDevQCtr_val1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetCharDevQCtr_ctr1(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -3487,33 +3487,33 @@ srvsvc_dissect_struct_NetConnCtr1(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetConnCtr_val0_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetConnCtr_ctr0(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, srvsvc_dissect_element_NetConnCtr_val0_ctr0_, NDR_POINTER_UNIQUE, "Pointer to Ctr0 (srvsvc_NetConnCtr0)",hf_srvsvc_srvsvc_NetConnCtr_val0_ctr0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetConnCtr_ctr0_, NDR_POINTER_UNIQUE, "Pointer to Ctr0 (srvsvc_NetConnCtr0)",hf_srvsvc_srvsvc_NetConnCtr_ctr0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetConnCtr_val0_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetConnCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetConnCtr0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetConnCtr_val0_ctr0,0);
+       offset = srvsvc_dissect_struct_NetConnCtr0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetConnCtr_ctr0,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetConnCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetConnCtr_ctr1(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, srvsvc_dissect_element_NetConnCtr_val1_ctr1_, NDR_POINTER_UNIQUE, "Pointer to Ctr1 (srvsvc_NetConnCtr1)",hf_srvsvc_srvsvc_NetConnCtr_val1_ctr1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetConnCtr_ctr1_, NDR_POINTER_UNIQUE, "Pointer to Ctr1 (srvsvc_NetConnCtr1)",hf_srvsvc_srvsvc_NetConnCtr_ctr1);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetConnCtr_val1_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetConnCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetConnCtr1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetConnCtr_val1_ctr1,0);
+       offset = srvsvc_dissect_struct_NetConnCtr1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetConnCtr_ctr1,0);
 
        return offset;
 }
@@ -3537,11 +3537,11 @@ srvsvc_dissect_NetConnCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case 0:
-                       offset = srvsvc_dissect_element_NetConnCtr_val0_ctr0(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetConnCtr_ctr0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = srvsvc_dissect_element_NetConnCtr_val1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetConnCtr_ctr1(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -3907,33 +3907,33 @@ srvsvc_dissect_struct_NetFileCtr3(tvbuff_t *tvb _U_, int offset _U_, packet_info
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetFileInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetFileInfo_info2(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, srvsvc_dissect_element_NetFileInfo_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (srvsvc_NetFileInfo2)",hf_srvsvc_srvsvc_NetFileInfo_val2_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetFileInfo_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (srvsvc_NetFileInfo2)",hf_srvsvc_srvsvc_NetFileInfo_info2);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetFileInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetFileInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetFileInfo2(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetFileInfo_val2_info2,0);
+       offset = srvsvc_dissect_struct_NetFileInfo2(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetFileInfo_info2,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetFileInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetFileInfo_info3(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, srvsvc_dissect_element_NetFileInfo_val3_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (srvsvc_NetFileInfo3)",hf_srvsvc_srvsvc_NetFileInfo_val3_info3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetFileInfo_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (srvsvc_NetFileInfo3)",hf_srvsvc_srvsvc_NetFileInfo_info3);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetFileInfo_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetFileInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetFileInfo3(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetFileInfo_val3_info3,0);
+       offset = srvsvc_dissect_struct_NetFileInfo3(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetFileInfo_info3,0);
 
        return offset;
 }
@@ -3957,11 +3957,11 @@ srvsvc_dissect_NetFileInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case 2:
-                       offset = srvsvc_dissect_element_NetFileInfo_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetFileInfo_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = srvsvc_dissect_element_NetFileInfo_val3_info3(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetFileInfo_info3(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -3980,33 +3980,33 @@ srvsvc_dissect_NetFileInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetFileCtr_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetFileCtr_ctr2(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, srvsvc_dissect_element_NetFileCtr_val2_ctr2_, NDR_POINTER_UNIQUE, "Pointer to Ctr2 (srvsvc_NetFileCtr2)",hf_srvsvc_srvsvc_NetFileCtr_val2_ctr2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetFileCtr_ctr2_, NDR_POINTER_UNIQUE, "Pointer to Ctr2 (srvsvc_NetFileCtr2)",hf_srvsvc_srvsvc_NetFileCtr_ctr2);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetFileCtr_val2_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetFileCtr_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetFileCtr2(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetFileCtr_val2_ctr2,0);
+       offset = srvsvc_dissect_struct_NetFileCtr2(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetFileCtr_ctr2,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetFileCtr_val3_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetFileCtr_ctr3(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, srvsvc_dissect_element_NetFileCtr_val3_ctr3_, NDR_POINTER_UNIQUE, "Pointer to Ctr3 (srvsvc_NetFileCtr3)",hf_srvsvc_srvsvc_NetFileCtr_val3_ctr3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetFileCtr_ctr3_, NDR_POINTER_UNIQUE, "Pointer to Ctr3 (srvsvc_NetFileCtr3)",hf_srvsvc_srvsvc_NetFileCtr_ctr3);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetFileCtr_val3_ctr3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetFileCtr_ctr3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetFileCtr3(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetFileCtr_val3_ctr3,0);
+       offset = srvsvc_dissect_struct_NetFileCtr3(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetFileCtr_ctr3,0);
 
        return offset;
 }
@@ -4030,11 +4030,11 @@ srvsvc_dissect_NetFileCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case 2:
-                       offset = srvsvc_dissect_element_NetFileCtr_val2_ctr2(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetFileCtr_ctr2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = srvsvc_dissect_element_NetFileCtr_val3_ctr3(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetFileCtr_ctr3(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -5039,81 +5039,81 @@ srvsvc_dissect_struct_NetSessCtr502(tvbuff_t *tvb _U_, int offset _U_, packet_in
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetSessCtr_val0_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSessCtr_ctr0(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, srvsvc_dissect_element_NetSessCtr_val0_ctr0_, NDR_POINTER_UNIQUE, "Pointer to Ctr0 (srvsvc_NetSessCtr0)",hf_srvsvc_srvsvc_NetSessCtr_val0_ctr0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSessCtr_ctr0_, NDR_POINTER_UNIQUE, "Pointer to Ctr0 (srvsvc_NetSessCtr0)",hf_srvsvc_srvsvc_NetSessCtr_ctr0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSessCtr_val0_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSessCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSessCtr0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSessCtr_val0_ctr0,0);
+       offset = srvsvc_dissect_struct_NetSessCtr0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSessCtr_ctr0,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSessCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSessCtr_ctr1(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, srvsvc_dissect_element_NetSessCtr_val1_ctr1_, NDR_POINTER_UNIQUE, "Pointer to Ctr1 (srvsvc_NetSessCtr1)",hf_srvsvc_srvsvc_NetSessCtr_val1_ctr1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSessCtr_ctr1_, NDR_POINTER_UNIQUE, "Pointer to Ctr1 (srvsvc_NetSessCtr1)",hf_srvsvc_srvsvc_NetSessCtr_ctr1);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSessCtr_val1_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSessCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSessCtr1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSessCtr_val1_ctr1,0);
+       offset = srvsvc_dissect_struct_NetSessCtr1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSessCtr_ctr1,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSessCtr_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSessCtr_ctr2(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, srvsvc_dissect_element_NetSessCtr_val2_ctr2_, NDR_POINTER_UNIQUE, "Pointer to Ctr2 (srvsvc_NetSessCtr2)",hf_srvsvc_srvsvc_NetSessCtr_val2_ctr2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSessCtr_ctr2_, NDR_POINTER_UNIQUE, "Pointer to Ctr2 (srvsvc_NetSessCtr2)",hf_srvsvc_srvsvc_NetSessCtr_ctr2);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSessCtr_val2_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSessCtr_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSessCtr2(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSessCtr_val2_ctr2,0);
+       offset = srvsvc_dissect_struct_NetSessCtr2(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSessCtr_ctr2,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSessCtr_val10_ctr10(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSessCtr_ctr10(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, srvsvc_dissect_element_NetSessCtr_val10_ctr10_, NDR_POINTER_UNIQUE, "Pointer to Ctr10 (srvsvc_NetSessCtr10)",hf_srvsvc_srvsvc_NetSessCtr_val10_ctr10);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSessCtr_ctr10_, NDR_POINTER_UNIQUE, "Pointer to Ctr10 (srvsvc_NetSessCtr10)",hf_srvsvc_srvsvc_NetSessCtr_ctr10);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSessCtr_val10_ctr10_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSessCtr_ctr10_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSessCtr10(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSessCtr_val10_ctr10,0);
+       offset = srvsvc_dissect_struct_NetSessCtr10(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSessCtr_ctr10,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSessCtr_val502_ctr502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSessCtr_ctr502(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, srvsvc_dissect_element_NetSessCtr_val502_ctr502_, NDR_POINTER_UNIQUE, "Pointer to Ctr502 (srvsvc_NetSessCtr502)",hf_srvsvc_srvsvc_NetSessCtr_val502_ctr502);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSessCtr_ctr502_, NDR_POINTER_UNIQUE, "Pointer to Ctr502 (srvsvc_NetSessCtr502)",hf_srvsvc_srvsvc_NetSessCtr_ctr502);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSessCtr_val502_ctr502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSessCtr_ctr502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSessCtr502(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSessCtr_val502_ctr502,0);
+       offset = srvsvc_dissect_struct_NetSessCtr502(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSessCtr_ctr502,0);
 
        return offset;
 }
@@ -5137,23 +5137,23 @@ srvsvc_dissect_NetSessCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case 0:
-                       offset = srvsvc_dissect_element_NetSessCtr_val0_ctr0(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSessCtr_ctr0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = srvsvc_dissect_element_NetSessCtr_val1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSessCtr_ctr1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = srvsvc_dissect_element_NetSessCtr_val2_ctr2(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSessCtr_ctr2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 10:
-                       offset = srvsvc_dissect_element_NetSessCtr_val10_ctr10(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSessCtr_ctr10(tvb, offset, pinfo, tree, drep);
                break;
 
                case 502:
-                       offset = srvsvc_dissect_element_NetSessCtr_val502_ctr502(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSessCtr_ctr502(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -6896,161 +6896,161 @@ srvsvc_dissect_struct_NetShareCtr1501(tvbuff_t *tvb _U_, int offset _U_, packet_
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetShareInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info0(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, srvsvc_dissect_element_NetShareInfo_val0_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (srvsvc_NetShareInfo0)",hf_srvsvc_srvsvc_NetShareInfo_val0_info0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareInfo_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (srvsvc_NetShareInfo0)",hf_srvsvc_srvsvc_NetShareInfo_info0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareInfo0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_val0_info0,0);
+       offset = srvsvc_dissect_struct_NetShareInfo0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_info0,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info1(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, srvsvc_dissect_element_NetShareInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (srvsvc_NetShareInfo1)",hf_srvsvc_srvsvc_NetShareInfo_val1_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (srvsvc_NetShareInfo1)",hf_srvsvc_srvsvc_NetShareInfo_info1);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareInfo1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_val1_info1,0);
+       offset = srvsvc_dissect_struct_NetShareInfo1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_info1,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info2(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, srvsvc_dissect_element_NetShareInfo_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (srvsvc_NetShareInfo2)",hf_srvsvc_srvsvc_NetShareInfo_val2_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareInfo_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (srvsvc_NetShareInfo2)",hf_srvsvc_srvsvc_NetShareInfo_info2);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareInfo2(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_val2_info2,0);
+       offset = srvsvc_dissect_struct_NetShareInfo2(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_info2,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val501_info501(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info501(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, srvsvc_dissect_element_NetShareInfo_val501_info501_, NDR_POINTER_UNIQUE, "Pointer to Info501 (srvsvc_NetShareInfo501)",hf_srvsvc_srvsvc_NetShareInfo_val501_info501);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareInfo_info501_, NDR_POINTER_UNIQUE, "Pointer to Info501 (srvsvc_NetShareInfo501)",hf_srvsvc_srvsvc_NetShareInfo_info501);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val501_info501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareInfo501(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_val501_info501,0);
+       offset = srvsvc_dissect_struct_NetShareInfo501(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_info501,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val502_info502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info502(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, srvsvc_dissect_element_NetShareInfo_val502_info502_, NDR_POINTER_UNIQUE, "Pointer to Info502 (srvsvc_NetShareInfo502)",hf_srvsvc_srvsvc_NetShareInfo_val502_info502);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareInfo_info502_, NDR_POINTER_UNIQUE, "Pointer to Info502 (srvsvc_NetShareInfo502)",hf_srvsvc_srvsvc_NetShareInfo_info502);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val502_info502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareInfo502(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_val502_info502,0);
+       offset = srvsvc_dissect_struct_NetShareInfo502(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_info502,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val1004_info1004(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info1004(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, srvsvc_dissect_element_NetShareInfo_val1004_info1004_, NDR_POINTER_UNIQUE, "Pointer to Info1004 (srvsvc_NetShareInfo1004)",hf_srvsvc_srvsvc_NetShareInfo_val1004_info1004);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareInfo_info1004_, NDR_POINTER_UNIQUE, "Pointer to Info1004 (srvsvc_NetShareInfo1004)",hf_srvsvc_srvsvc_NetShareInfo_info1004);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val1004_info1004_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info1004_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareInfo1004(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_val1004_info1004,0);
+       offset = srvsvc_dissect_struct_NetShareInfo1004(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_info1004,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val1005_info1005(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info1005(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, srvsvc_dissect_element_NetShareInfo_val1005_info1005_, NDR_POINTER_UNIQUE, "Pointer to Info1005 (srvsvc_NetShareInfo1005)",hf_srvsvc_srvsvc_NetShareInfo_val1005_info1005);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareInfo_info1005_, NDR_POINTER_UNIQUE, "Pointer to Info1005 (srvsvc_NetShareInfo1005)",hf_srvsvc_srvsvc_NetShareInfo_info1005);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val1005_info1005_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info1005_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareInfo1005(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_val1005_info1005,0);
+       offset = srvsvc_dissect_struct_NetShareInfo1005(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_info1005,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val1006_info1006(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info1006(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, srvsvc_dissect_element_NetShareInfo_val1006_info1006_, NDR_POINTER_UNIQUE, "Pointer to Info1006 (srvsvc_NetShareInfo1006)",hf_srvsvc_srvsvc_NetShareInfo_val1006_info1006);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareInfo_info1006_, NDR_POINTER_UNIQUE, "Pointer to Info1006 (srvsvc_NetShareInfo1006)",hf_srvsvc_srvsvc_NetShareInfo_info1006);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val1006_info1006_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info1006_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareInfo1006(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_val1006_info1006,0);
+       offset = srvsvc_dissect_struct_NetShareInfo1006(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_info1006,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val1007_info1007(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info1007(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, srvsvc_dissect_element_NetShareInfo_val1007_info1007_, NDR_POINTER_UNIQUE, "Pointer to Info1007 (srvsvc_NetShareInfo1007)",hf_srvsvc_srvsvc_NetShareInfo_val1007_info1007);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareInfo_info1007_, NDR_POINTER_UNIQUE, "Pointer to Info1007 (srvsvc_NetShareInfo1007)",hf_srvsvc_srvsvc_NetShareInfo_info1007);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val1007_info1007_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info1007_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareInfo1007(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_val1007_info1007,0);
+       offset = srvsvc_dissect_struct_NetShareInfo1007(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_info1007,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val1501_info1501(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info1501(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, srvsvc_dissect_element_NetShareInfo_val1501_info1501_, NDR_POINTER_UNIQUE, "Pointer to Info1501 (sec_desc_buf)",hf_srvsvc_srvsvc_NetShareInfo_val1501_info1501);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareInfo_info1501_, NDR_POINTER_UNIQUE, "Pointer to Info1501 (sec_desc_buf)",hf_srvsvc_srvsvc_NetShareInfo_info1501);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareInfo_val1501_info1501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareInfo_info1501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_sec_desc_buf(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_val1501_info1501,0);
+       offset = srvsvc_dissect_struct_sec_desc_buf(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareInfo_info1501,0);
 
        return offset;
 }
@@ -7074,43 +7074,43 @@ srvsvc_dissect_NetShareInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 
        switch(level) {
                case 0:
-                       offset = srvsvc_dissect_element_NetShareInfo_val0_info0(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareInfo_info0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = srvsvc_dissect_element_NetShareInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = srvsvc_dissect_element_NetShareInfo_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareInfo_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 501:
-                       offset = srvsvc_dissect_element_NetShareInfo_val501_info501(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareInfo_info501(tvb, offset, pinfo, tree, drep);
                break;
 
                case 502:
-                       offset = srvsvc_dissect_element_NetShareInfo_val502_info502(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareInfo_info502(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1004:
-                       offset = srvsvc_dissect_element_NetShareInfo_val1004_info1004(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareInfo_info1004(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1005:
-                       offset = srvsvc_dissect_element_NetShareInfo_val1005_info1005(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareInfo_info1005(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1006:
-                       offset = srvsvc_dissect_element_NetShareInfo_val1006_info1006(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareInfo_info1006(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1007:
-                       offset = srvsvc_dissect_element_NetShareInfo_val1007_info1007(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareInfo_info1007(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1501:
-                       offset = srvsvc_dissect_element_NetShareInfo_val1501_info1501(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareInfo_info1501(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -7137,161 +7137,161 @@ srvsvc_dissect_NetShareInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetShareCtr_val0_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr0(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, srvsvc_dissect_element_NetShareCtr_val0_ctr0_, NDR_POINTER_UNIQUE, "Pointer to Ctr0 (srvsvc_NetShareCtr0)",hf_srvsvc_srvsvc_NetShareCtr_val0_ctr0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareCtr_ctr0_, NDR_POINTER_UNIQUE, "Pointer to Ctr0 (srvsvc_NetShareCtr0)",hf_srvsvc_srvsvc_NetShareCtr_ctr0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val0_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareCtr0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_val0_ctr0,0);
+       offset = srvsvc_dissect_struct_NetShareCtr0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_ctr0,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr1(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, srvsvc_dissect_element_NetShareCtr_val1_ctr1_, NDR_POINTER_UNIQUE, "Pointer to Ctr1 (srvsvc_NetShareCtr1)",hf_srvsvc_srvsvc_NetShareCtr_val1_ctr1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareCtr_ctr1_, NDR_POINTER_UNIQUE, "Pointer to Ctr1 (srvsvc_NetShareCtr1)",hf_srvsvc_srvsvc_NetShareCtr_ctr1);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val1_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareCtr1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_val1_ctr1,0);
+       offset = srvsvc_dissect_struct_NetShareCtr1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_ctr1,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr2(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, srvsvc_dissect_element_NetShareCtr_val2_ctr2_, NDR_POINTER_UNIQUE, "Pointer to Ctr2 (srvsvc_NetShareCtr2)",hf_srvsvc_srvsvc_NetShareCtr_val2_ctr2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareCtr_ctr2_, NDR_POINTER_UNIQUE, "Pointer to Ctr2 (srvsvc_NetShareCtr2)",hf_srvsvc_srvsvc_NetShareCtr_ctr2);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val2_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareCtr2(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_val2_ctr2,0);
+       offset = srvsvc_dissect_struct_NetShareCtr2(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_ctr2,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val501_ctr501(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr501(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, srvsvc_dissect_element_NetShareCtr_val501_ctr501_, NDR_POINTER_UNIQUE, "Pointer to Ctr501 (srvsvc_NetShareCtr501)",hf_srvsvc_srvsvc_NetShareCtr_val501_ctr501);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareCtr_ctr501_, NDR_POINTER_UNIQUE, "Pointer to Ctr501 (srvsvc_NetShareCtr501)",hf_srvsvc_srvsvc_NetShareCtr_ctr501);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val501_ctr501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareCtr501(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_val501_ctr501,0);
+       offset = srvsvc_dissect_struct_NetShareCtr501(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_ctr501,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val502_ctr502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr502(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, srvsvc_dissect_element_NetShareCtr_val502_ctr502_, NDR_POINTER_UNIQUE, "Pointer to Ctr502 (srvsvc_NetShareCtr502)",hf_srvsvc_srvsvc_NetShareCtr_val502_ctr502);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareCtr_ctr502_, NDR_POINTER_UNIQUE, "Pointer to Ctr502 (srvsvc_NetShareCtr502)",hf_srvsvc_srvsvc_NetShareCtr_ctr502);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val502_ctr502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareCtr502(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_val502_ctr502,0);
+       offset = srvsvc_dissect_struct_NetShareCtr502(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_ctr502,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val1004_ctr1004(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr1004(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, srvsvc_dissect_element_NetShareCtr_val1004_ctr1004_, NDR_POINTER_UNIQUE, "Pointer to Ctr1004 (srvsvc_NetShareCtr1004)",hf_srvsvc_srvsvc_NetShareCtr_val1004_ctr1004);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareCtr_ctr1004_, NDR_POINTER_UNIQUE, "Pointer to Ctr1004 (srvsvc_NetShareCtr1004)",hf_srvsvc_srvsvc_NetShareCtr_ctr1004);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val1004_ctr1004_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr1004_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareCtr1004(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_val1004_ctr1004,0);
+       offset = srvsvc_dissect_struct_NetShareCtr1004(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_ctr1004,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val1005_ctr1005(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr1005(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, srvsvc_dissect_element_NetShareCtr_val1005_ctr1005_, NDR_POINTER_UNIQUE, "Pointer to Ctr1005 (srvsvc_NetShareCtr1005)",hf_srvsvc_srvsvc_NetShareCtr_val1005_ctr1005);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareCtr_ctr1005_, NDR_POINTER_UNIQUE, "Pointer to Ctr1005 (srvsvc_NetShareCtr1005)",hf_srvsvc_srvsvc_NetShareCtr_ctr1005);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val1005_ctr1005_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr1005_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareCtr1005(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_val1005_ctr1005,0);
+       offset = srvsvc_dissect_struct_NetShareCtr1005(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_ctr1005,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val1006_ctr1006(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr1006(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, srvsvc_dissect_element_NetShareCtr_val1006_ctr1006_, NDR_POINTER_UNIQUE, "Pointer to Ctr1006 (srvsvc_NetShareCtr1006)",hf_srvsvc_srvsvc_NetShareCtr_val1006_ctr1006);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareCtr_ctr1006_, NDR_POINTER_UNIQUE, "Pointer to Ctr1006 (srvsvc_NetShareCtr1006)",hf_srvsvc_srvsvc_NetShareCtr_ctr1006);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val1006_ctr1006_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr1006_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareCtr1006(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_val1006_ctr1006,0);
+       offset = srvsvc_dissect_struct_NetShareCtr1006(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_ctr1006,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val1007_ctr1007(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr1007(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, srvsvc_dissect_element_NetShareCtr_val1007_ctr1007_, NDR_POINTER_UNIQUE, "Pointer to Ctr1007 (srvsvc_NetShareCtr1007)",hf_srvsvc_srvsvc_NetShareCtr_val1007_ctr1007);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareCtr_ctr1007_, NDR_POINTER_UNIQUE, "Pointer to Ctr1007 (srvsvc_NetShareCtr1007)",hf_srvsvc_srvsvc_NetShareCtr_ctr1007);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val1007_ctr1007_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr1007_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareCtr1007(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_val1007_ctr1007,0);
+       offset = srvsvc_dissect_struct_NetShareCtr1007(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_ctr1007,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val1501_ctr1501(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr1501(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, srvsvc_dissect_element_NetShareCtr_val1501_ctr1501_, NDR_POINTER_UNIQUE, "Pointer to Ctr1501 (srvsvc_NetShareCtr1501)",hf_srvsvc_srvsvc_NetShareCtr_val1501_ctr1501);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetShareCtr_ctr1501_, NDR_POINTER_UNIQUE, "Pointer to Ctr1501 (srvsvc_NetShareCtr1501)",hf_srvsvc_srvsvc_NetShareCtr_ctr1501);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetShareCtr_val1501_ctr1501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetShareCtr_ctr1501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetShareCtr1501(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_val1501_ctr1501,0);
+       offset = srvsvc_dissect_struct_NetShareCtr1501(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetShareCtr_ctr1501,0);
 
        return offset;
 }
@@ -7315,43 +7315,43 @@ srvsvc_dissect_NetShareCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case 0:
-                       offset = srvsvc_dissect_element_NetShareCtr_val0_ctr0(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareCtr_ctr0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = srvsvc_dissect_element_NetShareCtr_val1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareCtr_ctr1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = srvsvc_dissect_element_NetShareCtr_val2_ctr2(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareCtr_ctr2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 501:
-                       offset = srvsvc_dissect_element_NetShareCtr_val501_ctr501(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareCtr_ctr501(tvb, offset, pinfo, tree, drep);
                break;
 
                case 502:
-                       offset = srvsvc_dissect_element_NetShareCtr_val502_ctr502(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareCtr_ctr502(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1004:
-                       offset = srvsvc_dissect_element_NetShareCtr_val1004_ctr1004(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareCtr_ctr1004(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1005:
-                       offset = srvsvc_dissect_element_NetShareCtr_val1005_ctr1005(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareCtr_ctr1005(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1006:
-                       offset = srvsvc_dissect_element_NetShareCtr_val1006_ctr1006(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareCtr_ctr1006(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1007:
-                       offset = srvsvc_dissect_element_NetShareCtr_val1007_ctr1007(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareCtr_ctr1007(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1501:
-                       offset = srvsvc_dissect_element_NetShareCtr_val1501_ctr1501(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetShareCtr_ctr1501(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -12341,945 +12341,945 @@ srvsvc_dissect_struct_NetSrvInfo1556(tvbuff_t *tvb _U_, int offset _U_, packet_i
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val100_info100(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info100(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, srvsvc_dissect_element_NetSrvInfo_val100_info100_, NDR_POINTER_UNIQUE, "Pointer to Info100 (srvsvc_NetSrvInfo100)",hf_srvsvc_srvsvc_NetSrvInfo_val100_info100);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info100_, NDR_POINTER_UNIQUE, "Pointer to Info100 (srvsvc_NetSrvInfo100)",hf_srvsvc_srvsvc_NetSrvInfo_info100);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val100_info100_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info100_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo100(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val100_info100,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo100(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info100,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val101_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info101(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, srvsvc_dissect_element_NetSrvInfo_val101_info101_, NDR_POINTER_UNIQUE, "Pointer to Info101 (srvsvc_NetSrvInfo101)",hf_srvsvc_srvsvc_NetSrvInfo_val101_info101);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info101_, NDR_POINTER_UNIQUE, "Pointer to Info101 (srvsvc_NetSrvInfo101)",hf_srvsvc_srvsvc_NetSrvInfo_info101);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val101_info101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo101(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val101_info101,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo101(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info101,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val102_info102(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info102(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, srvsvc_dissect_element_NetSrvInfo_val102_info102_, NDR_POINTER_UNIQUE, "Pointer to Info102 (srvsvc_NetSrvInfo102)",hf_srvsvc_srvsvc_NetSrvInfo_val102_info102);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info102_, NDR_POINTER_UNIQUE, "Pointer to Info102 (srvsvc_NetSrvInfo102)",hf_srvsvc_srvsvc_NetSrvInfo_info102);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val102_info102_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info102_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo102(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val102_info102,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo102(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info102,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val402_info402(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info402(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, srvsvc_dissect_element_NetSrvInfo_val402_info402_, NDR_POINTER_UNIQUE, "Pointer to Info402 (srvsvc_NetSrvInfo402)",hf_srvsvc_srvsvc_NetSrvInfo_val402_info402);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info402_, NDR_POINTER_UNIQUE, "Pointer to Info402 (srvsvc_NetSrvInfo402)",hf_srvsvc_srvsvc_NetSrvInfo_info402);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val402_info402_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info402_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo402(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val402_info402,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo402(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info402,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val403_info403(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info403(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, srvsvc_dissect_element_NetSrvInfo_val403_info403_, NDR_POINTER_UNIQUE, "Pointer to Info403 (srvsvc_NetSrvInfo403)",hf_srvsvc_srvsvc_NetSrvInfo_val403_info403);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info403_, NDR_POINTER_UNIQUE, "Pointer to Info403 (srvsvc_NetSrvInfo403)",hf_srvsvc_srvsvc_NetSrvInfo_info403);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val403_info403_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info403_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo403(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val403_info403,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo403(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info403,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val502_info502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info502(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, srvsvc_dissect_element_NetSrvInfo_val502_info502_, NDR_POINTER_UNIQUE, "Pointer to Info502 (srvsvc_NetSrvInfo502)",hf_srvsvc_srvsvc_NetSrvInfo_val502_info502);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info502_, NDR_POINTER_UNIQUE, "Pointer to Info502 (srvsvc_NetSrvInfo502)",hf_srvsvc_srvsvc_NetSrvInfo_info502);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val502_info502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo502(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val502_info502,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo502(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info502,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val503_info503(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info503(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, srvsvc_dissect_element_NetSrvInfo_val503_info503_, NDR_POINTER_UNIQUE, "Pointer to Info503 (srvsvc_NetSrvInfo503)",hf_srvsvc_srvsvc_NetSrvInfo_val503_info503);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info503_, NDR_POINTER_UNIQUE, "Pointer to Info503 (srvsvc_NetSrvInfo503)",hf_srvsvc_srvsvc_NetSrvInfo_info503);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val503_info503_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info503_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo503(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val503_info503,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo503(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info503,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val599_info599(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info599(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, srvsvc_dissect_element_NetSrvInfo_val599_info599_, NDR_POINTER_UNIQUE, "Pointer to Info599 (srvsvc_NetSrvInfo599)",hf_srvsvc_srvsvc_NetSrvInfo_val599_info599);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info599_, NDR_POINTER_UNIQUE, "Pointer to Info599 (srvsvc_NetSrvInfo599)",hf_srvsvc_srvsvc_NetSrvInfo_info599);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val599_info599_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info599_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo599(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val599_info599,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo599(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info599,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1005_info1005(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1005(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, srvsvc_dissect_element_NetSrvInfo_val1005_info1005_, NDR_POINTER_UNIQUE, "Pointer to Info1005 (srvsvc_NetSrvInfo1005)",hf_srvsvc_srvsvc_NetSrvInfo_val1005_info1005);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1005_, NDR_POINTER_UNIQUE, "Pointer to Info1005 (srvsvc_NetSrvInfo1005)",hf_srvsvc_srvsvc_NetSrvInfo_info1005);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1005_info1005_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1005_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1005(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1005_info1005,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1005(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1005,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1010_info1010(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1010(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, srvsvc_dissect_element_NetSrvInfo_val1010_info1010_, NDR_POINTER_UNIQUE, "Pointer to Info1010 (srvsvc_NetSrvInfo1010)",hf_srvsvc_srvsvc_NetSrvInfo_val1010_info1010);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1010_, NDR_POINTER_UNIQUE, "Pointer to Info1010 (srvsvc_NetSrvInfo1010)",hf_srvsvc_srvsvc_NetSrvInfo_info1010);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1010_info1010_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1010_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1010(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1010_info1010,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1010(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1010,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1016_info1016(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1016(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, srvsvc_dissect_element_NetSrvInfo_val1016_info1016_, NDR_POINTER_UNIQUE, "Pointer to Info1016 (srvsvc_NetSrvInfo1016)",hf_srvsvc_srvsvc_NetSrvInfo_val1016_info1016);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1016_, NDR_POINTER_UNIQUE, "Pointer to Info1016 (srvsvc_NetSrvInfo1016)",hf_srvsvc_srvsvc_NetSrvInfo_info1016);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1016_info1016_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1016_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1016(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1016_info1016,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1016(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1016,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1017_info1017(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1017(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, srvsvc_dissect_element_NetSrvInfo_val1017_info1017_, NDR_POINTER_UNIQUE, "Pointer to Info1017 (srvsvc_NetSrvInfo1017)",hf_srvsvc_srvsvc_NetSrvInfo_val1017_info1017);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1017_, NDR_POINTER_UNIQUE, "Pointer to Info1017 (srvsvc_NetSrvInfo1017)",hf_srvsvc_srvsvc_NetSrvInfo_info1017);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1017_info1017_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1017_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1017(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1017_info1017,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1017(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1017,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1018_info1018(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1018(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, srvsvc_dissect_element_NetSrvInfo_val1018_info1018_, NDR_POINTER_UNIQUE, "Pointer to Info1018 (srvsvc_NetSrvInfo1018)",hf_srvsvc_srvsvc_NetSrvInfo_val1018_info1018);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1018_, NDR_POINTER_UNIQUE, "Pointer to Info1018 (srvsvc_NetSrvInfo1018)",hf_srvsvc_srvsvc_NetSrvInfo_info1018);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1018_info1018_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1018_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1018(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1018_info1018,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1018(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1018,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1107_info1107(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1107(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, srvsvc_dissect_element_NetSrvInfo_val1107_info1107_, NDR_POINTER_UNIQUE, "Pointer to Info1107 (srvsvc_NetSrvInfo1107)",hf_srvsvc_srvsvc_NetSrvInfo_val1107_info1107);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1107_, NDR_POINTER_UNIQUE, "Pointer to Info1107 (srvsvc_NetSrvInfo1107)",hf_srvsvc_srvsvc_NetSrvInfo_info1107);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1107_info1107_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1107_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1107(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1107_info1107,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1107(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1107,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1501_info1501(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1501(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, srvsvc_dissect_element_NetSrvInfo_val1501_info1501_, NDR_POINTER_UNIQUE, "Pointer to Info1501 (srvsvc_NetSrvInfo1501)",hf_srvsvc_srvsvc_NetSrvInfo_val1501_info1501);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1501_, NDR_POINTER_UNIQUE, "Pointer to Info1501 (srvsvc_NetSrvInfo1501)",hf_srvsvc_srvsvc_NetSrvInfo_info1501);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1501_info1501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1501(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1501_info1501,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1501(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1501,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1502_info1502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1502(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, srvsvc_dissect_element_NetSrvInfo_val1502_info1502_, NDR_POINTER_UNIQUE, "Pointer to Info1502 (srvsvc_NetSrvInfo1502)",hf_srvsvc_srvsvc_NetSrvInfo_val1502_info1502);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1502_, NDR_POINTER_UNIQUE, "Pointer to Info1502 (srvsvc_NetSrvInfo1502)",hf_srvsvc_srvsvc_NetSrvInfo_info1502);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1502_info1502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1502(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1502_info1502,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1502(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1502,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1503_info1503(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1503(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, srvsvc_dissect_element_NetSrvInfo_val1503_info1503_, NDR_POINTER_UNIQUE, "Pointer to Info1503 (srvsvc_NetSrvInfo1503)",hf_srvsvc_srvsvc_NetSrvInfo_val1503_info1503);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1503_, NDR_POINTER_UNIQUE, "Pointer to Info1503 (srvsvc_NetSrvInfo1503)",hf_srvsvc_srvsvc_NetSrvInfo_info1503);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1503_info1503_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1503_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1503(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1503_info1503,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1503(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1503,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1506_info1506(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1506(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, srvsvc_dissect_element_NetSrvInfo_val1506_info1506_, NDR_POINTER_UNIQUE, "Pointer to Info1506 (srvsvc_NetSrvInfo1506)",hf_srvsvc_srvsvc_NetSrvInfo_val1506_info1506);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1506_, NDR_POINTER_UNIQUE, "Pointer to Info1506 (srvsvc_NetSrvInfo1506)",hf_srvsvc_srvsvc_NetSrvInfo_info1506);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1506_info1506_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1506_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1506(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1506_info1506,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1506(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1506,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1509_info1509(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1509(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, srvsvc_dissect_element_NetSrvInfo_val1509_info1509_, NDR_POINTER_UNIQUE, "Pointer to Info1509 (srvsvc_NetSrvInfo1509)",hf_srvsvc_srvsvc_NetSrvInfo_val1509_info1509);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1509_, NDR_POINTER_UNIQUE, "Pointer to Info1509 (srvsvc_NetSrvInfo1509)",hf_srvsvc_srvsvc_NetSrvInfo_info1509);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1509_info1509_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1509_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1509(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1509_info1509,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1509(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1509,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1510_info1510(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1510(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, srvsvc_dissect_element_NetSrvInfo_val1510_info1510_, NDR_POINTER_UNIQUE, "Pointer to Info1510 (srvsvc_NetSrvInfo1510)",hf_srvsvc_srvsvc_NetSrvInfo_val1510_info1510);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1510_, NDR_POINTER_UNIQUE, "Pointer to Info1510 (srvsvc_NetSrvInfo1510)",hf_srvsvc_srvsvc_NetSrvInfo_info1510);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1510_info1510_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1510_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1510(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1510_info1510,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1510(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1510,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1511_info1511(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1511(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, srvsvc_dissect_element_NetSrvInfo_val1511_info1511_, NDR_POINTER_UNIQUE, "Pointer to Info1511 (srvsvc_NetSrvInfo1511)",hf_srvsvc_srvsvc_NetSrvInfo_val1511_info1511);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1511_, NDR_POINTER_UNIQUE, "Pointer to Info1511 (srvsvc_NetSrvInfo1511)",hf_srvsvc_srvsvc_NetSrvInfo_info1511);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1511_info1511_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1511_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1511(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1511_info1511,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1511(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1511,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1512_info1512(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1512(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, srvsvc_dissect_element_NetSrvInfo_val1512_info1512_, NDR_POINTER_UNIQUE, "Pointer to Info1512 (srvsvc_NetSrvInfo1512)",hf_srvsvc_srvsvc_NetSrvInfo_val1512_info1512);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1512_, NDR_POINTER_UNIQUE, "Pointer to Info1512 (srvsvc_NetSrvInfo1512)",hf_srvsvc_srvsvc_NetSrvInfo_info1512);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1512_info1512_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1512_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1512(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1512_info1512,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1512(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1512,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1513_info1513(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1513(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, srvsvc_dissect_element_NetSrvInfo_val1513_info1513_, NDR_POINTER_UNIQUE, "Pointer to Info1513 (srvsvc_NetSrvInfo1513)",hf_srvsvc_srvsvc_NetSrvInfo_val1513_info1513);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1513_, NDR_POINTER_UNIQUE, "Pointer to Info1513 (srvsvc_NetSrvInfo1513)",hf_srvsvc_srvsvc_NetSrvInfo_info1513);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1513_info1513_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1513_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1513(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1513_info1513,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1513(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1513,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1514_info1514(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1514(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, srvsvc_dissect_element_NetSrvInfo_val1514_info1514_, NDR_POINTER_UNIQUE, "Pointer to Info1514 (srvsvc_NetSrvInfo1514)",hf_srvsvc_srvsvc_NetSrvInfo_val1514_info1514);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1514_, NDR_POINTER_UNIQUE, "Pointer to Info1514 (srvsvc_NetSrvInfo1514)",hf_srvsvc_srvsvc_NetSrvInfo_info1514);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1514_info1514_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1514_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1514(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1514_info1514,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1514(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1514,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1515_info1515(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1515(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, srvsvc_dissect_element_NetSrvInfo_val1515_info1515_, NDR_POINTER_UNIQUE, "Pointer to Info1515 (srvsvc_NetSrvInfo1515)",hf_srvsvc_srvsvc_NetSrvInfo_val1515_info1515);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1515_, NDR_POINTER_UNIQUE, "Pointer to Info1515 (srvsvc_NetSrvInfo1515)",hf_srvsvc_srvsvc_NetSrvInfo_info1515);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1515_info1515_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1515_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1515(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1515_info1515,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1515(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1515,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1516_info1516(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1516(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, srvsvc_dissect_element_NetSrvInfo_val1516_info1516_, NDR_POINTER_UNIQUE, "Pointer to Info1516 (srvsvc_NetSrvInfo1516)",hf_srvsvc_srvsvc_NetSrvInfo_val1516_info1516);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1516_, NDR_POINTER_UNIQUE, "Pointer to Info1516 (srvsvc_NetSrvInfo1516)",hf_srvsvc_srvsvc_NetSrvInfo_info1516);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1516_info1516_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1516_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1516(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1516_info1516,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1516(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1516,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1518_info1518(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1518(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, srvsvc_dissect_element_NetSrvInfo_val1518_info1518_, NDR_POINTER_UNIQUE, "Pointer to Info1518 (srvsvc_NetSrvInfo1518)",hf_srvsvc_srvsvc_NetSrvInfo_val1518_info1518);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1518_, NDR_POINTER_UNIQUE, "Pointer to Info1518 (srvsvc_NetSrvInfo1518)",hf_srvsvc_srvsvc_NetSrvInfo_info1518);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1518_info1518_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1518_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1518(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1518_info1518,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1518(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1518,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1520_info1520(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1520(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, srvsvc_dissect_element_NetSrvInfo_val1520_info1520_, NDR_POINTER_UNIQUE, "Pointer to Info1520 (srvsvc_NetSrvInfo1520)",hf_srvsvc_srvsvc_NetSrvInfo_val1520_info1520);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1520_, NDR_POINTER_UNIQUE, "Pointer to Info1520 (srvsvc_NetSrvInfo1520)",hf_srvsvc_srvsvc_NetSrvInfo_info1520);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1520_info1520_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1520_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1520(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1520_info1520,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1520(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1520,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1521_info1521(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1521(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, srvsvc_dissect_element_NetSrvInfo_val1521_info1521_, NDR_POINTER_UNIQUE, "Pointer to Info1521 (srvsvc_NetSrvInfo1521)",hf_srvsvc_srvsvc_NetSrvInfo_val1521_info1521);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1521_, NDR_POINTER_UNIQUE, "Pointer to Info1521 (srvsvc_NetSrvInfo1521)",hf_srvsvc_srvsvc_NetSrvInfo_info1521);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1521_info1521_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1521_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1521(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1521_info1521,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1521(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1521,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1522_info1522(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1522(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, srvsvc_dissect_element_NetSrvInfo_val1522_info1522_, NDR_POINTER_UNIQUE, "Pointer to Info1522 (srvsvc_NetSrvInfo1522)",hf_srvsvc_srvsvc_NetSrvInfo_val1522_info1522);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1522_, NDR_POINTER_UNIQUE, "Pointer to Info1522 (srvsvc_NetSrvInfo1522)",hf_srvsvc_srvsvc_NetSrvInfo_info1522);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1522_info1522_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1522_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1522(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1522_info1522,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1522(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1522,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1523_info1523(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1523(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, srvsvc_dissect_element_NetSrvInfo_val1523_info1523_, NDR_POINTER_UNIQUE, "Pointer to Info1523 (srvsvc_NetSrvInfo1523)",hf_srvsvc_srvsvc_NetSrvInfo_val1523_info1523);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1523_, NDR_POINTER_UNIQUE, "Pointer to Info1523 (srvsvc_NetSrvInfo1523)",hf_srvsvc_srvsvc_NetSrvInfo_info1523);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1523_info1523_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1523_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1523(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1523_info1523,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1523(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1523,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1524_info1524(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1524(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, srvsvc_dissect_element_NetSrvInfo_val1524_info1524_, NDR_POINTER_UNIQUE, "Pointer to Info1524 (srvsvc_NetSrvInfo1524)",hf_srvsvc_srvsvc_NetSrvInfo_val1524_info1524);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1524_, NDR_POINTER_UNIQUE, "Pointer to Info1524 (srvsvc_NetSrvInfo1524)",hf_srvsvc_srvsvc_NetSrvInfo_info1524);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1524_info1524_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1524_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1524(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1524_info1524,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1524(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1524,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1525_info1525(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1525(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, srvsvc_dissect_element_NetSrvInfo_val1525_info1525_, NDR_POINTER_UNIQUE, "Pointer to Info1525 (srvsvc_NetSrvInfo1525)",hf_srvsvc_srvsvc_NetSrvInfo_val1525_info1525);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1525_, NDR_POINTER_UNIQUE, "Pointer to Info1525 (srvsvc_NetSrvInfo1525)",hf_srvsvc_srvsvc_NetSrvInfo_info1525);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1525_info1525_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1525_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1525(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1525_info1525,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1525(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1525,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1528_info1528(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1528(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, srvsvc_dissect_element_NetSrvInfo_val1528_info1528_, NDR_POINTER_UNIQUE, "Pointer to Info1528 (srvsvc_NetSrvInfo1528)",hf_srvsvc_srvsvc_NetSrvInfo_val1528_info1528);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1528_, NDR_POINTER_UNIQUE, "Pointer to Info1528 (srvsvc_NetSrvInfo1528)",hf_srvsvc_srvsvc_NetSrvInfo_info1528);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1528_info1528_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1528_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1528(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1528_info1528,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1528(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1528,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1529_info1529(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1529(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, srvsvc_dissect_element_NetSrvInfo_val1529_info1529_, NDR_POINTER_UNIQUE, "Pointer to Info1529 (srvsvc_NetSrvInfo1529)",hf_srvsvc_srvsvc_NetSrvInfo_val1529_info1529);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1529_, NDR_POINTER_UNIQUE, "Pointer to Info1529 (srvsvc_NetSrvInfo1529)",hf_srvsvc_srvsvc_NetSrvInfo_info1529);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1529_info1529_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1529_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1529(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1529_info1529,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1529(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1529,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1530_info1530(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1530(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, srvsvc_dissect_element_NetSrvInfo_val1530_info1530_, NDR_POINTER_UNIQUE, "Pointer to Info1530 (srvsvc_NetSrvInfo1530)",hf_srvsvc_srvsvc_NetSrvInfo_val1530_info1530);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1530_, NDR_POINTER_UNIQUE, "Pointer to Info1530 (srvsvc_NetSrvInfo1530)",hf_srvsvc_srvsvc_NetSrvInfo_info1530);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1530_info1530_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1530_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1530(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1530_info1530,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1530(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1530,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1533_info1533(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1533(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, srvsvc_dissect_element_NetSrvInfo_val1533_info1533_, NDR_POINTER_UNIQUE, "Pointer to Info1533 (srvsvc_NetSrvInfo1533)",hf_srvsvc_srvsvc_NetSrvInfo_val1533_info1533);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1533_, NDR_POINTER_UNIQUE, "Pointer to Info1533 (srvsvc_NetSrvInfo1533)",hf_srvsvc_srvsvc_NetSrvInfo_info1533);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1533_info1533_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1533_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1533(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1533_info1533,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1533(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1533,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1534_info1534(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1534(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, srvsvc_dissect_element_NetSrvInfo_val1534_info1534_, NDR_POINTER_UNIQUE, "Pointer to Info1534 (srvsvc_NetSrvInfo1534)",hf_srvsvc_srvsvc_NetSrvInfo_val1534_info1534);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1534_, NDR_POINTER_UNIQUE, "Pointer to Info1534 (srvsvc_NetSrvInfo1534)",hf_srvsvc_srvsvc_NetSrvInfo_info1534);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1534_info1534_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1534_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1534(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1534_info1534,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1534(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1534,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1535_info1535(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1535(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, srvsvc_dissect_element_NetSrvInfo_val1535_info1535_, NDR_POINTER_UNIQUE, "Pointer to Info1535 (srvsvc_NetSrvInfo1535)",hf_srvsvc_srvsvc_NetSrvInfo_val1535_info1535);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1535_, NDR_POINTER_UNIQUE, "Pointer to Info1535 (srvsvc_NetSrvInfo1535)",hf_srvsvc_srvsvc_NetSrvInfo_info1535);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1535_info1535_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1535_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1535(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1535_info1535,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1535(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1535,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1536_info1536(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1536(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, srvsvc_dissect_element_NetSrvInfo_val1536_info1536_, NDR_POINTER_UNIQUE, "Pointer to Info1536 (srvsvc_NetSrvInfo1536)",hf_srvsvc_srvsvc_NetSrvInfo_val1536_info1536);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1536_, NDR_POINTER_UNIQUE, "Pointer to Info1536 (srvsvc_NetSrvInfo1536)",hf_srvsvc_srvsvc_NetSrvInfo_info1536);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1536_info1536_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1536_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1536(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1536_info1536,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1536(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1536,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1537_info1537(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1537(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, srvsvc_dissect_element_NetSrvInfo_val1537_info1537_, NDR_POINTER_UNIQUE, "Pointer to Info1537 (srvsvc_NetSrvInfo1537)",hf_srvsvc_srvsvc_NetSrvInfo_val1537_info1537);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1537_, NDR_POINTER_UNIQUE, "Pointer to Info1537 (srvsvc_NetSrvInfo1537)",hf_srvsvc_srvsvc_NetSrvInfo_info1537);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1537_info1537_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1537_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1537(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1537_info1537,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1537(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1537,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1538_info1538(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1538(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, srvsvc_dissect_element_NetSrvInfo_val1538_info1538_, NDR_POINTER_UNIQUE, "Pointer to Info1538 (srvsvc_NetSrvInfo1538)",hf_srvsvc_srvsvc_NetSrvInfo_val1538_info1538);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1538_, NDR_POINTER_UNIQUE, "Pointer to Info1538 (srvsvc_NetSrvInfo1538)",hf_srvsvc_srvsvc_NetSrvInfo_info1538);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1538_info1538_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1538_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1538(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1538_info1538,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1538(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1538,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1539_info1539(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1539(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, srvsvc_dissect_element_NetSrvInfo_val1539_info1539_, NDR_POINTER_UNIQUE, "Pointer to Info1539 (srvsvc_NetSrvInfo1539)",hf_srvsvc_srvsvc_NetSrvInfo_val1539_info1539);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1539_, NDR_POINTER_UNIQUE, "Pointer to Info1539 (srvsvc_NetSrvInfo1539)",hf_srvsvc_srvsvc_NetSrvInfo_info1539);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1539_info1539_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1539_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1539(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1539_info1539,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1539(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1539,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1540_info1540(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1540(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, srvsvc_dissect_element_NetSrvInfo_val1540_info1540_, NDR_POINTER_UNIQUE, "Pointer to Info1540 (srvsvc_NetSrvInfo1540)",hf_srvsvc_srvsvc_NetSrvInfo_val1540_info1540);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1540_, NDR_POINTER_UNIQUE, "Pointer to Info1540 (srvsvc_NetSrvInfo1540)",hf_srvsvc_srvsvc_NetSrvInfo_info1540);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1540_info1540_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1540_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1540(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1540_info1540,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1540(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1540,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1541_info1541(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1541(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, srvsvc_dissect_element_NetSrvInfo_val1541_info1541_, NDR_POINTER_UNIQUE, "Pointer to Info1541 (srvsvc_NetSrvInfo1541)",hf_srvsvc_srvsvc_NetSrvInfo_val1541_info1541);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1541_, NDR_POINTER_UNIQUE, "Pointer to Info1541 (srvsvc_NetSrvInfo1541)",hf_srvsvc_srvsvc_NetSrvInfo_info1541);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1541_info1541_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1541_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1541(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1541_info1541,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1541(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1541,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1542_info1542(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1542(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, srvsvc_dissect_element_NetSrvInfo_val1542_info1542_, NDR_POINTER_UNIQUE, "Pointer to Info1542 (srvsvc_NetSrvInfo1542)",hf_srvsvc_srvsvc_NetSrvInfo_val1542_info1542);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1542_, NDR_POINTER_UNIQUE, "Pointer to Info1542 (srvsvc_NetSrvInfo1542)",hf_srvsvc_srvsvc_NetSrvInfo_info1542);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1542_info1542_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1542_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1542(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1542_info1542,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1542(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1542,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1543_info1543(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1543(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, srvsvc_dissect_element_NetSrvInfo_val1543_info1543_, NDR_POINTER_UNIQUE, "Pointer to Info1543 (srvsvc_NetSrvInfo1543)",hf_srvsvc_srvsvc_NetSrvInfo_val1543_info1543);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1543_, NDR_POINTER_UNIQUE, "Pointer to Info1543 (srvsvc_NetSrvInfo1543)",hf_srvsvc_srvsvc_NetSrvInfo_info1543);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1543_info1543_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1543_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1543(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1543_info1543,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1543(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1543,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1544_info1544(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1544(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, srvsvc_dissect_element_NetSrvInfo_val1544_info1544_, NDR_POINTER_UNIQUE, "Pointer to Info1544 (srvsvc_NetSrvInfo1544)",hf_srvsvc_srvsvc_NetSrvInfo_val1544_info1544);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1544_, NDR_POINTER_UNIQUE, "Pointer to Info1544 (srvsvc_NetSrvInfo1544)",hf_srvsvc_srvsvc_NetSrvInfo_info1544);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1544_info1544_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1544_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1544(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1544_info1544,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1544(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1544,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1545_info1545(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1545(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, srvsvc_dissect_element_NetSrvInfo_val1545_info1545_, NDR_POINTER_UNIQUE, "Pointer to Info1545 (srvsvc_NetSrvInfo1545)",hf_srvsvc_srvsvc_NetSrvInfo_val1545_info1545);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1545_, NDR_POINTER_UNIQUE, "Pointer to Info1545 (srvsvc_NetSrvInfo1545)",hf_srvsvc_srvsvc_NetSrvInfo_info1545);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1545_info1545_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1545_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1545(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1545_info1545,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1545(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1545,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1546_info1546(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1546(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, srvsvc_dissect_element_NetSrvInfo_val1546_info1546_, NDR_POINTER_UNIQUE, "Pointer to Info1546 (srvsvc_NetSrvInfo1546)",hf_srvsvc_srvsvc_NetSrvInfo_val1546_info1546);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1546_, NDR_POINTER_UNIQUE, "Pointer to Info1546 (srvsvc_NetSrvInfo1546)",hf_srvsvc_srvsvc_NetSrvInfo_info1546);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1546_info1546_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1546_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1546(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1546_info1546,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1546(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1546,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1547_info1547(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1547(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, srvsvc_dissect_element_NetSrvInfo_val1547_info1547_, NDR_POINTER_UNIQUE, "Pointer to Info1547 (srvsvc_NetSrvInfo1547)",hf_srvsvc_srvsvc_NetSrvInfo_val1547_info1547);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1547_, NDR_POINTER_UNIQUE, "Pointer to Info1547 (srvsvc_NetSrvInfo1547)",hf_srvsvc_srvsvc_NetSrvInfo_info1547);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1547_info1547_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1547_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1547(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1547_info1547,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1547(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1547,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1548_info1548(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1548(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, srvsvc_dissect_element_NetSrvInfo_val1548_info1548_, NDR_POINTER_UNIQUE, "Pointer to Info1548 (srvsvc_NetSrvInfo1548)",hf_srvsvc_srvsvc_NetSrvInfo_val1548_info1548);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1548_, NDR_POINTER_UNIQUE, "Pointer to Info1548 (srvsvc_NetSrvInfo1548)",hf_srvsvc_srvsvc_NetSrvInfo_info1548);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1548_info1548_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1548_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1548(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1548_info1548,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1548(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1548,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1549_info1549(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1549(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, srvsvc_dissect_element_NetSrvInfo_val1549_info1549_, NDR_POINTER_UNIQUE, "Pointer to Info1549 (srvsvc_NetSrvInfo1549)",hf_srvsvc_srvsvc_NetSrvInfo_val1549_info1549);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1549_, NDR_POINTER_UNIQUE, "Pointer to Info1549 (srvsvc_NetSrvInfo1549)",hf_srvsvc_srvsvc_NetSrvInfo_info1549);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1549_info1549_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1549_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1549(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1549_info1549,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1549(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1549,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1550_info1550(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1550(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, srvsvc_dissect_element_NetSrvInfo_val1550_info1550_, NDR_POINTER_UNIQUE, "Pointer to Info1550 (srvsvc_NetSrvInfo1550)",hf_srvsvc_srvsvc_NetSrvInfo_val1550_info1550);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1550_, NDR_POINTER_UNIQUE, "Pointer to Info1550 (srvsvc_NetSrvInfo1550)",hf_srvsvc_srvsvc_NetSrvInfo_info1550);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1550_info1550_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1550_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1550(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1550_info1550,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1550(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1550,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1552_info1552(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1552(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, srvsvc_dissect_element_NetSrvInfo_val1552_info1552_, NDR_POINTER_UNIQUE, "Pointer to Info1552 (srvsvc_NetSrvInfo1552)",hf_srvsvc_srvsvc_NetSrvInfo_val1552_info1552);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1552_, NDR_POINTER_UNIQUE, "Pointer to Info1552 (srvsvc_NetSrvInfo1552)",hf_srvsvc_srvsvc_NetSrvInfo_info1552);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1552_info1552_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1552_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1552(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1552_info1552,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1552(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1552,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1553_info1553(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1553(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, srvsvc_dissect_element_NetSrvInfo_val1553_info1553_, NDR_POINTER_UNIQUE, "Pointer to Info1553 (srvsvc_NetSrvInfo1553)",hf_srvsvc_srvsvc_NetSrvInfo_val1553_info1553);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1553_, NDR_POINTER_UNIQUE, "Pointer to Info1553 (srvsvc_NetSrvInfo1553)",hf_srvsvc_srvsvc_NetSrvInfo_info1553);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1553_info1553_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1553_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1553(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1553_info1553,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1553(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1553,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1554_info1554(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1554(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, srvsvc_dissect_element_NetSrvInfo_val1554_info1554_, NDR_POINTER_UNIQUE, "Pointer to Info1554 (srvsvc_NetSrvInfo1554)",hf_srvsvc_srvsvc_NetSrvInfo_val1554_info1554);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1554_, NDR_POINTER_UNIQUE, "Pointer to Info1554 (srvsvc_NetSrvInfo1554)",hf_srvsvc_srvsvc_NetSrvInfo_info1554);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1554_info1554_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1554_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1554(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1554_info1554,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1554(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1554,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1555_info1555(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1555(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, srvsvc_dissect_element_NetSrvInfo_val1555_info1555_, NDR_POINTER_UNIQUE, "Pointer to Info1555 (srvsvc_NetSrvInfo1555)",hf_srvsvc_srvsvc_NetSrvInfo_val1555_info1555);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1555_, NDR_POINTER_UNIQUE, "Pointer to Info1555 (srvsvc_NetSrvInfo1555)",hf_srvsvc_srvsvc_NetSrvInfo_info1555);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1555_info1555_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1555_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1555(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1555_info1555,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1555(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1555,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1556_info1556(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1556(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, srvsvc_dissect_element_NetSrvInfo_val1556_info1556_, NDR_POINTER_UNIQUE, "Pointer to Info1556 (srvsvc_NetSrvInfo1556)",hf_srvsvc_srvsvc_NetSrvInfo_val1556_info1556);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetSrvInfo_info1556_, NDR_POINTER_UNIQUE, "Pointer to Info1556 (srvsvc_NetSrvInfo1556)",hf_srvsvc_srvsvc_NetSrvInfo_info1556);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetSrvInfo_val1556_info1556_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetSrvInfo_info1556_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetSrvInfo1556(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_val1556_info1556,0);
+       offset = srvsvc_dissect_struct_NetSrvInfo1556(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetSrvInfo_info1556,0);
 
        return offset;
 }
@@ -13303,239 +13303,239 @@ srvsvc_dissect_NetSrvInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 
        switch(level) {
                case 100:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val100_info100(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info100(tvb, offset, pinfo, tree, drep);
                break;
 
                case 101:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val101_info101(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info101(tvb, offset, pinfo, tree, drep);
                break;
 
                case 102:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val102_info102(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info102(tvb, offset, pinfo, tree, drep);
                break;
 
                case 402:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val402_info402(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info402(tvb, offset, pinfo, tree, drep);
                break;
 
                case 403:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val403_info403(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info403(tvb, offset, pinfo, tree, drep);
                break;
 
                case 502:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val502_info502(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info502(tvb, offset, pinfo, tree, drep);
                break;
 
                case 503:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val503_info503(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info503(tvb, offset, pinfo, tree, drep);
                break;
 
                case 599:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val599_info599(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info599(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1005:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1005_info1005(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1005(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1010:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1010_info1010(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1010(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1016:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1016_info1016(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1016(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1017:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1017_info1017(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1017(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1018:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1018_info1018(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1018(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1107:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1107_info1107(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1107(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1501:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1501_info1501(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1501(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1502:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1502_info1502(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1502(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1503:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1503_info1503(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1503(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1506:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1506_info1506(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1506(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1509:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1509_info1509(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1509(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1510:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1510_info1510(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1510(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1511:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1511_info1511(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1511(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1512:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1512_info1512(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1512(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1513:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1513_info1513(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1513(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1514:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1514_info1514(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1514(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1515:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1515_info1515(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1515(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1516:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1516_info1516(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1516(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1518:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1518_info1518(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1518(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1520:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1520_info1520(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1520(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1521:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1521_info1521(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1521(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1522:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1522_info1522(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1522(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1523:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1523_info1523(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1523(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1524:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1524_info1524(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1524(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1525:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1525_info1525(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1525(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1528:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1528_info1528(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1528(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1529:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1529_info1529(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1529(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1530:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1530_info1530(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1530(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1533:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1533_info1533(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1533(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1534:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1534_info1534(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1534(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1535:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1535_info1535(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1535(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1536:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1536_info1536(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1536(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1537:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1537_info1537(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1537(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1538:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1538_info1538(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1538(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1539:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1539_info1539(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1539(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1540:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1540_info1540(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1540(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1541:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1541_info1541(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1541(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1542:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1542_info1542(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1542(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1543:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1543_info1543(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1543(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1544:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1544_info1544(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1544(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1545:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1545_info1545(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1545(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1546:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1546_info1546(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1546(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1547:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1547_info1547(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1547(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1548:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1548_info1548(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1548(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1549:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1549_info1549(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1549(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1550:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1550_info1550(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1550(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1552:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1552_info1552(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1552(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1553:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1553_info1553(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1553(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1554:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1554_info1554(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1554(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1555:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1555_info1555(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1555(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1556:
-                       offset = srvsvc_dissect_element_NetSrvInfo_val1556_info1556(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetSrvInfo_info1556(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -14819,65 +14819,65 @@ srvsvc_dissect_struct_NetTransportCtr3(tvbuff_t *tvb _U_, int offset _U_, packet
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetTransportCtr_val0_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetTransportCtr_ctr0(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, srvsvc_dissect_element_NetTransportCtr_val0_ctr0_, NDR_POINTER_UNIQUE, "Pointer to Ctr0 (srvsvc_NetTransportCtr0)",hf_srvsvc_srvsvc_NetTransportCtr_val0_ctr0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetTransportCtr_ctr0_, NDR_POINTER_UNIQUE, "Pointer to Ctr0 (srvsvc_NetTransportCtr0)",hf_srvsvc_srvsvc_NetTransportCtr_ctr0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetTransportCtr_val0_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetTransportCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetTransportCtr0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetTransportCtr_val0_ctr0,0);
+       offset = srvsvc_dissect_struct_NetTransportCtr0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetTransportCtr_ctr0,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetTransportCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetTransportCtr_ctr1(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, srvsvc_dissect_element_NetTransportCtr_val1_ctr1_, NDR_POINTER_UNIQUE, "Pointer to Ctr1 (srvsvc_NetTransportCtr1)",hf_srvsvc_srvsvc_NetTransportCtr_val1_ctr1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetTransportCtr_ctr1_, NDR_POINTER_UNIQUE, "Pointer to Ctr1 (srvsvc_NetTransportCtr1)",hf_srvsvc_srvsvc_NetTransportCtr_ctr1);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetTransportCtr_val1_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetTransportCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetTransportCtr1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetTransportCtr_val1_ctr1,0);
+       offset = srvsvc_dissect_struct_NetTransportCtr1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetTransportCtr_ctr1,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetTransportCtr_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetTransportCtr_ctr2(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, srvsvc_dissect_element_NetTransportCtr_val2_ctr2_, NDR_POINTER_UNIQUE, "Pointer to Ctr2 (srvsvc_NetTransportCtr2)",hf_srvsvc_srvsvc_NetTransportCtr_val2_ctr2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetTransportCtr_ctr2_, NDR_POINTER_UNIQUE, "Pointer to Ctr2 (srvsvc_NetTransportCtr2)",hf_srvsvc_srvsvc_NetTransportCtr_ctr2);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetTransportCtr_val2_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetTransportCtr_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetTransportCtr2(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetTransportCtr_val2_ctr2,0);
+       offset = srvsvc_dissect_struct_NetTransportCtr2(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetTransportCtr_ctr2,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetTransportCtr_val3_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetTransportCtr_ctr3(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, srvsvc_dissect_element_NetTransportCtr_val3_ctr3_, NDR_POINTER_UNIQUE, "Pointer to Ctr3 (srvsvc_NetTransportCtr3)",hf_srvsvc_srvsvc_NetTransportCtr_val3_ctr3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_element_NetTransportCtr_ctr3_, NDR_POINTER_UNIQUE, "Pointer to Ctr3 (srvsvc_NetTransportCtr3)",hf_srvsvc_srvsvc_NetTransportCtr_ctr3);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetTransportCtr_val3_ctr3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetTransportCtr_ctr3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetTransportCtr3(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetTransportCtr_val3_ctr3,0);
+       offset = srvsvc_dissect_struct_NetTransportCtr3(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetTransportCtr_ctr3,0);
 
        return offset;
 }
@@ -14901,19 +14901,19 @@ srvsvc_dissect_NetTransportCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 
        switch(level) {
                case 0:
-                       offset = srvsvc_dissect_element_NetTransportCtr_val0_ctr0(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetTransportCtr_ctr0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = srvsvc_dissect_element_NetTransportCtr_val1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetTransportCtr_ctr1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = srvsvc_dissect_element_NetTransportCtr_val2_ctr2(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetTransportCtr_ctr2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = srvsvc_dissect_element_NetTransportCtr_val3_ctr3(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetTransportCtr_ctr3(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -15152,33 +15152,33 @@ srvsvc_dissect_struct_NetRemoteTODInfo(tvbuff_t *tvb _U_, int offset _U_, packet
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetTransportInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetTransportInfo_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetTransportInfo0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetTransportInfo_val0_info0,0);
+       offset = srvsvc_dissect_struct_NetTransportInfo0(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetTransportInfo_info0,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetTransportInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetTransportInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetTransportInfo1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetTransportInfo_val1_info1,0);
+       offset = srvsvc_dissect_struct_NetTransportInfo1(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetTransportInfo_info1,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetTransportInfo_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetTransportInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetTransportInfo2(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetTransportInfo_val2_info2,0);
+       offset = srvsvc_dissect_struct_NetTransportInfo2(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetTransportInfo_info2,0);
 
        return offset;
 }
 
 static int
-srvsvc_dissect_element_NetTransportInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+srvsvc_dissect_element_NetTransportInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = srvsvc_dissect_struct_NetTransportInfo3(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetTransportInfo_val3_info3,0);
+       offset = srvsvc_dissect_struct_NetTransportInfo3(tvb,offset,pinfo,tree,drep,hf_srvsvc_srvsvc_NetTransportInfo_info3,0);
 
        return offset;
 }
@@ -15202,19 +15202,19 @@ srvsvc_dissect_NetTransportInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 
        switch(level) {
                case 0:
-                       offset = srvsvc_dissect_element_NetTransportInfo_val0_info0(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetTransportInfo_info0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = srvsvc_dissect_element_NetTransportInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetTransportInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = srvsvc_dissect_element_NetTransportInfo_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetTransportInfo_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = srvsvc_dissect_element_NetTransportInfo_val3_info3(tvb, offset, pinfo, tree, drep);
+                       offset = srvsvc_dissect_element_NetTransportInfo_info3(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -19800,14 +19800,14 @@ void proto_register_dcerpc_srvsvc(void)
        static hf_register_info hf[] = {
        { &hf_srvsvc_srvsvc_NetDiskInfo0_disk,
          { "Disk", "srvsvc.srvsvc_NetDiskInfo0.disk", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1107_info1107,
-         { "Info1107", "srvsvc.srvsvc_NetSrvInfo_val1107.info1107", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetConnInfo1_user,
          { "User", "srvsvc.srvsvc_NetConnInfo1.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareInfo_val1007_info1007,
-         { "Info1007", "srvsvc.srvsvc_NetShareInfo_val1007.info1007", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportCtr1_count,
          { "Count", "srvsvc.srvsvc_NetTransportCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1536,
+         { "Info1536", "srvsvc.srvsvc_NetSrvInfo.info1536", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareInfo_info502,
+         { "Info502", "srvsvc.srvsvc_NetShareInfo.info502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetFileEnum_resume_handle,
          { "Resume Handle", "srvsvc.srvsvc_NetFileEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_threadcountadd,
@@ -19816,14 +19816,10 @@ void proto_register_dcerpc_srvsvc(void)
          { "Hunds", "srvsvc.srvsvc_NetRemoteTODInfo.hunds", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareAdd_level,
          { "Level", "srvsvc.srvsvc_NetShareAdd.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1537_info1537,
-         { "Info1537", "srvsvc.srvsvc_NetSrvInfo_val1537.info1537", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareDelCommit_hnd,
          { "Hnd", "srvsvc.srvsvc_NetShareDelCommit.hnd", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_networkerrortreshold,
          { "Networkerrortreshold", "srvsvc.srvsvc_NetSrvInfo599.networkerrortreshold", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1016_info1016,
-         { "Info1016", "srvsvc.srvsvc_NetSrvInfo_val1016.info1016", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetServerTransportAddEx_server_unc,
          { "Server Unc", "srvsvc.srvsvc_NetServerTransportAddEx.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_maxkeepcomplsearch,
@@ -19834,6 +19830,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Mins", "srvsvc.srvsvc_NetRemoteTODInfo.mins", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo403_accessalert,
          { "Accessalert", "srvsvc.srvsvc_NetSrvInfo403.accessalert", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetTransportInfo_info0,
+         { "Info0", "srvsvc.srvsvc_NetTransportInfo.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_initsesstable,
          { "Initsesstable", "srvsvc.srvsvc_NetSrvInfo599.initsesstable", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessInfo1_num_open,
@@ -19842,8 +19840,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Maxrawbuflen", "srvsvc.srvsvc_NetSrvInfo1509.maxrawbuflen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_sesssvc,
          { "Sesssvc", "srvsvc.srvsvc_NetSrvInfo599.sesssvc", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1553_info1553,
-         { "Info1553", "srvsvc.srvsvc_NetSrvInfo_val1553.info1553", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareCtr_ctr1007,
+         { "Ctr1007", "srvsvc.srvsvc_NetShareCtr.ctr1007", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevQCtr1_count,
          { "Count", "srvsvc.srvsvc_NetCharDevQCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareSetInfo_share_name,
@@ -19854,8 +19852,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Ctr", "srvsvc.srvsvc_NetFileInfoCtr.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportInfo3_vcs,
          { "Vcs", "srvsvc.srvsvc_NetTransportInfo3.vcs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1501_info1501,
-         { "Info1501", "srvsvc.srvsvc_NetSrvInfo_val1501.info1501", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_minfreeconnections,
          { "Minfreeconnections", "srvsvc.srvsvc_NetSrvInfo599.minfreeconnections", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetPRNameCompare_server_unc,
@@ -19864,6 +19860,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Maxfreeconnections", "srvsvc.srvsvc_NetSrvInfo599.maxfreeconnections", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_Statistics_bytessent_low,
          { "Bytessent Low", "srvsvc.srvsvc_Statistics.bytessent_low", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1529,
+         { "Info1529", "srvsvc.srvsvc_NetSrvInfo.info1529", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo403_alertsched,
          { "Alertsched", "srvsvc.srvsvc_NetSrvInfo403.alertsched", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetDiskInfo0___disk_length,
@@ -19872,8 +19870,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Numfiletasks", "srvsvc.srvsvc_NetSrvInfo402.numfiletasks", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_diskspacetreshold,
          { "Diskspacetreshold", "srvsvc.srvsvc_NetSrvInfo599.diskspacetreshold", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetTransportInfo_val1_info1,
-         { "Info1", "srvsvc.srvsvc_NetTransportInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo102_announce,
          { "Announce", "srvsvc.srvsvc_NetSrvInfo102.announce", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_accessalert,
@@ -19884,8 +19880,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Server Unc", "srvsvc.srvsvc_NetShareEnum.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportCtr1_array,
          { "Array", "srvsvc.srvsvc_NetTransportCtr1.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1522_info1522,
-         { "Info1522", "srvsvc.srvsvc_NetSrvInfo_val1522.info1522", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareInfo_info1501,
+         { "Info1501", "srvsvc.srvsvc_NetShareInfo.info1501", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportInfo3_name,
          { "Name", "srvsvc.srvsvc_NetTransportInfo3.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetFileInfoCtr_level,
@@ -19900,22 +19896,18 @@ void proto_register_dcerpc_srvsvc(void)
          { "Linkinfovalidtime", "srvsvc.srvsvc_NetSrvInfo1554.linkinfovalidtime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessInfo2_user_flags,
          { "User Flags", "srvsvc.srvsvc_NetSessInfo2.user_flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1545_info1545,
-         { "Info1545", "srvsvc.srvsvc_NetSrvInfo_val1545.info1545", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_maxlinkdelay,
          { "Maxlinkdelay", "srvsvc.srvsvc_NetSrvInfo599.maxlinkdelay", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessCtr2_count,
          { "Count", "srvsvc.srvsvc_NetSessCtr2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1540_enablesharednetdrives,
          { "Enablesharednetdrives", "srvsvc.srvsvc_NetSrvInfo1540.enablesharednetdrives", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSessCtr_val2_ctr2,
-         { "Ctr2", "srvsvc.srvsvc_NetSessCtr_val2.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetFileInfo_info3,
+         { "Info3", "srvsvc.srvsvc_NetFileInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareInfo2_comment,
          { "Comment", "srvsvc.srvsvc_NetShareInfo2.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_Statistics_start,
          { "Start", "srvsvc.srvsvc_Statistics.start", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareInfo_val1006_info1006,
-         { "Info1006", "srvsvc.srvsvc_NetShareInfo_val1006.info1006", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareEnumAll_totalentries,
          { "Totalentries", "srvsvc.srvsvc_NetShareEnumAll.totalentries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessInfo502_user,
@@ -19928,6 +19920,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Sessconns", "srvsvc.srvsvc_NetSrvInfo599.sessconns", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_sesssvc,
          { "Sesssvc", "srvsvc.srvsvc_NetSrvInfo503.sesssvc", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetCharDevInfo_info1,
+         { "Info1", "srvsvc.srvsvc_NetCharDevInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetGetFileSecurity_sd_buf,
          { "Sd Buf", "srvsvc.srvsvc_NetGetFileSecurity.sd_buf", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetConnInfo0_conn_id,
@@ -19944,12 +19938,12 @@ void proto_register_dcerpc_srvsvc(void)
          { "Max Buffer", "srvsvc.srvsvc_NetShareEnumAll.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_minrcvqueue,
          { "Minrcvqueue", "srvsvc.srvsvc_NetSrvInfo503.minrcvqueue", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetTransportInfo_info1,
+         { "Info1", "srvsvc.srvsvc_NetTransportInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ENCRYPT_DATA,
          { "Share 1005 Encrypt Data", "srvsvc.NetShareInfo1005Flags.SHARE_1005_ENCRYPT_DATA", FT_BOOLEAN, 32, TFS(&NetShareInfo1005Flags_SHARE_1005_ENCRYPT_DATA_tfs), ( 0x00008000 ), NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_threadcountadd,
          { "Threadcountadd", "srvsvc.srvsvc_NetSrvInfo503.threadcountadd", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1502_info1502,
-         { "Info1502", "srvsvc.srvsvc_NetSrvInfo_val1502.info1502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetFileInfo3_user,
          { "User", "srvsvc.srvsvc_NetFileInfo3.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetRemoteTODInfo_weekday,
@@ -19966,48 +19960,56 @@ void proto_register_dcerpc_srvsvc(void)
          { "Server Unc", "srvsvc.srvsvc_NetTransportEnum.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1542_maxfreeconnections,
          { "Maxfreeconnections", "srvsvc.srvsvc_NetSrvInfo1542.maxfreeconnections", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1529_info1529,
-         { "Info1529", "srvsvc.srvsvc_NetSrvInfo_val1529.info1529", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_enableoplockforceclose,
          { "Enableoplockforceclose", "srvsvc.srvsvc_NetSrvInfo599.enableoplockforceclose", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvGetInfo_info,
          { "Info", "srvsvc.srvsvc_NetSrvGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetNameValidate_name,
          { "Name", "srvsvc.srvsvc_NetNameValidate.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1511,
+         { "Info1511", "srvsvc.srvsvc_NetSrvInfo.info1511", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareCtr_ctr501,
+         { "Ctr501", "srvsvc.srvsvc_NetShareCtr.ctr501", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportInfo0_addr,
          { "Addr", "srvsvc.srvsvc_NetTransportInfo0.addr", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_opensearch,
          { "Opensearch", "srvsvc.srvsvc_NetSrvInfo599.opensearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetFileCtr3_array,
          { "Array", "srvsvc.srvsvc_NetFileCtr3.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSessCtr_ctr0,
+         { "Ctr0", "srvsvc.srvsvc_NetSessCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1552_maxlinkdelay,
          { "Maxlinkdelay", "srvsvc.srvsvc_NetSrvInfo1552.maxlinkdelay", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_maxkeepcomplsearch,
          { "Maxkeepcomplsearch", "srvsvc.srvsvc_NetSrvInfo599.maxkeepcomplsearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_enablefcbopens,
          { "Enablefcbopens", "srvsvc.srvsvc_NetSrvInfo503.enablefcbopens", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1017_info1017,
-         { "Info1017", "srvsvc.srvsvc_NetSrvInfo_val1017.info1017", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo102_version_minor,
          { "Version Minor", "srvsvc.srvsvc_NetSrvInfo102.version_minor", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetConnCtr_val0_ctr0,
-         { "Ctr0", "srvsvc.srvsvc_NetConnCtr_val0.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1501,
+         { "Info1501", "srvsvc.srvsvc_NetSrvInfo.info1501", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetDiskEnum_totalentries,
          { "Totalentries", "srvsvc.srvsvc_NetDiskEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1107,
+         { "Info1107", "srvsvc.srvsvc_NetSrvInfo.info1107", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1520,
+         { "Info1520", "srvsvc.srvsvc_NetSrvInfo.info1520", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_FORCE_LEVELII_OPLOCK,
          { "Share 1005 Force Levelii Oplock", "srvsvc.NetShareInfo1005Flags.SHARE_1005_FORCE_LEVELII_OPLOCK", FT_BOOLEAN, 32, TFS(&NetShareInfo1005Flags_SHARE_1005_FORCE_LEVELII_OPLOCK_tfs), ( 0x00001000 ), NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetCharDevInfo_info0,
+         { "Info0", "srvsvc.srvsvc_NetCharDevInfo.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareInfo1006_max_users,
          { "Max Users", "srvsvc.srvsvc_NetShareInfo1006.max_users", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_openfiles,
          { "Openfiles", "srvsvc.srvsvc_NetSrvInfo402.openfiles", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo502_rawworkitems,
          { "Rawworkitems", "srvsvc.srvsvc_NetSrvInfo502.rawworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareInfo_val1_info1,
-         { "Info1", "srvsvc.srvsvc_NetShareInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_oplockbreakresponsewait,
          { "Oplockbreakresponsewait", "srvsvc.srvsvc_NetSrvInfo599.oplockbreakresponsewait", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevQEnum_totalentries,
          { "Totalentries", "srvsvc.srvsvc_NetCharDevQEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info502,
+         { "Info502", "srvsvc.srvsvc_NetSrvInfo.info502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_initworkitems,
          { "Initworkitems", "srvsvc.srvsvc_NetSrvInfo503.initworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportAdd_level,
@@ -20020,8 +20022,10 @@ void proto_register_dcerpc_srvsvc(void)
          { "Server Unc", "srvsvc.srvsvc_NetFileEnum.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSetServiceBits_updateimmediately,
          { "Updateimmediately", "srvsvc.srvsvc_NetSetServiceBits.updateimmediately", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1556_info1556,
-         { "Info1556", "srvsvc.srvsvc_NetSrvInfo_val1556.info1556", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1537,
+         { "Info1537", "srvsvc.srvsvc_NetSrvInfo.info1537", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1534,
+         { "Info1534", "srvsvc.srvsvc_NetSrvInfo.info1534", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1525_maxkeepcomplsearch,
          { "Maxkeepcomplsearch", "srvsvc.srvsvc_NetSrvInfo1525.maxkeepcomplsearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetFileCtr3_count,
@@ -20030,8 +20034,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Device Name", "srvsvc.srvsvc_NetShareCheck.device_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetFileEnum_totalentries,
          { "Totalentries", "srvsvc.srvsvc_NetFileEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1512_info1512,
-         { "Info1512", "srvsvc.srvsvc_NetSrvInfo_val1512.info1512", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1528,
+         { "Info1528", "srvsvc.srvsvc_NetSrvInfo.info1528", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_scavtimeout,
          { "Scavtimeout", "srvsvc.srvsvc_NetSrvInfo503.scavtimeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_guestaccount,
@@ -20048,20 +20052,16 @@ void proto_register_dcerpc_srvsvc(void)
          { "Alertsched", "srvsvc.srvsvc_NetSrvInfo402.alertsched", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1529_minrcvqueue,
          { "Minrcvqueue", "srvsvc.srvsvc_NetSrvInfo1529.minrcvqueue", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSessCtr_val1_ctr1,
-         { "Ctr1", "srvsvc.srvsvc_NetSessCtr_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_erroralert,
          { "Erroralert", "srvsvc.srvsvc_NetSrvInfo402.erroralert", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetConnInfo1_share,
          { "Share", "srvsvc.srvsvc_NetConnInfo1.share", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info599,
+         { "Info599", "srvsvc.srvsvc_NetSrvInfo.info599", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_maxcopywritelen,
          { "Maxcopywritelen", "srvsvc.srvsvc_NetSrvInfo503.maxcopywritelen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareCtr_val2_ctr2,
-         { "Ctr2", "srvsvc.srvsvc_NetShareCtr_val2.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareSetInfo_info,
          { "Info", "srvsvc.srvsvc_NetShareSetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1544_info1544,
-         { "Info1544", "srvsvc.srvsvc_NetSrvInfo_val1544.info1544", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessInfo502_num_open,
          { "Num Open", "srvsvc.srvsvc_NetSessInfo502.num_open", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetGetFileSecurity_share,
@@ -20070,10 +20070,12 @@ void proto_register_dcerpc_srvsvc(void)
          { "Enablesharednetdrives", "srvsvc.srvsvc_NetSrvInfo503.enablesharednetdrives", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_maxcopyreadlen,
          { "Maxcopyreadlen", "srvsvc.srvsvc_NetSrvInfo503.maxcopyreadlen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1509,
+         { "Info1509", "srvsvc.srvsvc_NetSrvInfo.info1509", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessInfo1_client,
          { "Client", "srvsvc.srvsvc_NetSessInfo1.client", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareCtr_val1_ctr1,
-         { "Ctr1", "srvsvc.srvsvc_NetShareCtr_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1540,
+         { "Info1540", "srvsvc.srvsvc_NetSrvInfo.info1540", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareInfo1005_dfs_flags,
          { "Dfs Flags", "srvsvc.srvsvc_NetShareInfo1005.dfs_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_sessusers,
@@ -20082,8 +20084,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Device", "srvsvc.srvsvc_NetCharDevInfo0.device", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportInfo3_domain,
          { "Domain", "srvsvc.srvsvc_NetTransportInfo3.domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val403_info403,
-         { "Info403", "srvsvc.srvsvc_NetSrvInfo_val403.info403", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo403_chdevjobs,
          { "Chdevjobs", "srvsvc.srvsvc_NetSrvInfo403.chdevjobs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_threadpriority,
@@ -20106,8 +20106,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Array", "srvsvc.srvsvc_NetCharDevCtr0.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_alerts,
          { "Alerts", "srvsvc.srvsvc_NetSrvInfo402.alerts", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1503_info1503,
-         { "Info1503", "srvsvc.srvsvc_NetSrvInfo_val1503.info1503", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_maxpagedmemoryusage,
          { "Maxpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo503.maxpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo101_comment,
@@ -20116,32 +20114,30 @@ void proto_register_dcerpc_srvsvc(void)
          { "Maxworkitemidletime", "srvsvc.srvsvc_NetSrvInfo1556.maxworkitemidletime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareDelStart_hnd,
          { "Hnd", "srvsvc.srvsvc_NetShareDelStart.hnd", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info403,
+         { "Info403", "srvsvc.srvsvc_NetSrvInfo.info403", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareInfo501_csc_policy,
          { "Csc Policy", "srvsvc.srvsvc_NetShareInfo501.csc_policy", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportInfo1_addr_len,
          { "Addr Len", "srvsvc.srvsvc_NetTransportInfo1.addr_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1520_info1520,
-         { "Info1520", "srvsvc.srvsvc_NetSrvInfo_val1520.info1520", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSetServiceBits_server_unc,
          { "Server Unc", "srvsvc.srvsvc_NetSetServiceBits.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_srvheuristics,
          { "Srvheuristics", "srvsvc.srvsvc_NetSrvInfo402.srvheuristics", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo102_version_major,
          { "Version Major", "srvsvc.srvsvc_NetSrvInfo102.version_major", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareCtr_ctr1004,
+         { "Ctr1004", "srvsvc.srvsvc_NetShareCtr.ctr1004", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ENABLE_CA,
          { "Share 1005 Enable Ca", "srvsvc.NetShareInfo1005Flags.SHARE_1005_ENABLE_CA", FT_BOOLEAN, 32, TFS(&NetShareInfo1005Flags_SHARE_1005_ENABLE_CA_tfs), ( 0x00004000 ), NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1510,
+         { "Info1510", "srvsvc.srvsvc_NetSrvInfo.info1510", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetFileInfo_info2,
+         { "Info2", "srvsvc.srvsvc_NetFileInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvGetInfo_level,
          { "Level", "srvsvc.srvsvc_NetSrvGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareDelSticky_share_name,
          { "Share Name", "srvsvc.srvsvc_NetShareDelSticky.share_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetCharDevQInfo_val1_info1,
-         { "Info1", "srvsvc.srvsvc_NetCharDevQInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1513_info1513,
-         { "Info1513", "srvsvc.srvsvc_NetSrvInfo_val1513.info1513", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val102_info102,
-         { "Info102", "srvsvc.srvsvc_NetSrvInfo_val102.info102", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetConnCtr_val1_ctr1,
-         { "Ctr1", "srvsvc.srvsvc_NetConnCtr_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetConnEnum_totalentries,
          { "Totalentries", "srvsvc.srvsvc_NetConnEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareCtr501_count,
@@ -20164,10 +20160,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Initconntable", "srvsvc.srvsvc_NetSrvInfo1544.initconntable", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportAdd_server_unc,
          { "Server Unc", "srvsvc.srvsvc_NetTransportAdd.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val502_info502,
-         { "Info502", "srvsvc.srvsvc_NetSrvInfo_val502.info502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1538_info1538,
-         { "Info1538", "srvsvc.srvsvc_NetSrvInfo_val1538.info1538", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareDelStart_reserved,
          { "Reserved", "srvsvc.srvsvc_NetShareDelStart.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetNameValidate_server_unc,
@@ -20178,8 +20170,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Array", "srvsvc.srvsvc_NetShareCtr1.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareInfo501_type,
          { "Type", "srvsvc.srvsvc_NetShareInfo501.type", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_ShareType_vals), 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1535_info1535,
-         { "Info1535", "srvsvc.srvsvc_NetSrvInfo_val1535.info1535", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetConnEnum_max_buffer,
          { "Max Buffer", "srvsvc.srvsvc_NetConnEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_minfreeworkitems,
@@ -20200,8 +20190,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Maxaudits", "srvsvc.srvsvc_NetSrvInfo402.maxaudits", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetConnInfoCtr_level,
          { "Level", "srvsvc.srvsvc_NetConnInfoCtr.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1018_info1018,
-         { "Info1018", "srvsvc.srvsvc_NetSrvInfo_val1018.info1018", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_timesource,
          { "Timesource", "srvsvc.srvsvc_NetSrvInfo503.timesource", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessDel_client,
@@ -20218,6 +20206,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Server Unc", "srvsvc.srvsvc_NetCharDevQSetInfo.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1534_oplockbreakwait,
          { "Oplockbreakwait", "srvsvc.srvsvc_NetSrvInfo1534.oplockbreakwait", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareInfo_info0,
+         { "Info0", "srvsvc.srvsvc_NetShareInfo.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetRemoteTODInfo_secs,
          { "Secs", "srvsvc.srvsvc_NetRemoteTODInfo.secs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareInfo1007_flags,
@@ -20240,8 +20230,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Server Unc", "srvsvc.srvsvc_NetRemoteTOD.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportInfo0_addr_len,
          { "Addr Len", "srvsvc.srvsvc_NetTransportInfo0.addr_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1010_info1010,
-         { "Info1010", "srvsvc.srvsvc_NetSrvInfo_val1010.info1010", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_maxcopyreadlen,
          { "Maxcopyreadlen", "srvsvc.srvsvc_NetSrvInfo599.maxcopyreadlen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevQInfo0_device,
@@ -20256,6 +20244,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Parm Error", "srvsvc.srvsvc_NetShareSetInfo.parm_error", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo102_platform_id,
          { "Platform Id", "srvsvc.srvsvc_NetSrvInfo102.platform_id", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_PlatformId_vals), 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSessCtr_ctr10,
+         { "Ctr10", "srvsvc.srvsvc_NetSessCtr.ctr10", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo101_version_minor,
          { "Version Minor", "srvsvc.srvsvc_NetSrvInfo101.version_minor", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevQSetInfo_parm_error,
@@ -20272,12 +20262,12 @@ void proto_register_dcerpc_srvsvc(void)
          { "Acceptdownlevelapis", "srvsvc.srvsvc_NetSrvInfo599.acceptdownlevelapis", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_security,
          { "Security", "srvsvc.srvsvc_NetSrvInfo402.security", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val599_info599,
-         { "Info599", "srvsvc.srvsvc_NetSrvInfo_val599.info599", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetConnInfo1_conn_id,
          { "Conn Id", "srvsvc.srvsvc_NetConnInfo1.conn_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessInfo502_user_flags,
          { "User Flags", "srvsvc.srvsvc_NetSessInfo502.user_flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1502,
+         { "Info1502", "srvsvc.srvsvc_NetSrvInfo.info1502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1541_minfreeconnections,
          { "Minfreeconnections", "srvsvc.srvsvc_NetSrvInfo1541.minfreeconnections", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_linkinfovalidtime,
@@ -20286,10 +20276,10 @@ void proto_register_dcerpc_srvsvc(void)
          { "Share 1005 Csc Cache Auto Reint", "srvsvc.NetShareInfo1005Flags.SHARE_1005_CSC_CACHE_AUTO_REINT", FT_BOOLEAN, 32, TFS(&NetShareInfo1005Flags_SHARE_1005_CSC_CACHE_AUTO_REINT_tfs), ( 0x00000010 ), NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo403_sessreqs,
          { "Sessreqs", "srvsvc.srvsvc_NetSrvInfo403.sessreqs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1546_info1546,
-         { "Info1546", "srvsvc.srvsvc_NetSrvInfo_val1546.info1546", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareAdd_parm_error,
          { "Parm Error", "srvsvc.srvsvc_NetShareAdd.parm_error", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info100,
+         { "Info100", "srvsvc.srvsvc_NetSrvInfo.info100", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareCtr502_count,
          { "Count", "srvsvc.srvsvc_NetShareCtr502.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1514_enablesoftcompat,
@@ -20298,8 +20288,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Minlinkthroughput", "srvsvc.srvsvc_NetSrvInfo599.minlinkthroughput", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_updateimmediately,
          { "Updateimmediately", "srvsvc.srvsvc_NetServerSetServiceBitsEx.updateimmediately", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareInfo_val1005_info1005,
-         { "Info1005", "srvsvc.srvsvc_NetShareInfo_val1005.info1005", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetConnInfo1_conn_time,
          { "Conn Time", "srvsvc.srvsvc_NetConnInfo1.conn_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1543_initsesstable,
@@ -20310,8 +20298,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Level", "srvsvc.srvsvc_NetCharDevGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_Statistics_stimeouts,
          { "Stimeouts", "srvsvc.srvsvc_Statistics.stimeouts", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1534_info1534,
-         { "Info1534", "srvsvc.srvsvc_NetSrvInfo_val1534.info1534", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_sessopen,
          { "Sessopen", "srvsvc.srvsvc_NetSrvInfo599.sessopen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_Statistics_bytessent_high,
@@ -20334,22 +20320,20 @@ void proto_register_dcerpc_srvsvc(void)
          { "Maxpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo502.maxpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessInfo10_client,
          { "Client", "srvsvc.srvsvc_NetSessInfo10.client", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetTransportCtr_ctr0,
+         { "Ctr0", "srvsvc.srvsvc_NetTransportCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevQPurge_queue_name,
          { "Queue Name", "srvsvc.srvsvc_NetCharDevQPurge.queue_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetFileInfo_val3_info3,
-         { "Info3", "srvsvc.srvsvc_NetFileInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_Statistics_jobsqueued,
          { "Jobsqueued", "srvsvc.srvsvc_Statistics.jobsqueued", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetTransportInfo_val3_info3,
-         { "Info3", "srvsvc.srvsvc_NetTransportInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareCtr_val501_ctr501,
-         { "Ctr501", "srvsvc.srvsvc_NetShareCtr_val501.ctr501", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1550,
+         { "Info1550", "srvsvc.srvsvc_NetSrvInfo.info1550", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareInfo_info1007,
+         { "Info1007", "srvsvc.srvsvc_NetShareInfo.info1007", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevQGetInfo_server_unc,
          { "Server Unc", "srvsvc.srvsvc_NetCharDevQGetInfo.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1530_info1530,
-         { "Info1530", "srvsvc.srvsvc_NetSrvInfo_val1530.info1530", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetFileInfo_val2_info2,
-         { "Info2", "srvsvc.srvsvc_NetFileInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1513,
+         { "Info1513", "srvsvc.srvsvc_NetSrvInfo.info1513", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSetFileSecurity_file,
          { "File", "srvsvc.srvsvc_NetSetFileSecurity.file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_activelocks,
@@ -20358,8 +20342,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Addr", "srvsvc.srvsvc_NetTransportInfo2.addr", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo102_anndelta,
          { "Anndelta", "srvsvc.srvsvc_NetSrvInfo102.anndelta", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSessCtr_val10_ctr10,
-         { "Ctr10", "srvsvc.srvsvc_NetSessCtr_val10.ctr10", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetFileGetInfo_server_unc,
          { "Server Unc", "srvsvc.srvsvc_NetFileGetInfo.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportInfo2_unknown,
@@ -20384,18 +20366,18 @@ void proto_register_dcerpc_srvsvc(void)
          { "Glist Mtime", "srvsvc.srvsvc_NetSrvInfo403.glist_mtime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareInfo502_comment,
          { "Comment", "srvsvc.srvsvc_NetShareInfo502.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1528_info1528,
-         { "Info1528", "srvsvc.srvsvc_NetSrvInfo_val1528.info1528", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1552,
+         { "Info1552", "srvsvc.srvsvc_NetSrvInfo.info1552", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareCtr1004_count,
          { "Count", "srvsvc.srvsvc_NetShareCtr1004.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_minkeepcomplsearch,
          { "Minkeepcomplsearch", "srvsvc.srvsvc_NetSrvInfo599.minkeepcomplsearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetConnInfo1_conn_type,
          { "Conn Type", "srvsvc.srvsvc_NetConnInfo1.conn_type", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1533_info1533,
-         { "Info1533", "srvsvc.srvsvc_NetSrvInfo_val1533.info1533", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetRemoteTODInfo_year,
          { "Year", "srvsvc.srvsvc_NetRemoteTODInfo.year", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetTransportCtr_ctr1,
+         { "Ctr1", "srvsvc.srvsvc_NetTransportCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetFileInfo2_fid,
          { "Fid", "srvsvc.srvsvc_NetFileInfo2.fid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevInfo1_time,
@@ -20404,8 +20386,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Prefix", "srvsvc.srvsvc_NetPathCanonicalize.prefix", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_Statistics_syserrors,
          { "Syserrors", "srvsvc.srvsvc_Statistics.syserrors", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareInfo_val1004_info1004,
-         { "Info1004", "srvsvc.srvsvc_NetShareInfo_val1004.info1004", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareCtr_ctr0,
+         { "Ctr0", "srvsvc.srvsvc_NetShareCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetPathCanonicalize_path,
          { "Path", "srvsvc.srvsvc_NetPathCanonicalize.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevQSetInfo_level,
@@ -20426,34 +20408,26 @@ void proto_register_dcerpc_srvsvc(void)
          { "Info", "srvsvc.srvsvc_NetShareGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetDiskEnum_level,
          { "Level", "srvsvc.srvsvc_NetDiskEnum.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1547_info1547,
-         { "Info1547", "srvsvc.srvsvc_NetSrvInfo_val1547.info1547", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_minfreeworkitems,
          { "Minfreeworkitems", "srvsvc.srvsvc_NetSrvInfo503.minfreeworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_connections,
          { "Connections", "srvsvc.srvsvc_NetSrvInfo402.connections", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareInfo_val1501_info1501,
-         { "Info1501", "srvsvc.srvsvc_NetShareInfo_val1501.info1501", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetCharDevQCtr_ctr1,
+         { "Ctr1", "srvsvc.srvsvc_NetCharDevQCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_maxfreeconnections,
          { "Maxfreeconnections", "srvsvc.srvsvc_NetSrvInfo503.maxfreeconnections", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_lanmask,
          { "Lanmask", "srvsvc.srvsvc_NetSrvInfo402.lanmask", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareCtr_val502_ctr502,
-         { "Ctr502", "srvsvc.srvsvc_NetShareCtr_val502.ctr502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareEnum_totalentries,
          { "Totalentries", "srvsvc.srvsvc_NetShareEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessInfo10_idle_time,
          { "Idle Time", "srvsvc.srvsvc_NetSessInfo10.idle_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareInfo_val2_info2,
-         { "Info2", "srvsvc.srvsvc_NetShareInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSetServiceBits_transport,
          { "Transport", "srvsvc.srvsvc_NetSetServiceBits.transport", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_emulated_server_unc,
          { "Emulated Server Unc", "srvsvc.srvsvc_NetServerSetServiceBitsEx.emulated_server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetRemoteTODInfo_tinterval,
          { "Tinterval", "srvsvc.srvsvc_NetRemoteTODInfo.tinterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1549_info1549,
-         { "Info1549", "srvsvc.srvsvc_NetSrvInfo_val1549.info1549", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1536_enableoplocks,
          { "Enableoplocks", "srvsvc.srvsvc_NetSrvInfo1536.enableoplocks", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetRemoteTODInfo_hours,
@@ -20468,24 +20442,30 @@ void proto_register_dcerpc_srvsvc(void)
          { "Domain", "srvsvc.srvsvc_NetSrvInfo599.domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_opensearch,
          { "Opensearch", "srvsvc.srvsvc_NetSrvInfo402.opensearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val402_info402,
-         { "Info402", "srvsvc.srvsvc_NetSrvInfo_val402.info402", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareCtr_ctr1006,
+         { "Ctr1006", "srvsvc.srvsvc_NetShareCtr.ctr1006", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportEnum_max_buffer,
          { "Max Buffer", "srvsvc.srvsvc_NetTransportEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareAdd_info,
          { "Info", "srvsvc.srvsvc_NetShareAdd.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportCtr0_array,
          { "Array", "srvsvc.srvsvc_NetTransportCtr0.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetConnCtr_ctr1,
+         { "Ctr1", "srvsvc.srvsvc_NetConnCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevQSetInfo_queue_name,
          { "Queue Name", "srvsvc.srvsvc_NetCharDevQSetInfo.queue_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo100_server_name,
          { "Server Name", "srvsvc.srvsvc_NetSrvInfo100.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareEnum_max_buffer,
          { "Max Buffer", "srvsvc.srvsvc_NetShareEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1535,
+         { "Info1535", "srvsvc.srvsvc_NetSrvInfo.info1535", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessInfo1_time,
          { "Time", "srvsvc.srvsvc_NetSessInfo1.time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSetFileSecurity_sd_buf,
          { "Sd Buf", "srvsvc.srvsvc_NetSetFileSecurity.sd_buf", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1521,
+         { "Info1521", "srvsvc.srvsvc_NetSrvInfo.info1521", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareGetInfo_level,
          { "Level", "srvsvc.srvsvc_NetShareGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessInfo10_time,
@@ -20506,8 +20486,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Operation", "srvsvc.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetConnCtr1_array,
          { "Array", "srvsvc.srvsvc_NetConnCtr1.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1510_info1510,
-         { "Info1510", "srvsvc.srvsvc_NetSrvInfo_val1510.info1510", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareCtr1006_count,
          { "Count", "srvsvc.srvsvc_NetShareCtr1006.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareCheck_type,
@@ -20520,14 +20498,16 @@ void proto_register_dcerpc_srvsvc(void)
          { "Diskalert", "srvsvc.srvsvc_NetSrvInfo403.diskalert", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo102_server_type,
          { "Server Type", "srvsvc.srvsvc_NetSrvInfo102.server_type", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1542,
+         { "Info1542", "srvsvc.srvsvc_NetSrvInfo.info1542", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1512,
+         { "Info1512", "srvsvc.srvsvc_NetSrvInfo.info1512", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_RESTRICT_EXCLUSIVE_OPENS,
          { "Share 1005 Restrict Exclusive Opens", "srvsvc.NetShareInfo1005Flags.SHARE_1005_RESTRICT_EXCLUSIVE_OPENS", FT_BOOLEAN, 32, TFS(&NetShareInfo1005Flags_SHARE_1005_RESTRICT_EXCLUSIVE_OPENS_tfs), ( 0x00000100 ), NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareCtr_val1007_ctr1007,
-         { "Ctr1007", "srvsvc.srvsvc_NetShareCtr_val1007.ctr1007", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1503,
+         { "Info1503", "srvsvc.srvsvc_NetSrvInfo.info1503", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessEnum_client,
          { "Client", "srvsvc.srvsvc_NetSessEnum.client", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetFileCtr_val2_ctr2,
-         { "Ctr2", "srvsvc.srvsvc_NetFileCtr_val2.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareCtr1_count,
          { "Count", "srvsvc.srvsvc_NetShareCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportDel_info0,
@@ -20536,10 +20516,12 @@ void proto_register_dcerpc_srvsvc(void)
          { "Array", "srvsvc.srvsvc_NetConnCtr0.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ALLOW_NAMESPACE_CACHING,
          { "Share 1005 Allow Namespace Caching", "srvsvc.NetShareInfo1005Flags.SHARE_1005_ALLOW_NAMESPACE_CACHING", FT_BOOLEAN, 32, TFS(&NetShareInfo1005Flags_SHARE_1005_ALLOW_NAMESPACE_CACHING_tfs), ( 0x00000400 ), NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareCtr_ctr502,
+         { "Ctr502", "srvsvc.srvsvc_NetShareCtr.ctr502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo403_ulist_mtime,
          { "Ulist Mtime", "srvsvc.srvsvc_NetSrvInfo403.ulist_mtime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareInfo_val501_info501,
-         { "Info501", "srvsvc.srvsvc_NetShareInfo_val501.info501", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareInfo_info1006,
+         { "Info1006", "srvsvc.srvsvc_NetShareInfo.info1006", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareInfo1_type,
          { "Type", "srvsvc.srvsvc_NetShareInfo1.type", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_ShareType_vals), 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevEnum_totalentries,
@@ -20552,8 +20534,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "User", "srvsvc.srvsvc_NetSessInfo1.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetFileGetInfo_level,
          { "Level", "srvsvc.srvsvc_NetFileGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1005_info1005,
-         { "Info1005", "srvsvc.srvsvc_NetSrvInfo_val1005.info1005", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1543,
+         { "Info1543", "srvsvc.srvsvc_NetSrvInfo.info1543", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_maxrawbuflen,
          { "Maxrawbuflen", "srvsvc.srvsvc_NetSrvInfo599.maxrawbuflen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo403_opensearch,
@@ -20576,14 +20558,16 @@ void proto_register_dcerpc_srvsvc(void)
          { "Info", "srvsvc.srvsvc_NetSrvSetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_Statistics_serrorout,
          { "Serrorout", "srvsvc.srvsvc_Statistics.serrorout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1552_info1552,
-         { "Info1552", "srvsvc.srvsvc_NetSrvInfo_val1552.info1552", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1005_comment,
          { "Comment", "srvsvc.srvsvc_NetSrvInfo1005.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_Statistics_sopens,
          { "Sopens", "srvsvc.srvsvc_Statistics.sopens", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetFileCtr_val3_ctr3,
-         { "Ctr3", "srvsvc.srvsvc_NetFileCtr_val3.ctr3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1544,
+         { "Info1544", "srvsvc.srvsvc_NetSrvInfo.info1544", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1010,
+         { "Info1010", "srvsvc.srvsvc_NetSrvInfo.info1010", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1515,
+         { "Info1515", "srvsvc.srvsvc_NetSrvInfo.info1515", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_numbigbufs,
          { "Numbigbufs", "srvsvc.srvsvc_NetSrvInfo402.numbigbufs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportInfo3_addr,
@@ -20604,6 +20588,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "File", "srvsvc.srvsvc_NetGetFileSecurity.file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_ulist_mtime,
          { "Ulist Mtime", "srvsvc.srvsvc_NetSrvInfo402.ulist_mtime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1522,
+         { "Info1522", "srvsvc.srvsvc_NetSrvInfo.info1522", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevEnum_info_ctr,
          { "Info Ctr", "srvsvc.srvsvc_NetCharDevEnum.info_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo101_version_major,
@@ -20616,8 +20602,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Enablesoftcompat", "srvsvc.srvsvc_NetSrvInfo599.enablesoftcompat", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_xactmemsize,
          { "Xactmemsize", "srvsvc.srvsvc_NetSrvInfo599.xactmemsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1540_info1540,
-         { "Info1540", "srvsvc.srvsvc_NetSrvInfo_val1540.info1540", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareGetInfo_server_unc,
          { "Server Unc", "srvsvc.srvsvc_NetShareGetInfo.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetPRNameCompare_name2,
@@ -20630,6 +20614,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Oplockbreakwait", "srvsvc.srvsvc_NetSrvInfo503.oplockbreakwait", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareDelSticky_server_unc,
          { "Server Unc", "srvsvc.srvsvc_NetShareDelSticky.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1524,
+         { "Info1524", "srvsvc.srvsvc_NetSrvInfo.info1524", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevQInfoCtr_level,
          { "Level", "srvsvc.srvsvc_NetCharDevQInfoCtr.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetConnInfoCtr_ctr,
@@ -20638,12 +20624,16 @@ void proto_register_dcerpc_srvsvc(void)
          { "Maxaudits", "srvsvc.srvsvc_NetSrvInfo403.maxaudits", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetDiskEnum_info,
          { "Info", "srvsvc.srvsvc_NetDiskEnum.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetFileCtr_ctr2,
+         { "Ctr2", "srvsvc.srvsvc_NetFileCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSetFileSecurity_securityinformation,
          { "Securityinformation", "srvsvc.srvsvc_NetSetFileSecurity.securityinformation", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareInfo_info2,
+         { "Info2", "srvsvc.srvsvc_NetShareInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1525,
+         { "Info1525", "srvsvc.srvsvc_NetSrvInfo.info1525", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1539_enableraw,
          { "Enableraw", "srvsvc.srvsvc_NetSrvInfo1539.enableraw", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1539_info1539,
-         { "Info1539", "srvsvc.srvsvc_NetSrvInfo_val1539.info1539", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo403_alist_mtime,
          { "Alist Mtime", "srvsvc.srvsvc_NetSrvInfo403.alist_mtime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1515_enableforcedlogoff,
@@ -20652,16 +20642,16 @@ void proto_register_dcerpc_srvsvc(void)
          { "Device Name", "srvsvc.srvsvc_NetCharDevGetInfo.device_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetFileCtr2_array,
          { "Array", "srvsvc.srvsvc_NetFileCtr2.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1518_info1518,
-         { "Info1518", "srvsvc.srvsvc_NetSrvInfo_val1518.info1518", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1516,
+         { "Info1516", "srvsvc.srvsvc_NetSrvInfo.info1516", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo102_licenses,
          { "Licenses", "srvsvc.srvsvc_NetSrvInfo102.licenses", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetConnEnum_resume_handle,
          { "Resume Handle", "srvsvc.srvsvc_NetConnEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetConnCtr_ctr0,
+         { "Ctr0", "srvsvc.srvsvc_NetConnCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo101_platform_id,
          { "Platform Id", "srvsvc.srvsvc_NetSrvInfo101.platform_id", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_PlatformId_vals), 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1554_info1554,
-         { "Info1554", "srvsvc.srvsvc_NetSrvInfo_val1554.info1554", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_chdevs,
          { "Chdevs", "srvsvc.srvsvc_NetSrvInfo402.chdevs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_maxnonpagedmemoryusage,
@@ -20672,8 +20662,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Pathtype", "srvsvc.srvsvc_NetPathCanonicalize.pathtype", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_sizereqbufs,
          { "Sizereqbufs", "srvsvc.srvsvc_NetSrvInfo503.sizereqbufs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1516_info1516,
-         { "Info1516", "srvsvc.srvsvc_NetSrvInfo_val1516.info1516", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1018,
+         { "Info1018", "srvsvc.srvsvc_NetSrvInfo.info1018", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportInfoCtr_ctr,
          { "Ctr", "srvsvc.srvsvc_NetTransportInfoCtr.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevInfo1_device,
@@ -20682,30 +20672,30 @@ void proto_register_dcerpc_srvsvc(void)
          { "Openfiles", "srvsvc.srvsvc_NetSrvInfo403.openfiles", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportInfo0_net_addr,
          { "Net Addr", "srvsvc.srvsvc_NetTransportInfo0.net_addr", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1550_info1550,
-         { "Info1550", "srvsvc.srvsvc_NetSrvInfo_val1550.info1550", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_shares,
          { "Shares", "srvsvc.srvsvc_NetSrvInfo402.shares", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_Statistics_pwerrors,
          { "Pwerrors", "srvsvc.srvsvc_Statistics.pwerrors", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1512_maxnonpagedmemoryusage,
          { "Maxnonpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo1512.maxnonpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1533,
+         { "Info1533", "srvsvc.srvsvc_NetSrvInfo.info1533", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo502_maxworkitems,
          { "Maxworkitems", "srvsvc.srvsvc_NetSrvInfo502.maxworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1509_info1509,
-         { "Info1509", "srvsvc.srvsvc_NetSrvInfo_val1509.info1509", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val100_info100,
-         { "Info100", "srvsvc.srvsvc_NetSrvInfo_val100.info100", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1549,
+         { "Info1549", "srvsvc.srvsvc_NetSrvInfo.info1549", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_numlockthreads,
          { "Numlockthreads", "srvsvc.srvsvc_NetSrvInfo599.numlockthreads", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info101,
+         { "Info101", "srvsvc.srvsvc_NetSrvInfo.info101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetPathCompare_pathtype,
          { "Pathtype", "srvsvc.srvsvc_NetPathCompare.pathtype", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1548_info1548,
-         { "Info1548", "srvsvc.srvsvc_NetSrvInfo_val1548.info1548", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareInfo_info1005,
+         { "Info1005", "srvsvc.srvsvc_NetShareInfo.info1005", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareCtr1007_count,
          { "Count", "srvsvc.srvsvc_NetShareCtr1007.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareCtr_val1004_ctr1004,
-         { "Ctr1004", "srvsvc.srvsvc_NetShareCtr_val1004.ctr1004", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1005,
+         { "Info1005", "srvsvc.srvsvc_NetSrvInfo.info1005", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetPathType_pathflags,
          { "Pathflags", "srvsvc.srvsvc_NetPathType.pathflags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_oplockbreakwait,
@@ -20714,8 +20704,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Array", "srvsvc.srvsvc_NetCharDevCtr1.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevQCtr0_array,
          { "Array", "srvsvc.srvsvc_NetCharDevQCtr0.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1511_info1511,
-         { "Info1511", "srvsvc.srvsvc_NetSrvInfo_val1511.info1511", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetServerTransportAddEx_info,
          { "Info", "srvsvc.srvsvc_NetServerTransportAddEx.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevQEnum_server_unc,
@@ -20730,32 +20718,30 @@ void proto_register_dcerpc_srvsvc(void)
          { "Num Open", "srvsvc.srvsvc_NetConnInfo1.num_open", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareInfo501_name,
          { "Name", "srvsvc.srvsvc_NetShareInfo501.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareInfo_info501,
+         { "Info501", "srvsvc.srvsvc_NetShareInfo.info501", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetPathCompare_path2,
          { "Path2", "srvsvc.srvsvc_NetPathCompare.path2", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareAdd_server_unc,
          { "Server Unc", "srvsvc.srvsvc_NetShareAdd.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetCharDevCtr_val0_ctr0,
-         { "Ctr0", "srvsvc.srvsvc_NetCharDevCtr_val0.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo502_maxnonpagedmemoryusage,
          { "Maxnonpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo502.maxnonpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessInfo2_client_type,
          { "Client Type", "srvsvc.srvsvc_NetSessInfo2.client_type", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1554,
+         { "Info1554", "srvsvc.srvsvc_NetSrvInfo.info1554", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_maxworkitemidletime,
          { "Maxworkitemidletime", "srvsvc.srvsvc_NetSrvInfo599.maxworkitemidletime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetPathType_path,
          { "Path", "srvsvc.srvsvc_NetPathType.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetTransportInfo_val2_info2,
-         { "Info2", "srvsvc.srvsvc_NetTransportInfo_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1523_info1523,
-         { "Info1523", "srvsvc.srvsvc_NetSrvInfo_val1523.info1523", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo102_users,
          { "Users", "srvsvc.srvsvc_NetSrvInfo102.users", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetTransportCtr_ctr2,
+         { "Ctr2", "srvsvc.srvsvc_NetTransportCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareInfo502_sd_buf,
          { "Sd Buf", "srvsvc.srvsvc_NetShareInfo502.sd_buf", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetFileEnum_info_ctr,
          { "Info Ctr", "srvsvc.srvsvc_NetFileEnum.info_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareInfo_val502_info502,
-         { "Info502", "srvsvc.srvsvc_NetShareInfo_val502.info502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_enableforcedlogoff,
          { "Enableforcedlogoff", "srvsvc.srvsvc_NetSrvInfo503.enableforcedlogoff", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessInfo2_time,
@@ -20778,6 +20764,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Numlockthreads", "srvsvc.srvsvc_NetSrvInfo503.numlockthreads", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo502_enableforcedlogoff,
          { "Enableforcedlogoff", "srvsvc.srvsvc_NetSrvInfo502.enableforcedlogoff", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetCharDevCtr_ctr1,
+         { "Ctr1", "srvsvc.srvsvc_NetCharDevCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_errortreshold,
          { "Errortreshold", "srvsvc.srvsvc_NetSrvInfo599.errortreshold", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessInfo1_user_flags,
@@ -20810,18 +20798,18 @@ void proto_register_dcerpc_srvsvc(void)
          { "Count", "srvsvc.srvsvc_NetConnCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1516_timesource,
          { "Timesource", "srvsvc.srvsvc_NetSrvInfo1516.timesource", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetTransportCtr_val1_ctr1,
-         { "Ctr1", "srvsvc.srvsvc_NetTransportCtr_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1506_info1506,
-         { "Info1506", "srvsvc.srvsvc_NetSrvInfo_val1506.info1506", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevQGetInfo_info,
          { "Info", "srvsvc.srvsvc_NetCharDevQGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1515_info1515,
-         { "Info1515", "srvsvc.srvsvc_NetSrvInfo_val1515.info1515", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareCtr_ctr1,
+         { "Ctr1", "srvsvc.srvsvc_NetShareCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info503,
+         { "Info503", "srvsvc.srvsvc_NetSrvInfo.info503", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_chdevqs,
          { "Chdevqs", "srvsvc.srvsvc_NetSrvInfo402.chdevqs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_rawworkitems,
          { "Rawworkitems", "srvsvc.srvsvc_NetSrvInfo503.rawworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1017,
+         { "Info1017", "srvsvc.srvsvc_NetSrvInfo.info1017", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportInfo3_unknown2,
          { "Unknown2", "srvsvc.srvsvc_NetTransportInfo3.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessInfo2_idle_time,
@@ -20838,8 +20826,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Server Unc", "srvsvc.srvsvc_NetCharDevQPurge.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetFileEnum_path,
          { "Path", "srvsvc.srvsvc_NetFileEnum.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val503_info503,
-         { "Info503", "srvsvc.srvsvc_NetSrvInfo_val503.info503", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_servicebits,
          { "Servicebits", "srvsvc.srvsvc_NetServerSetServiceBitsEx.servicebits", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessCtr0_array,
@@ -20850,22 +20836,26 @@ void proto_register_dcerpc_srvsvc(void)
          { "Server Unc", "srvsvc.srvsvc_NetServerSetServiceBitsEx.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetFileGetInfo_info,
          { "Info", "srvsvc.srvsvc_NetFileGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetCharDevQCtr_ctr0,
+         { "Ctr0", "srvsvc.srvsvc_NetCharDevQCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo403_connections,
          { "Connections", "srvsvc.srvsvc_NetSrvInfo403.connections", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_sizereqbufs,
          { "Sizereqbufs", "srvsvc.srvsvc_NetSrvInfo599.sizereqbufs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetFileCtr_ctr3,
+         { "Ctr3", "srvsvc.srvsvc_NetFileCtr.ctr3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_initfiletable,
          { "Initfiletable", "srvsvc.srvsvc_NetSrvInfo599.initfiletable", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1528_scavtimeout,
          { "Scavtimeout", "srvsvc.srvsvc_NetSrvInfo1528.scavtimeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevEnum_resume_handle,
          { "Resume Handle", "srvsvc.srvsvc_NetCharDevEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetCharDevInfo_val1_info1,
-         { "Info1", "srvsvc.srvsvc_NetCharDevInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetPathCanonicalize_server_unc,
          { "Server Unc", "srvsvc.srvsvc_NetPathCanonicalize.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareInfo2_password,
          { "Password", "srvsvc.srvsvc_NetShareInfo2.password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetCharDevCtr_ctr0,
+         { "Ctr0", "srvsvc.srvsvc_NetCharDevCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetFileClose_server_unc,
          { "Server Unc", "srvsvc.srvsvc_NetFileClose.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_lmannounce,
@@ -20880,28 +20870,30 @@ void proto_register_dcerpc_srvsvc(void)
          { "Num Open", "srvsvc.srvsvc_NetSessInfo2.num_open", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo101_server_name,
          { "Server Name", "srvsvc.srvsvc_NetSrvInfo101.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetTransportCtr_ctr3,
+         { "Ctr3", "srvsvc.srvsvc_NetTransportCtr.ctr3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareCtr2_count,
          { "Count", "srvsvc.srvsvc_NetShareCtr2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareInfo_val0_info0,
-         { "Info0", "srvsvc.srvsvc_NetShareInfo_val0.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1514_info1514,
-         { "Info1514", "srvsvc.srvsvc_NetSrvInfo_val1514.info1514", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1518,
+         { "Info1518", "srvsvc.srvsvc_NetSrvInfo.info1518", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_netioalert,
          { "Netioalert", "srvsvc.srvsvc_NetSrvInfo402.netioalert", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareInfo_info1004,
+         { "Info1004", "srvsvc.srvsvc_NetShareInfo.info1004", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_numadmin,
          { "Numadmin", "srvsvc.srvsvc_NetSrvInfo402.numadmin", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_lmannounce,
          { "Lmannounce", "srvsvc.srvsvc_NetSrvInfo599.lmannounce", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val101_info101,
-         { "Info101", "srvsvc.srvsvc_NetSrvInfo_val101.info101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_sizereqbufs,
          { "Sizereqbufs", "srvsvc.srvsvc_NetSrvInfo402.sizereqbufs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1542_info1542,
-         { "Info1542", "srvsvc.srvsvc_NetSrvInfo_val1542.info1542", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1523,
+         { "Info1523", "srvsvc.srvsvc_NetSrvInfo.info1523", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSetFileSecurity_share,
          { "Share", "srvsvc.srvsvc_NetSetFileSecurity.share", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo502_maxrawbuflen,
          { "Maxrawbuflen", "srvsvc.srvsvc_NetSrvInfo502.maxrawbuflen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1548,
+         { "Info1548", "srvsvc.srvsvc_NetSrvInfo.info1548", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetRemoteTOD_info,
          { "Info", "srvsvc.srvsvc_NetRemoteTOD.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessCtr1_count,
@@ -20928,14 +20920,20 @@ void proto_register_dcerpc_srvsvc(void)
          { "Initconntable", "srvsvc.srvsvc_NetSrvInfo599.initconntable", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareSetInfo_server_unc,
          { "Server Unc", "srvsvc.srvsvc_NetShareSetInfo.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1543_info1543,
-         { "Info1543", "srvsvc.srvsvc_NetSrvInfo_val1543.info1543", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1545,
+         { "Info1545", "srvsvc.srvsvc_NetSrvInfo.info1545", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1553,
+         { "Info1553", "srvsvc.srvsvc_NetSrvInfo.info1553", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessEnum_resume_handle,
          { "Resume Handle", "srvsvc.srvsvc_NetSessEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1514,
+         { "Info1514", "srvsvc.srvsvc_NetSrvInfo.info1514", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareSetInfo_level,
          { "Level", "srvsvc.srvsvc_NetShareSetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_Statistics_fopens,
          { "Fopens", "srvsvc.srvsvc_Statistics.fopens", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1016,
+         { "Info1016", "srvsvc.srvsvc_NetSrvInfo.info1016", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_maxworkitems,
          { "Maxworkitems", "srvsvc.srvsvc_NetSrvInfo599.maxworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetDiskInfo_count,
@@ -20944,18 +20942,16 @@ void proto_register_dcerpc_srvsvc(void)
          { "Glist Mtime", "srvsvc.srvsvc_NetSrvInfo402.glist_mtime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_Statistics_bigbufneed,
          { "Bigbufneed", "srvsvc.srvsvc_Statistics.bigbufneed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareCtr_ctr2,
+         { "Ctr2", "srvsvc.srvsvc_NetShareCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1510_sessusers,
          { "Sessusers", "srvsvc.srvsvc_NetSrvInfo1510.sessusers", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo502_enablesoftcompat,
          { "Enablesoftcompat", "srvsvc.srvsvc_NetSrvInfo502.enablesoftcompat", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetPathType_server_unc,
          { "Server Unc", "srvsvc.srvsvc_NetPathType.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1521_info1521,
-         { "Info1521", "srvsvc.srvsvc_NetSrvInfo_val1521.info1521", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1513_maxpagedmemoryusage,
          { "Maxpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo1513.maxpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1525_info1525,
-         { "Info1525", "srvsvc.srvsvc_NetSrvInfo_val1525.info1525", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetServerStatisticsGet_service,
          { "Service", "srvsvc.srvsvc_NetServerStatisticsGet.service", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportCtr3_array,
@@ -20968,8 +20964,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Activelocks", "srvsvc.srvsvc_NetSrvInfo403.activelocks", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetServerStatisticsGet_server_unc,
          { "Server Unc", "srvsvc.srvsvc_NetServerStatisticsGet.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetCharDevInfo_val0_info0,
-         { "Info0", "srvsvc.srvsvc_NetCharDevInfo_val0.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSessCtr_ctr502,
+         { "Ctr502", "srvsvc.srvsvc_NetSessCtr.ctr502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo403_netioalert,
          { "Netioalert", "srvsvc.srvsvc_NetSrvInfo403.netioalert", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1553_minlinkthroughput,
@@ -20988,8 +20984,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Minfreeworkitems", "srvsvc.srvsvc_NetSrvInfo1530.minfreeworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareInfo2_max_users,
          { "Max Users", "srvsvc.srvsvc_NetShareInfo2.max_users", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetTransportCtr_val3_ctr3,
-         { "Ctr3", "srvsvc.srvsvc_NetTransportCtr_val3.ctr3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportInfo2_domain,
          { "Domain", "srvsvc.srvsvc_NetTransportInfo2.domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareInfo2_type,
@@ -21012,26 +21006,18 @@ void proto_register_dcerpc_srvsvc(void)
          { "User", "srvsvc.srvsvc_NetCharDevInfo1.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo403_security,
          { "Security", "srvsvc.srvsvc_NetSrvInfo403.security", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSessCtr_val0_ctr0,
-         { "Ctr0", "srvsvc.srvsvc_NetSessCtr_val0.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevGetInfo_server_unc,
          { "Server Unc", "srvsvc.srvsvc_NetCharDevGetInfo.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareCtr_val1006_ctr1006,
-         { "Ctr1006", "srvsvc.srvsvc_NetShareCtr_val1006.ctr1006", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessDel_server_unc,
          { "Server Unc", "srvsvc.srvsvc_NetSessDel.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1547_alertsched,
          { "Alertsched", "srvsvc.srvsvc_NetSrvInfo1547.alertsched", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1546,
+         { "Info1546", "srvsvc.srvsvc_NetSrvInfo.info1546", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevQGetInfo_level,
          { "Level", "srvsvc.srvsvc_NetCharDevQGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetCharDevQCtr_val1_ctr1,
-         { "Ctr1", "srvsvc.srvsvc_NetCharDevQCtr_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1536_info1536,
-         { "Info1536", "srvsvc.srvsvc_NetSrvInfo_val1536.info1536", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_Statistics_avresponse,
          { "Avresponse", "srvsvc.srvsvc_Statistics.avresponse", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSessCtr_val502_ctr502,
-         { "Ctr502", "srvsvc.srvsvc_NetSessCtr_val502.ctr502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareDel_server_unc,
          { "Server Unc", "srvsvc.srvsvc_NetShareDel.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportInfo2_addr_len,
@@ -21050,16 +21036,14 @@ void proto_register_dcerpc_srvsvc(void)
          { "Sessopen", "srvsvc.srvsvc_NetSrvInfo403.sessopen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1107_users,
          { "Users", "srvsvc.srvsvc_NetSrvInfo1107.users", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1555_info1555,
-         { "Info1555", "srvsvc.srvsvc_NetSrvInfo_val1555.info1555", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_scavtimeout,
          { "Scavtimeout", "srvsvc.srvsvc_NetSrvInfo599.scavtimeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1520_maxcopyreadlen,
          { "Maxcopyreadlen", "srvsvc.srvsvc_NetSrvInfo1520.maxcopyreadlen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1506,
+         { "Info1506", "srvsvc.srvsvc_NetSrvInfo.info1506", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessInfo0_client,
          { "Client", "srvsvc.srvsvc_NetSessInfo0.client", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetTransportInfo_val0_info0,
-         { "Info0", "srvsvc.srvsvc_NetTransportInfo_val0.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_initsearchtable,
          { "Initsearchtable", "srvsvc.srvsvc_NetSrvInfo599.initsearchtable", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_maxworkitems,
@@ -21076,6 +21060,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Path", "srvsvc.srvsvc_NetShareInfo502.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetFileInfo3_fid,
          { "Fid", "srvsvc.srvsvc_NetFileInfo3.fid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1538,
+         { "Info1538", "srvsvc.srvsvc_NetSrvInfo.info1538", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportAdd_info,
          { "Info", "srvsvc.srvsvc_NetTransportAdd.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetDiskEnum_resume_handle,
@@ -21090,6 +21076,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Info Ctr", "srvsvc.srvsvc_NetShareEnum.info_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessCtr10_count,
          { "Count", "srvsvc.srvsvc_NetSessCtr10.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareCtr_ctr1005,
+         { "Ctr1005", "srvsvc.srvsvc_NetShareCtr.ctr1005", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportDel_level,
          { "Level", "srvsvc.srvsvc_NetTransportDel.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_sessconns,
@@ -21102,16 +21090,18 @@ void proto_register_dcerpc_srvsvc(void)
          { "Password", "srvsvc.srvsvc_NetShareInfo502.password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1521_maxcopywritelen,
          { "Maxcopywritelen", "srvsvc.srvsvc_NetSrvInfo1521.maxcopywritelen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1524_info1524,
-         { "Info1524", "srvsvc.srvsvc_NetSrvInfo_val1524.info1524", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetTransportCtr_val2_ctr2,
-         { "Ctr2", "srvsvc.srvsvc_NetTransportCtr_val2.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_minkeepsearch,
          { "Minkeepsearch", "srvsvc.srvsvc_NetSrvInfo599.minkeepsearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo403_srvheuristics,
          { "Srvheuristics", "srvsvc.srvsvc_NetSrvInfo403.srvheuristics", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetTransportInfo_info2,
+         { "Info2", "srvsvc.srvsvc_NetTransportInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo403_lanmask,
          { "Lanmask", "srvsvc.srvsvc_NetSrvInfo403.lanmask", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1541,
+         { "Info1541", "srvsvc.srvsvc_NetSrvInfo.info1541", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSessCtr_ctr2,
+         { "Ctr2", "srvsvc.srvsvc_NetSessCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareInfo1_comment,
          { "Comment", "srvsvc.srvsvc_NetShareInfo1.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessCtr502_count,
@@ -21122,26 +21112,26 @@ void proto_register_dcerpc_srvsvc(void)
          { "Current Users", "srvsvc.srvsvc_NetShareInfo502.current_users", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareInfoCtr_ctr,
          { "Ctr", "srvsvc.srvsvc_NetShareInfoCtr.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetTransportCtr_val0_ctr0,
-         { "Ctr0", "srvsvc.srvsvc_NetTransportCtr_val0.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetCharDevQInfo_info1,
+         { "Info1", "srvsvc.srvsvc_NetCharDevQInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessEnum_totalentries,
          { "Totalentries", "srvsvc.srvsvc_NetSessEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo403_chdevs,
          { "Chdevs", "srvsvc.srvsvc_NetSrvInfo403.chdevs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetCharDevCtr_val1_ctr1,
-         { "Ctr1", "srvsvc.srvsvc_NetCharDevCtr_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevEnum_max_buffer,
          { "Max Buffer", "srvsvc.srvsvc_NetCharDevEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info402,
+         { "Info402", "srvsvc.srvsvc_NetSrvInfo.info402", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetConnEnum_info_ctr,
          { "Info Ctr", "srvsvc.srvsvc_NetConnEnum.info_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportInfo2_name,
          { "Name", "srvsvc.srvsvc_NetTransportInfo2.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ACCESS_BASED_DIRECTORY_ENUM,
          { "Share 1005 Access Based Directory Enum", "srvsvc.NetShareInfo1005Flags.SHARE_1005_ACCESS_BASED_DIRECTORY_ENUM", FT_BOOLEAN, 32, TFS(&NetShareInfo1005Flags_SHARE_1005_ACCESS_BASED_DIRECTORY_ENUM_tfs), ( 0x00000800 ), NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetCharDevQInfo_val0_info0,
-         { "Info0", "srvsvc.srvsvc_NetCharDevQInfo_val0.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_enablesoftcompat,
          { "Enablesoftcompat", "srvsvc.srvsvc_NetSrvInfo503.enablesoftcompat", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetTransportInfo_info3,
+         { "Info3", "srvsvc.srvsvc_NetTransportInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetRemoteTODInfo_month,
          { "Month", "srvsvc.srvsvc_NetRemoteTODInfo.month", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo1501_sessopens,
@@ -21166,8 +21156,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Array", "srvsvc.srvsvc_NetSessCtr502.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetRemoteTODInfo_msecs,
          { "Msecs", "srvsvc.srvsvc_NetRemoteTODInfo.msecs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareCtr_val1005_ctr1005,
-         { "Ctr1005", "srvsvc.srvsvc_NetShareCtr_val1005.ctr1005", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_irpstacksize,
          { "Irpstacksize", "srvsvc.srvsvc_NetSrvInfo503.irpstacksize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo503_enableraw,
@@ -21180,24 +21168,22 @@ void proto_register_dcerpc_srvsvc(void)
          { "Ctr", "srvsvc.srvsvc_NetSessInfoCtr.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo403_sesssvc,
          { "Sesssvc", "srvsvc.srvsvc_NetSrvInfo403.sesssvc", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareCtr_val0_ctr0,
-         { "Ctr0", "srvsvc.srvsvc_NetShareCtr_val0.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetServerStatisticsGet_options,
          { "Options", "srvsvc.srvsvc_NetServerStatisticsGet.options", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_Statistics_bytesrcvd_high,
          { "Bytesrcvd High", "srvsvc.srvsvc_Statistics.bytesrcvd_high", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info102,
+         { "Info102", "srvsvc.srvsvc_NetSrvInfo.info102", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo403_numbigbufs,
          { "Numbigbufs", "srvsvc.srvsvc_NetSrvInfo403.numbigbufs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetPathCanonicalize_can_path,
          { "Can Path", "srvsvc.srvsvc_NetPathCanonicalize.can_path", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareInfo_info1,
+         { "Info1", "srvsvc.srvsvc_NetShareInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportEnum_totalentries,
          { "Totalentries", "srvsvc.srvsvc_NetTransportEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareCtr1007_array,
          { "Array", "srvsvc.srvsvc_NetShareCtr1007.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetCharDevQCtr_val0_ctr0,
-         { "Ctr0", "srvsvc.srvsvc_NetCharDevQCtr_val0.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetSrvInfo_val1541_info1541,
-         { "Info1541", "srvsvc.srvsvc_NetSrvInfo_val1541.info1541", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareEnumAll_resume_handle,
          { "Resume Handle", "srvsvc.srvsvc_NetShareEnumAll.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetPRNameCompare_flags,
@@ -21208,6 +21194,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Maxmpxct", "srvsvc.srvsvc_NetSrvInfo1533.maxmpxct", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_Statistics_devopens,
          { "Devopens", "srvsvc.srvsvc_Statistics.devopens", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1556,
+         { "Info1556", "srvsvc.srvsvc_NetSrvInfo.info1556", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevQEnum_max_buffer,
          { "Max Buffer", "srvsvc.srvsvc_NetCharDevQEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetConnEnum_path,
@@ -21234,8 +21222,6 @@ void proto_register_dcerpc_srvsvc(void)
          { "Initsearchtable", "srvsvc.srvsvc_NetSrvInfo1546.initsearchtable", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareCtr1005_count,
          { "Count", "srvsvc.srvsvc_NetShareCtr1005.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_srvsvc_srvsvc_NetShareCtr_val1501_ctr1501,
-         { "Ctr1501", "srvsvc.srvsvc_NetShareCtr_val1501.ctr1501", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareInfo2_path,
          { "Path", "srvsvc.srvsvc_NetShareInfo2.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessEnum_server_unc,
@@ -21272,12 +21258,16 @@ void proto_register_dcerpc_srvsvc(void)
          { "Opensearch", "srvsvc.srvsvc_NetSrvInfo1503.opensearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo102_userpath,
          { "Userpath", "srvsvc.srvsvc_NetSrvInfo102.userpath", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1555,
+         { "Info1555", "srvsvc.srvsvc_NetSrvInfo.info1555", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSessInfo10_user,
          { "User", "srvsvc.srvsvc_NetSessInfo10.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo599_alertsched,
          { "Alertsched", "srvsvc.srvsvc_NetSrvInfo599.alertsched", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetPathCompare_server_unc,
          { "Server Unc", "srvsvc.srvsvc_NetPathCompare.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1547,
+         { "Info1547", "srvsvc.srvsvc_NetSrvInfo.info1547", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevQEnum_info_ctr,
          { "Info Ctr", "srvsvc.srvsvc_NetCharDevQEnum.info_ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportInfo1_name,
@@ -21286,6 +21276,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Max Users", "srvsvc.srvsvc_NetShareInfo502.max_users", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo502_opensearch,
          { "Opensearch", "srvsvc.srvsvc_NetSrvInfo502.opensearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetCharDevQInfo_info0,
+         { "Info0", "srvsvc.srvsvc_NetCharDevQInfo.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo402_numreqbufs,
          { "Numreqbufs", "srvsvc.srvsvc_NetSrvInfo402.numreqbufs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_DFS_ROOT,
@@ -21294,6 +21286,10 @@ void proto_register_dcerpc_srvsvc(void)
          { "Share 1005 In Dfs", "srvsvc.NetShareInfo1005Flags.SHARE_1005_IN_DFS", FT_BOOLEAN, 32, TFS(&NetShareInfo1005Flags_SHARE_1005_IN_DFS_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo102_hidden,
          { "Hidden", "srvsvc.srvsvc_NetSrvInfo102.hidden", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetShareCtr_ctr1501,
+         { "Ctr1501", "srvsvc.srvsvc_NetShareCtr.ctr1501", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1539,
+         { "Info1539", "srvsvc.srvsvc_NetSrvInfo.info1539", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetShareInfo501_comment,
          { "Comment", "srvsvc.srvsvc_NetShareInfo501.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetTransportEnum_transports,
@@ -21306,6 +21302,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Oplockbreakresponsewait", "srvsvc.srvsvc_NetSrvInfo1535.oplockbreakresponsewait", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevQInfo1_users,
          { "Users", "srvsvc.srvsvc_NetCharDevQInfo1.users", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSessCtr_ctr1,
+         { "Ctr1", "srvsvc.srvsvc_NetSessCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo403_erroralert,
          { "Erroralert", "srvsvc.srvsvc_NetSrvInfo403.erroralert", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetCharDevQPurgeSelf_server_unc,
@@ -21320,6 +21318,8 @@ void proto_register_dcerpc_srvsvc(void)
          { "Array", "srvsvc.srvsvc_NetShareCtr502.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_srvsvc_srvsvc_NetSrvInfo403_numreqbufs,
          { "Numreqbufs", "srvsvc.srvsvc_NetSrvInfo403.numreqbufs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_srvsvc_srvsvc_NetSrvInfo_info1530,
+         { "Info1530", "srvsvc.srvsvc_NetSrvInfo.info1530", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        };
 
 

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-wkssvc.c b/bin/default/librpc/gen_ndr/packet-dcerpc-wkssvc.c
index 418e772f14317e255892f9aec8c4152a17782e6d..f23670540d1ee52a556757b00879829a9092e379 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-wkssvc.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-wkssvc.c
@@ -101,10 +101,8 @@ static gint hf_wkssvc_wkssvc_NetrUseInfo2_use_count = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo0_quality_of_service = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1045_pipe_maximum = -1;
 static gint hf_wkssvc_wkssvc_NetrUseInfo2_password = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1028_info1028 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1050_info1050 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1010_info1010 = -1;
 static gint hf_wkssvc_wkssvc_NetrJoinDomain2_join_flags = -1;
+static gint hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr1 = -1;
 static gint hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_level = -1;
 static gint hf_wkssvc_wkssvc_NetrUseEnum_entries_read = -1;
 static gint hf_wkssvc_wkssvc_NetrSetPrimaryComputername_EncryptedPassword = -1;
@@ -112,19 +110,21 @@ static gint hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_parm_err = -1;
 static gint hf_wkssvc_wkssvc_NetrUseEnum_info = -1;
 static gint hf_wkssvc_wkssvc_NetrSetPrimaryComputername_Account = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown14 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_user0 = -1;
 static gint hf_wkssvc_wkssvc_NetrGetJoinableOus_domain_name = -1;
 static gint hf_wkssvc_wkssvc_NetrUseInfo2_user_name = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo101_version_major = -1;
 static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo1_other_domains = -1;
 static gint hf_wkssvc_wkssvc_NetrGetJoinableOus_Account = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaTransportCtr_ctr0 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_dgram_event_reset_freq = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo102_lan_root = -1;
 static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo1_user_name = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info502 = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown32 = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown29 = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo_val0_info0 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1055_use_raw_write = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1054_info1054 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1051 = -1;
 static gint hf_wkssvc_wkssvc_NetrValidateName2_name = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_dormant_file_limit = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_maximum_collection_count = -1;
@@ -133,10 +133,8 @@ static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_write_raw_data = -1;
 static gint hf_wkssvc_wkssvc_NetrEnumerateComputerNames_Reserved = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_size_char_buf = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaTransportCtr0_array = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1046_info1046 = -1;
 static gint hf_wkssvc_wkssvc_NetrEnumerateComputerNames_name_type = -1;
 static gint hf_wkssvc_wkssvc_NetrUseAdd_parm_err = -1;
-static gint hf_wkssvc_wkssvc_NetrUseGetInfoCtr_val2_info2 = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown9 = -1;
 static gint hf_wkssvc_wkssvc_NetrGetJoinableOus2_num_ous = -1;
 static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain_server_name = -1;
@@ -146,24 +144,23 @@ static gint hf_wkssvc_wkssvc_NetWkstaGetInfo_level = -1;
 static gint hf_wkssvc_wkssvc_NetrUseInfo1_ref_count = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown4 = -1;
 static gint hf_wkssvc_wkssvc_NetrJoinDomain2_domain_name = -1;
+static gint hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr2 = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown3 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val100_info100 = -1;
 static gint hf_wkssvc_wkssvc_NetrJoinDomain_join_flags = -1;
 static gint hf_wkssvc_wkssvc_NetrUseDel_use_name = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_buf_files_deny_write = -1;
 static gint hf_wkssvc_wkssvc_NetrUseGetInfo_use_name = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1060 = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_unknown4 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1011_info1011 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1057 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo_level = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo0_name = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1056_info1056 = -1;
 static gint hf_wkssvc_wkssvc_NetrUseEnumCtr1_array = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown20 = -1;
 static gint hf_wkssvc_wkssvc_NetrUseEnum_server_name = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr1_entries_read = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown37 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1018_info1018 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1060_info1060 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1058 = -1;
 static gint hf_wkssvc_wkssvc_NetrUseGetInfo_server_name = -1;
 static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1043_lock_maximum = -1;
@@ -171,15 +168,16 @@ static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown24 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo102_domain_name = -1;
 static gint hf_wkssvc_wkssvc_NetrUseDel_force_cond = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaEnumUsers_resume_handle = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnumCtr_val0_ctr0 = -1;
 static gint hf_wkssvc_wkssvc_NetrUseEnumCtr0_count = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1053_utilize_nt_caching = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_num_srv_announce_buffers = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo100_platform_id = -1;
 static gint hf_wkssvc_wkssvc_NetrSetPrimaryComputername_primary_name = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown36 = -1;
+static gint hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info0 = -1;
 static gint hf_wkssvc_wkssvc_NetrUseGetInfo_ctr = -1;
 static gint hf_wkssvc_wkssvc_NetrUseInfo3_unknown2 = -1;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo_info1 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1048_use_opportunistic_locking = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown27 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo0_vc_count = -1;
@@ -191,18 +189,20 @@ static gint hf_wkssvc_wkssvc_NetWkstaEnumUsers_prefmaxlen = -1;
 static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo1_logon_domain = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown16 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_log_election_packets = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1052_info1052 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_raw_read = -1;
 static gint hf_wkssvc_wkssvc_NetrGetJoinableOus_unknown = -1;
 static gint hf_wkssvc_wkssvc_NetrSetPrimaryComputername_Reserved = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1027_errorlog_sz = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1052 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1012_maximum_collection_count = -1;
 static gint hf_wkssvc_wkssvc_NetrJoinDomain2_admin_account = -1;
+static gint hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr0 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1050_use_close_behind = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_unlock_behind = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaTransportCtr_val0_ctr0 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_user1 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo102_version_minor = -1;
 static gint hf_wkssvc_wkssvc_ComputerNamesCtr_count = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1048 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1018_session_timeout = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_keep_connection = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown31 = -1;
@@ -213,13 +213,13 @@ static gint hf_wkssvc_wkssvc_NetWkstaInfo1033_max_threads = -1;
 static gint hf_wkssvc_wkssvc_NetrUseAdd_level = -1;
 static gint hf_wkssvc_wkssvc_renameflags_WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown25 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1012_info1012 = -1;
 static gint hf_wkssvc_wkssvc_NetrUseDel_server_name = -1;
 static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo1_logon_server = -1;
 static gint hf_wkssvc_wkssvc_PasswordBuffer_data = -1;
 static gint hf_wkssvc_wkssvc_NetrUseInfo3_unknown1 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_cache_file_timeout = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_num_mailslot_buffers = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1055 = -1;
 static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain_password = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown13 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_utilize_nt_caching = -1;
@@ -234,7 +234,6 @@ static gint hf_wkssvc_wkssvc_NetrWkstaTransportDel_server_name = -1;
 static gint hf_wkssvc_wkssvc_NetrJoinDomain2_account_ou = -1;
 static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_DEFER_SPN = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1010_char_wait = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1061_info1061 = -1;
 static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain_RenameOptions = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaEnumUsers_server_name = -1;
 static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain_Account = -1;
@@ -242,53 +241,51 @@ static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown23 = -1;
 static gint hf_wkssvc_wkssvc_NetrUseEnumInfo_ctr = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersInfo_ctr = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr0_user0 = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnumCtr_val1_ctr1 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_buf_read_only_files = -1;
 static gint hf_wkssvc_wkssvc_NetrUnjoinDomain_server_name = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo101_lan_root = -1;
 static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_TYPE = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_buf_named_pipes = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1058_info1058 = -1;
 static gint hf_wkssvc_wkssvc_NetrUseInfo2_ref_count = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1044_pipe_increment = -1;
 static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_DOMAIN_JOIN_IF_JOINED = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val101_info101 = -1;
 static gint hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_AlternateMachineNameToRemove = -1;
-static gint hf_wkssvc_wkssvc_NetrUseGetInfoCtr_val0_info0 = -1;
 static gint hf_wkssvc_wkssvc_NetrUseEnumCtr2_array = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1013_info1013 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaGetInfo_info = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_max_illegal_dgram_events = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1047 = -1;
 static gint hf_wkssvc_wkssvc_NetrValidateName_Password = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1028_print_buf_time = -1;
+static gint hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info3 = -1;
 static gint hf_wkssvc_wkssvc_NetrGetJoinableOus2_Account = -1;
 static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_RenameOptions = -1;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo_info1101 = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown17 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1013 = -1;
 static gint hf_wkssvc_wkssvc_NetrValidateName2_server_name = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown34 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1018 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr0_entries_read = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1057_use_encryption = -1;
 static gint hf_wkssvc_wkssvc_NetrUseInfo1_status = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo0_wan_link = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown35 = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown7 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_val1_user1 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaSetInfo_parm_error = -1;
 static gint hf_wkssvc_wkssvc_NetrUseInfo0_remote = -1;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo_info0 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1060_force_core_create_mode = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1027_info1027 = -1;
 static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo0_user_name = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info101 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo0_address = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown39 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1044_info1044 = -1;
 static gint hf_wkssvc_wkssvc_NetrUseEnumCtr2_count = -1;
 static gint hf_wkssvc_wkssvc_NetrGetJoinInformation_name_buffer = -1;
 static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain_NewMachineName = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo_val1_info1 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_lock_maximum = -1;
 static gint hf_wkssvc_wkssvc_NetrUnjoinDomain_Account = -1;
 static gint hf_wkssvc_wkssvc_NetrWkstaUserGetInfo_level = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1042_info1042 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1049 = -1;
 static gint hf_wkssvc_wkssvc_NetrGetJoinableOus_num_ous = -1;
 static gint hf_wkssvc_wkssvc_NetrUseInfo2_asg_type = -1;
 static gint hf_wkssvc_wkssvc_NetrUseInfo1_password = -1;
@@ -297,11 +294,12 @@ static gint hf_wkssvc_wkssvc_NetWkstaInfo1054_use_raw_read = -1;
 static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_server_name = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1023_size_char_buf = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo100_domain_name = -1;
-static gint hf_wkssvc_wkssvc_NetrUseGetInfoCtr_val3_info3 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaTransportEnum_max_buffer = -1;
 static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_DC_ACCOUNT = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1042 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1045 = -1;
 static gint hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_unknown = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnumCtr_val2_ctr2 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1011 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1049_use_unlock_behind = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1062_read_ahead_throughput = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1056_use_write_raw_data = -1;
@@ -318,34 +316,36 @@ static gint hf_wkssvc_wkssvc_NetWkstaTransportEnum_total_entries = -1;
 static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_WIN9X_UPGRADE = -1;
 static gint hf_wkssvc_wkssvc_NetrValidateName2_EncryptedPassword = -1;
 static gint hf_wkssvc_wkssvc_NetrWkstaTransportDel_unknown3 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1062 = -1;
 static gint hf_wkssvc_wkssvc_NetrWkstaUserGetInfo_unknown = -1;
 static gint hf_wkssvc_wkssvc_NetrAddAlternateComputerName_server_name = -1;
 static gint hf_wkssvc_wkssvc_NetrJoinDomain2_server_name = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info102 = -1;
 static gint hf_wkssvc_wkssvc_NetrJoinDomain_Account = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1046_dormant_file_limit = -1;
 static gint hf_wkssvc_wkssvc_NetrWkstaTransportAdd_parm_err = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo102_version_major = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1062_info1062 = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown22 = -1;
 static gint hf_wkssvc_wkssvc_NetrUseInfo1_use_count = -1;
 static gint hf_wkssvc_wkssvc_NetrUnjoinDomain2_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1049_info1049 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_512_byte_max_transfer = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaTransportEnum_info = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1033 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1046 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaSetInfo_info = -1;
 static gint hf_wkssvc_wkssvc_NetrMessageBufferSend_message_sender_name = -1;
 static gint hf_wkssvc_wkssvc_NetrUseInfo1_remote = -1;
 static gint hf_wkssvc_wkssvc_NetrUseInfo2_domain_name = -1;
 static gint hf_wkssvc_wkssvc_NetrUseEnumCtr1_count = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1047_cache_file_timeout = -1;
+static gint hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info2 = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown30 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1028 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info100 = -1;
 static gint hf_wkssvc_wkssvc_NetrLogonDomainNameDel_domain_name = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1013_keep_connection = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo_val1101_info1101 = -1;
-static gint hf_wkssvc_wkssvc_NetrUseGetInfoCtr_val1_info1 = -1;
 static gint hf_wkssvc_wkssvc_NetrEnumerateComputerNames_server_name = -1;
 static gint hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_info = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1057_info1057 = -1;
 static gint hf_wkssvc_wkssvc_NetrMessageBufferSend_message_name = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_session_timeout = -1;
 static gint hf_wkssvc_wkssvc_NetrUseEnumCtr0_array = -1;
@@ -353,22 +353,23 @@ static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown6 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo_ctr = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_collection_time = -1;
 static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_IGNORE_UNSUPPORTED_FLAGS = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1054 = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown10 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1032_wrk_heuristics = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo101_version_minor = -1;
 static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_MACHINE_PWD_PASSED = -1;
 static gint hf_wkssvc_wkssvc_NetrWkstaTransportAdd_level = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown33 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1059_info1059 = -1;
 static gint hf_wkssvc_wkssvc_NetrEnumerateComputerNames_ctr = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaTransportEnum_server_name = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_max_threads = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1042_lock_increment = -1;
 static gint hf_wkssvc_wkssvc_NetrUseGetInfo_level = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1043_info1043 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1050 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_lock_increment = -1;
 static gint hf_wkssvc_wkssvc_NetrUseInfo2_local = -1;
 static gint hf_wkssvc_wkssvc_NetrValidateName_server_name = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1041 = -1;
 static gint hf_wkssvc_wkssvc_NetrUseInfo2_status = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown12 = -1;
 static gint hf_wkssvc_wkssvc_NetrJoinDomain_account_ou = -1;
@@ -376,20 +377,17 @@ static gint hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_unknown3 = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown19 = -1;
 static gint hf_wkssvc_wkssvc_NetrAddAlternateComputerName_EncryptedPassword = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1058_buf_files_deny_write = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1053_info1053 = -1;
 static gint hf_wkssvc_wkssvc_NetrUnjoinDomain2_account = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_unknown2 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1043 = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown21 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1023_info1023 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo102_server_name = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_encryption = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1032_info1032 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1055_info1055 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1059 = -1;
 static gint hf_wkssvc_wkssvc_NetrValidateName_name_type = -1;
 static gint hf_wkssvc_wkssvc_NetrMessageBufferSend_message_buffer = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaTransportCtr0_count = -1;
 static gint hf_wkssvc_wkssvc_NetrUseEnumInfo_level = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1047_info1047 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1041_lock_quota = -1;
 static gint hf_wkssvc_wkssvc_NetrUseAdd_ctr = -1;
 static gint hf_wkssvc_wkssvc_NetrUseEnum_resume_handle = -1;
@@ -397,13 +395,15 @@ static gint hf_wkssvc_wkssvc_NetWkstaInfo100_version_major = -1;
 static gint hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_Reserved = -1;
 static gint hf_wkssvc_wkssvc_NetrUseAdd_server_name = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown11 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1012 = -1;
 static gint hf_wkssvc_wkssvc_NetrUnjoinDomain_password = -1;
 static gint hf_wkssvc_wkssvc_NetrJoinDomain_password = -1;
 static gint hf_wkssvc_werror = -1;
 static gint hf_wkssvc_wkssvc_NetrGetJoinableOus2_domain_name = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_pipe_increment = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val102_info102 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1044 = -1;
 static gint hf_wkssvc_wkssvc_NetrGetJoinableOus2_EncryptedPassword = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1010 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1051_buf_named_pipes = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_read_ahead_throughput = -1;
 static gint hf_wkssvc_wkssvc_NetrGetJoinableOus_ous = -1;
@@ -423,10 +423,9 @@ static gint hf_wkssvc_opnum = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_force_core_create_mode = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1011_collection_time = -1;
 static gint hf_wkssvc_wkssvc_NetrGetJoinInformation_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1033_info1033 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val502_info502 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo101_domain_name = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1045_info1045 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1061 = -1;
+static gint hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info1 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersInfo_level = -1;
 static gint hf_wkssvc_wkssvc_NetrSetPrimaryComputername_server_name = -1;
 static gint hf_wkssvc_wkssvc_NetrUnjoinDomain_unjoin_flags = -1;
@@ -444,27 +443,28 @@ static gint hf_wkssvc_wkssvc_NetWkstaInfo100_server_name = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown28 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr1_user1 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaGetInfo_server_name = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1023 = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown15 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_lock_read_unlock = -1;
 static gint hf_wkssvc_wkssvc_NetrUseInfo1_asg_type = -1;
 static gint hf_wkssvc_wkssvc_NetrUnjoinDomain2_unjoin_flags = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_val0_user0 = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown1 = -1;
 static gint hf_wkssvc_wkssvc_NetrLogonDomainNameAdd_domain_name = -1;
 static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown26 = -1;
 static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_Account = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1051_info1051 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaEnumUsers_info = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1048_info1048 = -1;
 static gint hf_wkssvc_wkssvc_NetrGetJoinInformation_name_type = -1;
 static gint hf_wkssvc_wkssvc_NetrAddAlternateComputerName_NewAlternateMachineName = -1;
 static gint hf_wkssvc_wkssvc_NetrUnjoinDomain2_encrypted_password = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_pipe_maximum = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo502_char_wait = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1027 = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaInfo1052_use_lock_read_unlock = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1056 = -1;
 static gint hf_wkssvc_wkssvc_NetrValidateName_Account = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_val1041_info1041 = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1032 = -1;
 static gint hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_Account = -1;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1053 = -1;
 static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_EncryptedPassword = -1;
 static gint hf_wkssvc_wkssvc_NetWkstaSetInfo_level = -1;
 static gint hf_wkssvc_wkssvc_NetrJoinDomain_domain_name = -1;
@@ -577,78 +577,78 @@ static int wkssvc_dissect_element_NetWkstaInfo1059_buf_read_only_files(tvbuff_t
 static int wkssvc_dissect_element_NetWkstaInfo1060_force_core_create_mode(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetWkstaInfo1061_use_512_byte_max_transfer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetWkstaInfo1062_read_ahead_throughput(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val100_info100(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val100_info100_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val101_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val101_info101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val102_info102(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val102_info102_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val502_info502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val502_info502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1010_info1010(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1010_info1010_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1011_info1011(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1011_info1011_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1012_info1012(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1012_info1012_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1013_info1013(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1013_info1013_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1018_info1018(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1018_info1018_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1023_info1023(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1023_info1023_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1027_info1027(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1027_info1027_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1028_info1028(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1028_info1028_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1032_info1032(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1032_info1032_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1033_info1033(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1033_info1033_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1041_info1041(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1041_info1041_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1042_info1042(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1042_info1042_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1043_info1043(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1043_info1043_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1044_info1044(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1044_info1044_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1045_info1045(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1045_info1045_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1046_info1046(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1046_info1046_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1047_info1047(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1047_info1047_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1048_info1048(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1048_info1048_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1049_info1049(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1049_info1049_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1050_info1050(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1050_info1050_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1051_info1051(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1051_info1051_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1052_info1052(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1052_info1052_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1053_info1053(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1053_info1053_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1054_info1054(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1054_info1054_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1055_info1055(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1055_info1055_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1056_info1056(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1056_info1056_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1057_info1057(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1057_info1057_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1058_info1058(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1058_info1058_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1059_info1059(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1059_info1059_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1060_info1060(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1060_info1060_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1061_info1061(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1061_info1061_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1062_info1062(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaInfo_val1062_info1062_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info100(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info100_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info102(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info102_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1010(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1010_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1011(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1011_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1012(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1012_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1013(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1013_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1018(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1018_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1023(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1023_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1027(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1027_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1028(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1028_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1032(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1032_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1033(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1033_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1041(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1041_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1042(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1042_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1043(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1043_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1044(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1044_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1045(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1045_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1046(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1046_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1047(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1047_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1048(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1048_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1049(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1049_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1050(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1050_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1051(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1051_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1052(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1052_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1053(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1053_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1054(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1054_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1055(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1055_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1056(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1056_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1057(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1057_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1058(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1058_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1059(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1059_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1060(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1060_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1061(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1061_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1062(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaInfo_info1062_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrWkstaUserInfo0_user_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrWkstaUserInfo0_user_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetWkstaEnumUsersCtr0_entries_read(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -667,20 +667,20 @@ static int wkssvc_dissect_element_NetWkstaEnumUsersCtr1_entries_read(tvbuff_t *t
 static int wkssvc_dissect_element_NetWkstaEnumUsersCtr1_user1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetWkstaEnumUsersCtr1_user1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetWkstaEnumUsersCtr1_user1__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaEnumUsersCtr_val0_user0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaEnumUsersCtr_val0_user0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaEnumUsersCtr_val1_user1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaEnumUsersCtr_val1_user1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaEnumUsersCtr_user0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaEnumUsersCtr_user0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaEnumUsersCtr_user1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaEnumUsersCtr_user1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetWkstaEnumUsersInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int wkssvc_dissect_element_NetWkstaEnumUsersInfo_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int wkssvc_dissect_element_NetrWkstaUserInfo1101_other_domains(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrWkstaUserInfo1101_other_domains_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrWkstaUserInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrWkstaUserInfo_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrWkstaUserInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrWkstaUserInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrWkstaUserInfo_val1101_info1101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrWkstaUserInfo_val1101_info1101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrWkstaUserInfo_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrWkstaUserInfo_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrWkstaUserInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrWkstaUserInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrWkstaUserInfo_info1101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrWkstaUserInfo_info1101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetWkstaTransportInfo0_quality_of_service(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetWkstaTransportInfo0_vc_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetWkstaTransportInfo0_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -692,8 +692,8 @@ static int wkssvc_dissect_element_NetWkstaTransportCtr0_count(tvbuff_t *tvb _U_,
 static int wkssvc_dissect_element_NetWkstaTransportCtr0_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetWkstaTransportCtr0_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetWkstaTransportCtr0_array__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaTransportCtr_val0_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaTransportCtr_val0_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaTransportCtr_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetWkstaTransportCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetWkstaTransportInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int wkssvc_dissect_element_NetWkstaTransportInfo_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int wkssvc_dissect_element_NetrUseInfo3_unknown1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -728,14 +728,14 @@ static int wkssvc_dissect_element_NetrUseInfo0_local(tvbuff_t *tvb _U_, int offs
 static int wkssvc_dissect_element_NetrUseInfo0_local_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrUseInfo0_remote(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrUseInfo0_remote_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrUseGetInfoCtr_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrUseGetInfoCtr_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrUseGetInfoCtr_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrUseGetInfoCtr_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrUseGetInfoCtr_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrUseGetInfoCtr_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrUseGetInfoCtr_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrUseGetInfoCtr_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrUseGetInfoCtr_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrUseGetInfoCtr_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrUseGetInfoCtr_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrUseGetInfoCtr_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrUseGetInfoCtr_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrUseGetInfoCtr_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrUseGetInfoCtr_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrUseGetInfoCtr_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrUseEnumCtr2_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrUseEnumCtr2_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrUseEnumCtr2_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -748,12 +748,12 @@ static int wkssvc_dissect_element_NetrUseEnumCtr0_count(tvbuff_t *tvb _U_, int o
 static int wkssvc_dissect_element_NetrUseEnumCtr0_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrUseEnumCtr0_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrUseEnumCtr0_array__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrUseEnumCtr_val0_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrUseEnumCtr_val0_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrUseEnumCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrUseEnumCtr_val1_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrUseEnumCtr_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrUseEnumCtr_val2_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrUseEnumCtr_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrUseEnumCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrUseEnumCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrUseEnumCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrUseEnumCtr_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int wkssvc_dissect_element_NetrUseEnumCtr_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrUseEnumInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int wkssvc_dissect_element_NetrUseEnumInfo_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int wkssvc_dissect_element_NetrWorkstationStatistics_unknown1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3357,577 +3357,577 @@ wkssvc_dissect_struct_NetWkstaInfo1062(tvbuff_t *tvb _U_, int offset _U_, packet
 /* IDL: } */
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val100_info100(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info100(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, wkssvc_dissect_element_NetWkstaInfo_val100_info100_, NDR_POINTER_UNIQUE, "Pointer to Info100 (wkssvc_NetWkstaInfo100)",hf_wkssvc_wkssvc_NetWkstaInfo_val100_info100);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info100_, NDR_POINTER_UNIQUE, "Pointer to Info100 (wkssvc_NetWkstaInfo100)",hf_wkssvc_wkssvc_NetWkstaInfo_info100);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val100_info100_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info100_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo100(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val100_info100,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo100(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info100,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val101_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info101(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, wkssvc_dissect_element_NetWkstaInfo_val101_info101_, NDR_POINTER_UNIQUE, "Pointer to Info101 (wkssvc_NetWkstaInfo101)",hf_wkssvc_wkssvc_NetWkstaInfo_val101_info101);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info101_, NDR_POINTER_UNIQUE, "Pointer to Info101 (wkssvc_NetWkstaInfo101)",hf_wkssvc_wkssvc_NetWkstaInfo_info101);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val101_info101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo101(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val101_info101,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo101(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info101,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val102_info102(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info102(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, wkssvc_dissect_element_NetWkstaInfo_val102_info102_, NDR_POINTER_UNIQUE, "Pointer to Info102 (wkssvc_NetWkstaInfo102)",hf_wkssvc_wkssvc_NetWkstaInfo_val102_info102);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info102_, NDR_POINTER_UNIQUE, "Pointer to Info102 (wkssvc_NetWkstaInfo102)",hf_wkssvc_wkssvc_NetWkstaInfo_info102);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val102_info102_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info102_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo102(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val102_info102,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo102(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info102,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val502_info502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info502(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, wkssvc_dissect_element_NetWkstaInfo_val502_info502_, NDR_POINTER_UNIQUE, "Pointer to Info502 (wkssvc_NetWkstaInfo502)",hf_wkssvc_wkssvc_NetWkstaInfo_val502_info502);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info502_, NDR_POINTER_UNIQUE, "Pointer to Info502 (wkssvc_NetWkstaInfo502)",hf_wkssvc_wkssvc_NetWkstaInfo_info502);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val502_info502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo502(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val502_info502,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo502(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info502,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1010_info1010(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1010(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, wkssvc_dissect_element_NetWkstaInfo_val1010_info1010_, NDR_POINTER_UNIQUE, "Pointer to Info1010 (wkssvc_NetWkstaInfo1010)",hf_wkssvc_wkssvc_NetWkstaInfo_val1010_info1010);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1010_, NDR_POINTER_UNIQUE, "Pointer to Info1010 (wkssvc_NetWkstaInfo1010)",hf_wkssvc_wkssvc_NetWkstaInfo_info1010);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1010_info1010_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1010_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1010(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1010_info1010,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1010(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1010,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1011_info1011(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1011(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, wkssvc_dissect_element_NetWkstaInfo_val1011_info1011_, NDR_POINTER_UNIQUE, "Pointer to Info1011 (wkssvc_NetWkstaInfo1011)",hf_wkssvc_wkssvc_NetWkstaInfo_val1011_info1011);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1011_, NDR_POINTER_UNIQUE, "Pointer to Info1011 (wkssvc_NetWkstaInfo1011)",hf_wkssvc_wkssvc_NetWkstaInfo_info1011);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1011_info1011_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1011_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1011(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1011_info1011,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1011(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1011,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1012_info1012(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1012(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, wkssvc_dissect_element_NetWkstaInfo_val1012_info1012_, NDR_POINTER_UNIQUE, "Pointer to Info1012 (wkssvc_NetWkstaInfo1012)",hf_wkssvc_wkssvc_NetWkstaInfo_val1012_info1012);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1012_, NDR_POINTER_UNIQUE, "Pointer to Info1012 (wkssvc_NetWkstaInfo1012)",hf_wkssvc_wkssvc_NetWkstaInfo_info1012);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1012_info1012_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1012_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1012(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1012_info1012,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1012(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1012,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1013_info1013(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1013(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, wkssvc_dissect_element_NetWkstaInfo_val1013_info1013_, NDR_POINTER_UNIQUE, "Pointer to Info1013 (wkssvc_NetWkstaInfo1013)",hf_wkssvc_wkssvc_NetWkstaInfo_val1013_info1013);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1013_, NDR_POINTER_UNIQUE, "Pointer to Info1013 (wkssvc_NetWkstaInfo1013)",hf_wkssvc_wkssvc_NetWkstaInfo_info1013);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1013_info1013_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1013_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1013(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1013_info1013,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1013(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1013,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1018_info1018(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1018(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, wkssvc_dissect_element_NetWkstaInfo_val1018_info1018_, NDR_POINTER_UNIQUE, "Pointer to Info1018 (wkssvc_NetWkstaInfo1018)",hf_wkssvc_wkssvc_NetWkstaInfo_val1018_info1018);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1018_, NDR_POINTER_UNIQUE, "Pointer to Info1018 (wkssvc_NetWkstaInfo1018)",hf_wkssvc_wkssvc_NetWkstaInfo_info1018);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1018_info1018_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1018_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1018(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1018_info1018,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1018(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1018,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1023_info1023(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1023(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, wkssvc_dissect_element_NetWkstaInfo_val1023_info1023_, NDR_POINTER_UNIQUE, "Pointer to Info1023 (wkssvc_NetWkstaInfo1023)",hf_wkssvc_wkssvc_NetWkstaInfo_val1023_info1023);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1023_, NDR_POINTER_UNIQUE, "Pointer to Info1023 (wkssvc_NetWkstaInfo1023)",hf_wkssvc_wkssvc_NetWkstaInfo_info1023);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1023_info1023_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1023_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1023(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1023_info1023,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1023(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1023,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1027_info1027(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1027(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, wkssvc_dissect_element_NetWkstaInfo_val1027_info1027_, NDR_POINTER_UNIQUE, "Pointer to Info1027 (wkssvc_NetWkstaInfo1027)",hf_wkssvc_wkssvc_NetWkstaInfo_val1027_info1027);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1027_, NDR_POINTER_UNIQUE, "Pointer to Info1027 (wkssvc_NetWkstaInfo1027)",hf_wkssvc_wkssvc_NetWkstaInfo_info1027);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1027_info1027_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1027_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1027(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1027_info1027,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1027(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1027,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1028_info1028(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1028(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, wkssvc_dissect_element_NetWkstaInfo_val1028_info1028_, NDR_POINTER_UNIQUE, "Pointer to Info1028 (wkssvc_NetWkstaInfo1028)",hf_wkssvc_wkssvc_NetWkstaInfo_val1028_info1028);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1028_, NDR_POINTER_UNIQUE, "Pointer to Info1028 (wkssvc_NetWkstaInfo1028)",hf_wkssvc_wkssvc_NetWkstaInfo_info1028);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1028_info1028_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1028_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1028(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1028_info1028,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1028(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1028,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1032_info1032(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1032(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, wkssvc_dissect_element_NetWkstaInfo_val1032_info1032_, NDR_POINTER_UNIQUE, "Pointer to Info1032 (wkssvc_NetWkstaInfo1032)",hf_wkssvc_wkssvc_NetWkstaInfo_val1032_info1032);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1032_, NDR_POINTER_UNIQUE, "Pointer to Info1032 (wkssvc_NetWkstaInfo1032)",hf_wkssvc_wkssvc_NetWkstaInfo_info1032);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1032_info1032_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1032_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1032(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1032_info1032,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1032(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1032,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1033_info1033(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1033(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, wkssvc_dissect_element_NetWkstaInfo_val1033_info1033_, NDR_POINTER_UNIQUE, "Pointer to Info1033 (wkssvc_NetWkstaInfo1033)",hf_wkssvc_wkssvc_NetWkstaInfo_val1033_info1033);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1033_, NDR_POINTER_UNIQUE, "Pointer to Info1033 (wkssvc_NetWkstaInfo1033)",hf_wkssvc_wkssvc_NetWkstaInfo_info1033);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1033_info1033_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1033_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1033(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1033_info1033,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1033(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1033,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1041_info1041(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1041(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, wkssvc_dissect_element_NetWkstaInfo_val1041_info1041_, NDR_POINTER_UNIQUE, "Pointer to Info1041 (wkssvc_NetWkstaInfo1041)",hf_wkssvc_wkssvc_NetWkstaInfo_val1041_info1041);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1041_, NDR_POINTER_UNIQUE, "Pointer to Info1041 (wkssvc_NetWkstaInfo1041)",hf_wkssvc_wkssvc_NetWkstaInfo_info1041);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1041_info1041_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1041_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1041(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1041_info1041,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1041(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1041,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1042_info1042(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1042(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, wkssvc_dissect_element_NetWkstaInfo_val1042_info1042_, NDR_POINTER_UNIQUE, "Pointer to Info1042 (wkssvc_NetWkstaInfo1042)",hf_wkssvc_wkssvc_NetWkstaInfo_val1042_info1042);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1042_, NDR_POINTER_UNIQUE, "Pointer to Info1042 (wkssvc_NetWkstaInfo1042)",hf_wkssvc_wkssvc_NetWkstaInfo_info1042);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1042_info1042_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1042_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1042(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1042_info1042,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1042(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1042,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1043_info1043(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1043(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, wkssvc_dissect_element_NetWkstaInfo_val1043_info1043_, NDR_POINTER_UNIQUE, "Pointer to Info1043 (wkssvc_NetWkstaInfo1043)",hf_wkssvc_wkssvc_NetWkstaInfo_val1043_info1043);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1043_, NDR_POINTER_UNIQUE, "Pointer to Info1043 (wkssvc_NetWkstaInfo1043)",hf_wkssvc_wkssvc_NetWkstaInfo_info1043);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1043_info1043_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1043_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1043(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1043_info1043,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1043(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1043,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1044_info1044(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1044(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, wkssvc_dissect_element_NetWkstaInfo_val1044_info1044_, NDR_POINTER_UNIQUE, "Pointer to Info1044 (wkssvc_NetWkstaInfo1044)",hf_wkssvc_wkssvc_NetWkstaInfo_val1044_info1044);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1044_, NDR_POINTER_UNIQUE, "Pointer to Info1044 (wkssvc_NetWkstaInfo1044)",hf_wkssvc_wkssvc_NetWkstaInfo_info1044);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1044_info1044_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1044_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1044(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1044_info1044,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1044(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1044,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1045_info1045(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1045(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, wkssvc_dissect_element_NetWkstaInfo_val1045_info1045_, NDR_POINTER_UNIQUE, "Pointer to Info1045 (wkssvc_NetWkstaInfo1045)",hf_wkssvc_wkssvc_NetWkstaInfo_val1045_info1045);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1045_, NDR_POINTER_UNIQUE, "Pointer to Info1045 (wkssvc_NetWkstaInfo1045)",hf_wkssvc_wkssvc_NetWkstaInfo_info1045);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1045_info1045_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1045_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1045(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1045_info1045,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1045(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1045,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1046_info1046(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1046(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, wkssvc_dissect_element_NetWkstaInfo_val1046_info1046_, NDR_POINTER_UNIQUE, "Pointer to Info1046 (wkssvc_NetWkstaInfo1046)",hf_wkssvc_wkssvc_NetWkstaInfo_val1046_info1046);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1046_, NDR_POINTER_UNIQUE, "Pointer to Info1046 (wkssvc_NetWkstaInfo1046)",hf_wkssvc_wkssvc_NetWkstaInfo_info1046);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1046_info1046_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1046_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1046(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1046_info1046,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1046(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1046,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1047_info1047(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1047(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, wkssvc_dissect_element_NetWkstaInfo_val1047_info1047_, NDR_POINTER_UNIQUE, "Pointer to Info1047 (wkssvc_NetWkstaInfo1047)",hf_wkssvc_wkssvc_NetWkstaInfo_val1047_info1047);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1047_, NDR_POINTER_UNIQUE, "Pointer to Info1047 (wkssvc_NetWkstaInfo1047)",hf_wkssvc_wkssvc_NetWkstaInfo_info1047);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1047_info1047_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1047_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1047(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1047_info1047,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1047(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1047,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1048_info1048(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1048(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, wkssvc_dissect_element_NetWkstaInfo_val1048_info1048_, NDR_POINTER_UNIQUE, "Pointer to Info1048 (wkssvc_NetWkstaInfo1048)",hf_wkssvc_wkssvc_NetWkstaInfo_val1048_info1048);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1048_, NDR_POINTER_UNIQUE, "Pointer to Info1048 (wkssvc_NetWkstaInfo1048)",hf_wkssvc_wkssvc_NetWkstaInfo_info1048);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1048_info1048_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1048_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1048(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1048_info1048,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1048(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1048,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1049_info1049(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1049(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, wkssvc_dissect_element_NetWkstaInfo_val1049_info1049_, NDR_POINTER_UNIQUE, "Pointer to Info1049 (wkssvc_NetWkstaInfo1049)",hf_wkssvc_wkssvc_NetWkstaInfo_val1049_info1049);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1049_, NDR_POINTER_UNIQUE, "Pointer to Info1049 (wkssvc_NetWkstaInfo1049)",hf_wkssvc_wkssvc_NetWkstaInfo_info1049);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1049_info1049_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1049_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1049(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1049_info1049,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1049(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1049,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1050_info1050(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1050(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, wkssvc_dissect_element_NetWkstaInfo_val1050_info1050_, NDR_POINTER_UNIQUE, "Pointer to Info1050 (wkssvc_NetWkstaInfo1050)",hf_wkssvc_wkssvc_NetWkstaInfo_val1050_info1050);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1050_, NDR_POINTER_UNIQUE, "Pointer to Info1050 (wkssvc_NetWkstaInfo1050)",hf_wkssvc_wkssvc_NetWkstaInfo_info1050);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1050_info1050_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1050_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1050(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1050_info1050,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1050(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1050,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1051_info1051(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1051(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, wkssvc_dissect_element_NetWkstaInfo_val1051_info1051_, NDR_POINTER_UNIQUE, "Pointer to Info1051 (wkssvc_NetWkstaInfo1051)",hf_wkssvc_wkssvc_NetWkstaInfo_val1051_info1051);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1051_, NDR_POINTER_UNIQUE, "Pointer to Info1051 (wkssvc_NetWkstaInfo1051)",hf_wkssvc_wkssvc_NetWkstaInfo_info1051);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1051_info1051_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1051_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1051(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1051_info1051,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1051(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1051,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1052_info1052(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1052(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, wkssvc_dissect_element_NetWkstaInfo_val1052_info1052_, NDR_POINTER_UNIQUE, "Pointer to Info1052 (wkssvc_NetWkstaInfo1052)",hf_wkssvc_wkssvc_NetWkstaInfo_val1052_info1052);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1052_, NDR_POINTER_UNIQUE, "Pointer to Info1052 (wkssvc_NetWkstaInfo1052)",hf_wkssvc_wkssvc_NetWkstaInfo_info1052);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1052_info1052_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1052_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1052(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1052_info1052,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1052(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1052,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1053_info1053(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1053(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, wkssvc_dissect_element_NetWkstaInfo_val1053_info1053_, NDR_POINTER_UNIQUE, "Pointer to Info1053 (wkssvc_NetWkstaInfo1053)",hf_wkssvc_wkssvc_NetWkstaInfo_val1053_info1053);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1053_, NDR_POINTER_UNIQUE, "Pointer to Info1053 (wkssvc_NetWkstaInfo1053)",hf_wkssvc_wkssvc_NetWkstaInfo_info1053);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1053_info1053_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1053_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1053(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1053_info1053,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1053(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1053,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1054_info1054(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1054(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, wkssvc_dissect_element_NetWkstaInfo_val1054_info1054_, NDR_POINTER_UNIQUE, "Pointer to Info1054 (wkssvc_NetWkstaInfo1054)",hf_wkssvc_wkssvc_NetWkstaInfo_val1054_info1054);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1054_, NDR_POINTER_UNIQUE, "Pointer to Info1054 (wkssvc_NetWkstaInfo1054)",hf_wkssvc_wkssvc_NetWkstaInfo_info1054);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1054_info1054_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1054_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1054(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1054_info1054,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1054(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1054,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1055_info1055(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1055(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, wkssvc_dissect_element_NetWkstaInfo_val1055_info1055_, NDR_POINTER_UNIQUE, "Pointer to Info1055 (wkssvc_NetWkstaInfo1055)",hf_wkssvc_wkssvc_NetWkstaInfo_val1055_info1055);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1055_, NDR_POINTER_UNIQUE, "Pointer to Info1055 (wkssvc_NetWkstaInfo1055)",hf_wkssvc_wkssvc_NetWkstaInfo_info1055);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1055_info1055_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1055_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1055(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1055_info1055,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1055(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1055,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1056_info1056(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1056(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, wkssvc_dissect_element_NetWkstaInfo_val1056_info1056_, NDR_POINTER_UNIQUE, "Pointer to Info1056 (wkssvc_NetWkstaInfo1056)",hf_wkssvc_wkssvc_NetWkstaInfo_val1056_info1056);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1056_, NDR_POINTER_UNIQUE, "Pointer to Info1056 (wkssvc_NetWkstaInfo1056)",hf_wkssvc_wkssvc_NetWkstaInfo_info1056);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1056_info1056_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1056_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1056(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1056_info1056,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1056(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1056,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1057_info1057(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1057(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, wkssvc_dissect_element_NetWkstaInfo_val1057_info1057_, NDR_POINTER_UNIQUE, "Pointer to Info1057 (wkssvc_NetWkstaInfo1057)",hf_wkssvc_wkssvc_NetWkstaInfo_val1057_info1057);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1057_, NDR_POINTER_UNIQUE, "Pointer to Info1057 (wkssvc_NetWkstaInfo1057)",hf_wkssvc_wkssvc_NetWkstaInfo_info1057);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1057_info1057_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1057_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1057(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1057_info1057,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1057(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1057,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1058_info1058(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1058(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, wkssvc_dissect_element_NetWkstaInfo_val1058_info1058_, NDR_POINTER_UNIQUE, "Pointer to Info1058 (wkssvc_NetWkstaInfo1058)",hf_wkssvc_wkssvc_NetWkstaInfo_val1058_info1058);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1058_, NDR_POINTER_UNIQUE, "Pointer to Info1058 (wkssvc_NetWkstaInfo1058)",hf_wkssvc_wkssvc_NetWkstaInfo_info1058);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1058_info1058_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1058_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1058(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1058_info1058,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1058(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1058,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1059_info1059(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1059(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, wkssvc_dissect_element_NetWkstaInfo_val1059_info1059_, NDR_POINTER_UNIQUE, "Pointer to Info1059 (wkssvc_NetWkstaInfo1059)",hf_wkssvc_wkssvc_NetWkstaInfo_val1059_info1059);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1059_, NDR_POINTER_UNIQUE, "Pointer to Info1059 (wkssvc_NetWkstaInfo1059)",hf_wkssvc_wkssvc_NetWkstaInfo_info1059);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1059_info1059_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1059_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1059(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1059_info1059,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1059(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1059,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1060_info1060(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1060(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, wkssvc_dissect_element_NetWkstaInfo_val1060_info1060_, NDR_POINTER_UNIQUE, "Pointer to Info1060 (wkssvc_NetWkstaInfo1060)",hf_wkssvc_wkssvc_NetWkstaInfo_val1060_info1060);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1060_, NDR_POINTER_UNIQUE, "Pointer to Info1060 (wkssvc_NetWkstaInfo1060)",hf_wkssvc_wkssvc_NetWkstaInfo_info1060);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1060_info1060_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1060_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1060(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1060_info1060,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1060(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1060,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1061_info1061(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1061(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, wkssvc_dissect_element_NetWkstaInfo_val1061_info1061_, NDR_POINTER_UNIQUE, "Pointer to Info1061 (wkssvc_NetWkstaInfo1061)",hf_wkssvc_wkssvc_NetWkstaInfo_val1061_info1061);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1061_, NDR_POINTER_UNIQUE, "Pointer to Info1061 (wkssvc_NetWkstaInfo1061)",hf_wkssvc_wkssvc_NetWkstaInfo_info1061);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1061_info1061_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1061_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1061(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1061_info1061,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1061(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1061,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1062_info1062(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1062(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, wkssvc_dissect_element_NetWkstaInfo_val1062_info1062_, NDR_POINTER_UNIQUE, "Pointer to Info1062 (wkssvc_NetWkstaInfo1062)",hf_wkssvc_wkssvc_NetWkstaInfo_val1062_info1062);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaInfo_info1062_, NDR_POINTER_UNIQUE, "Pointer to Info1062 (wkssvc_NetWkstaInfo1062)",hf_wkssvc_wkssvc_NetWkstaInfo_info1062);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaInfo_val1062_info1062_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaInfo_info1062_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaInfo1062(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_val1062_info1062,0);
+       offset = wkssvc_dissect_struct_NetWkstaInfo1062(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaInfo_info1062,0);
 
        return offset;
 }
@@ -3951,147 +3951,147 @@ wkssvc_dissect_NetWkstaInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 
        switch(level) {
                case 100:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val100_info100(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info100(tvb, offset, pinfo, tree, drep);
                break;
 
                case 101:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val101_info101(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info101(tvb, offset, pinfo, tree, drep);
                break;
 
                case 102:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val102_info102(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info102(tvb, offset, pinfo, tree, drep);
                break;
 
                case 502:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val502_info502(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info502(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1010:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1010_info1010(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1010(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1011:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1011_info1011(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1011(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1012:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1012_info1012(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1012(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1013:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1013_info1013(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1013(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1018:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1018_info1018(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1018(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1023:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1023_info1023(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1023(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1027:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1027_info1027(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1027(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1028:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1028_info1028(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1028(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1032:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1032_info1032(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1032(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1033:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1033_info1033(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1033(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1041:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1041_info1041(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1041(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1042:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1042_info1042(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1042(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1043:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1043_info1043(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1043(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1044:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1044_info1044(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1044(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1045:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1045_info1045(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1045(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1046:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1046_info1046(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1046(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1047:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1047_info1047(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1047(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1048:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1048_info1048(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1048(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1049:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1049_info1049(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1049(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1050:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1050_info1050(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1050(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1051:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1051_info1051(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1051(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1052:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1052_info1052(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1052(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1053:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1053_info1053(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1053(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1054:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1054_info1054(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1054(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1055:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1055_info1055(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1055(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1056:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1056_info1056(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1056(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1057:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1057_info1057(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1057(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1058:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1058_info1058(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1058(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1059:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1059_info1059(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1059(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1060:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1060_info1060(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1060(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1061:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1061_info1061(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1061(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1062:
-                       offset = wkssvc_dissect_element_NetWkstaInfo_val1062_info1062(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaInfo_info1062(tvb, offset, pinfo, tree, drep);
                break;
 
                default:
@@ -4423,33 +4423,33 @@ wkssvc_dissect_struct_NetWkstaEnumUsersCtr1(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-wkssvc_dissect_element_NetWkstaEnumUsersCtr_val0_user0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaEnumUsersCtr_user0(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, wkssvc_dissect_element_NetWkstaEnumUsersCtr_val0_user0_, NDR_POINTER_UNIQUE, "Pointer to User0 (wkssvc_NetWkstaEnumUsersCtr0)",hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_val0_user0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaEnumUsersCtr_user0_, NDR_POINTER_UNIQUE, "Pointer to User0 (wkssvc_NetWkstaEnumUsersCtr0)",hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_user0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaEnumUsersCtr_val0_user0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaEnumUsersCtr_user0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaEnumUsersCtr0(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_val0_user0,0);
+       offset = wkssvc_dissect_struct_NetWkstaEnumUsersCtr0(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_user0,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaEnumUsersCtr_val1_user1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaEnumUsersCtr_user1(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, wkssvc_dissect_element_NetWkstaEnumUsersCtr_val1_user1_, NDR_POINTER_UNIQUE, "Pointer to User1 (wkssvc_NetWkstaEnumUsersCtr1)",hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_val1_user1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaEnumUsersCtr_user1_, NDR_POINTER_UNIQUE, "Pointer to User1 (wkssvc_NetWkstaEnumUsersCtr1)",hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_user1);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaEnumUsersCtr_val1_user1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaEnumUsersCtr_user1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaEnumUsersCtr1(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_val1_user1,0);
+       offset = wkssvc_dissect_struct_NetWkstaEnumUsersCtr1(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_user1,0);
 
        return offset;
 }
@@ -4473,11 +4473,11 @@ wkssvc_dissect_NetWkstaEnumUsersCtr(tvbuff_t *tvb _U_, int offset _U_, packet_in
 
        switch(level) {
                case 0:
-                       offset = wkssvc_dissect_element_NetWkstaEnumUsersCtr_val0_user0(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaEnumUsersCtr_user0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = wkssvc_dissect_element_NetWkstaEnumUsersCtr_val1_user1(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaEnumUsersCtr_user1(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -4602,49 +4602,49 @@ wkssvc_dissect_struct_NetrWkstaUserInfo1101(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-wkssvc_dissect_element_NetrWkstaUserInfo_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrWkstaUserInfo_info0(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, wkssvc_dissect_element_NetrWkstaUserInfo_val0_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (wkssvc_NetrWkstaUserInfo0)",hf_wkssvc_wkssvc_NetrWkstaUserInfo_val0_info0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetrWkstaUserInfo_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (wkssvc_NetrWkstaUserInfo0)",hf_wkssvc_wkssvc_NetrWkstaUserInfo_info0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetrWkstaUserInfo_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrWkstaUserInfo_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetrWkstaUserInfo0(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrWkstaUserInfo_val0_info0,0);
+       offset = wkssvc_dissect_struct_NetrWkstaUserInfo0(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrWkstaUserInfo_info0,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetrWkstaUserInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrWkstaUserInfo_info1(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, wkssvc_dissect_element_NetrWkstaUserInfo_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (wkssvc_NetrWkstaUserInfo1)",hf_wkssvc_wkssvc_NetrWkstaUserInfo_val1_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetrWkstaUserInfo_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (wkssvc_NetrWkstaUserInfo1)",hf_wkssvc_wkssvc_NetrWkstaUserInfo_info1);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetrWkstaUserInfo_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrWkstaUserInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetrWkstaUserInfo1(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrWkstaUserInfo_val1_info1,0);
+       offset = wkssvc_dissect_struct_NetrWkstaUserInfo1(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrWkstaUserInfo_info1,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetrWkstaUserInfo_val1101_info1101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrWkstaUserInfo_info1101(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, wkssvc_dissect_element_NetrWkstaUserInfo_val1101_info1101_, NDR_POINTER_UNIQUE, "Pointer to Info1101 (wkssvc_NetrWkstaUserInfo1101)",hf_wkssvc_wkssvc_NetrWkstaUserInfo_val1101_info1101);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetrWkstaUserInfo_info1101_, NDR_POINTER_UNIQUE, "Pointer to Info1101 (wkssvc_NetrWkstaUserInfo1101)",hf_wkssvc_wkssvc_NetrWkstaUserInfo_info1101);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetrWkstaUserInfo_val1101_info1101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrWkstaUserInfo_info1101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetrWkstaUserInfo1101(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrWkstaUserInfo_val1101_info1101,0);
+       offset = wkssvc_dissect_struct_NetrWkstaUserInfo1101(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrWkstaUserInfo_info1101,0);
 
        return offset;
 }
@@ -4668,15 +4668,15 @@ wkssvc_dissect_NetrWkstaUserInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
        switch(level) {
                case 0:
-                       offset = wkssvc_dissect_element_NetrWkstaUserInfo_val0_info0(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetrWkstaUserInfo_info0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = wkssvc_dissect_element_NetrWkstaUserInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetrWkstaUserInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1101:
-                       offset = wkssvc_dissect_element_NetrWkstaUserInfo_val1101_info1101(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetrWkstaUserInfo_info1101(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -4869,17 +4869,17 @@ wkssvc_dissect_struct_NetWkstaTransportCtr0(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-wkssvc_dissect_element_NetWkstaTransportCtr_val0_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaTransportCtr_ctr0(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, wkssvc_dissect_element_NetWkstaTransportCtr_val0_ctr0_, NDR_POINTER_UNIQUE, "Pointer to Ctr0 (wkssvc_NetWkstaTransportCtr0)",hf_wkssvc_wkssvc_NetWkstaTransportCtr_val0_ctr0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetWkstaTransportCtr_ctr0_, NDR_POINTER_UNIQUE, "Pointer to Ctr0 (wkssvc_NetWkstaTransportCtr0)",hf_wkssvc_wkssvc_NetWkstaTransportCtr_ctr0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetWkstaTransportCtr_val0_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetWkstaTransportCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetWkstaTransportCtr0(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaTransportCtr_val0_ctr0,0);
+       offset = wkssvc_dissect_struct_NetWkstaTransportCtr0(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetWkstaTransportCtr_ctr0,0);
 
        return offset;
 }
@@ -4903,7 +4903,7 @@ wkssvc_dissect_NetWkstaTransportCtr(tvbuff_t *tvb _U_, int offset _U_, packet_in
 
        switch(level) {
                case 0:
-                       offset = wkssvc_dissect_element_NetWkstaTransportCtr_val0_ctr0(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetWkstaTransportCtr_ctr0(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -5455,65 +5455,65 @@ wkssvc_dissect_struct_NetrUseInfo0(tvbuff_t *tvb _U_, int offset _U_, packet_inf
 /* IDL: } */
 
 static int
-wkssvc_dissect_element_NetrUseGetInfoCtr_val0_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrUseGetInfoCtr_info0(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, wkssvc_dissect_element_NetrUseGetInfoCtr_val0_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (wkssvc_NetrUseInfo0)",hf_wkssvc_wkssvc_NetrUseGetInfoCtr_val0_info0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetrUseGetInfoCtr_info0_, NDR_POINTER_UNIQUE, "Pointer to Info0 (wkssvc_NetrUseInfo0)",hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetrUseGetInfoCtr_val0_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrUseGetInfoCtr_info0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetrUseInfo0(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrUseGetInfoCtr_val0_info0,0);
+       offset = wkssvc_dissect_struct_NetrUseInfo0(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info0,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetrUseGetInfoCtr_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrUseGetInfoCtr_info1(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, wkssvc_dissect_element_NetrUseGetInfoCtr_val1_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (wkssvc_NetrUseInfo1)",hf_wkssvc_wkssvc_NetrUseGetInfoCtr_val1_info1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetrUseGetInfoCtr_info1_, NDR_POINTER_UNIQUE, "Pointer to Info1 (wkssvc_NetrUseInfo1)",hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info1);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetrUseGetInfoCtr_val1_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrUseGetInfoCtr_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetrUseInfo1(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrUseGetInfoCtr_val1_info1,0);
+       offset = wkssvc_dissect_struct_NetrUseInfo1(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info1,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetrUseGetInfoCtr_val2_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrUseGetInfoCtr_info2(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, wkssvc_dissect_element_NetrUseGetInfoCtr_val2_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (wkssvc_NetrUseInfo2)",hf_wkssvc_wkssvc_NetrUseGetInfoCtr_val2_info2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetrUseGetInfoCtr_info2_, NDR_POINTER_UNIQUE, "Pointer to Info2 (wkssvc_NetrUseInfo2)",hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info2);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetrUseGetInfoCtr_val2_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrUseGetInfoCtr_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetrUseInfo2(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrUseGetInfoCtr_val2_info2,0);
+       offset = wkssvc_dissect_struct_NetrUseInfo2(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info2,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetrUseGetInfoCtr_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrUseGetInfoCtr_info3(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, wkssvc_dissect_element_NetrUseGetInfoCtr_val3_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (wkssvc_NetrUseInfo3)",hf_wkssvc_wkssvc_NetrUseGetInfoCtr_val3_info3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetrUseGetInfoCtr_info3_, NDR_POINTER_UNIQUE, "Pointer to Info3 (wkssvc_NetrUseInfo3)",hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info3);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetrUseGetInfoCtr_val3_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrUseGetInfoCtr_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetrUseInfo3(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrUseGetInfoCtr_val3_info3,0);
+       offset = wkssvc_dissect_struct_NetrUseInfo3(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info3,0);
 
        return offset;
 }
@@ -5537,19 +5537,19 @@ wkssvc_dissect_NetrUseGetInfoCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info
 
        switch(level) {
                case 0:
-                       offset = wkssvc_dissect_element_NetrUseGetInfoCtr_val0_info0(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetrUseGetInfoCtr_info0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = wkssvc_dissect_element_NetrUseGetInfoCtr_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetrUseGetInfoCtr_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = wkssvc_dissect_element_NetrUseGetInfoCtr_val2_info2(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetrUseGetInfoCtr_info2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = wkssvc_dissect_element_NetrUseGetInfoCtr_val3_info3(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetrUseGetInfoCtr_info3(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -5775,49 +5775,49 @@ wkssvc_dissect_struct_NetrUseEnumCtr0(tvbuff_t *tvb _U_, int offset _U_, packet_
 /* IDL: } */
 
 static int
-wkssvc_dissect_element_NetrUseEnumCtr_val0_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrUseEnumCtr_ctr0(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, wkssvc_dissect_element_NetrUseEnumCtr_val0_ctr0_, NDR_POINTER_UNIQUE, "Pointer to Ctr0 (wkssvc_NetrUseEnumCtr0)",hf_wkssvc_wkssvc_NetrUseEnumCtr_val0_ctr0);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetrUseEnumCtr_ctr0_, NDR_POINTER_UNIQUE, "Pointer to Ctr0 (wkssvc_NetrUseEnumCtr0)",hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetrUseEnumCtr_val0_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrUseEnumCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetrUseEnumCtr0(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrUseEnumCtr_val0_ctr0,0);
+       offset = wkssvc_dissect_struct_NetrUseEnumCtr0(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr0,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetrUseEnumCtr_val1_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrUseEnumCtr_ctr1(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, wkssvc_dissect_element_NetrUseEnumCtr_val1_ctr1_, NDR_POINTER_UNIQUE, "Pointer to Ctr1 (wkssvc_NetrUseEnumCtr1)",hf_wkssvc_wkssvc_NetrUseEnumCtr_val1_ctr1);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetrUseEnumCtr_ctr1_, NDR_POINTER_UNIQUE, "Pointer to Ctr1 (wkssvc_NetrUseEnumCtr1)",hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr1);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetrUseEnumCtr_val1_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrUseEnumCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetrUseEnumCtr1(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrUseEnumCtr_val1_ctr1,0);
+       offset = wkssvc_dissect_struct_NetrUseEnumCtr1(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr1,0);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetrUseEnumCtr_val2_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrUseEnumCtr_ctr2(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, wkssvc_dissect_element_NetrUseEnumCtr_val2_ctr2_, NDR_POINTER_UNIQUE, "Pointer to Ctr2 (wkssvc_NetrUseEnumCtr2)",hf_wkssvc_wkssvc_NetrUseEnumCtr_val2_ctr2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_element_NetrUseEnumCtr_ctr2_, NDR_POINTER_UNIQUE, "Pointer to Ctr2 (wkssvc_NetrUseEnumCtr2)",hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr2);
 
        return offset;
 }
 
 static int
-wkssvc_dissect_element_NetrUseEnumCtr_val2_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+wkssvc_dissect_element_NetrUseEnumCtr_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = wkssvc_dissect_struct_NetrUseEnumCtr2(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrUseEnumCtr_val2_ctr2,0);
+       offset = wkssvc_dissect_struct_NetrUseEnumCtr2(tvb,offset,pinfo,tree,drep,hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr2,0);
 
        return offset;
 }
@@ -5841,15 +5841,15 @@ wkssvc_dissect_NetrUseEnumCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 
        switch(level) {
                case 0:
-                       offset = wkssvc_dissect_element_NetrUseEnumCtr_val0_ctr0(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetrUseEnumCtr_ctr0(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = wkssvc_dissect_element_NetrUseEnumCtr_val1_ctr1(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetrUseEnumCtr_ctr1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = wkssvc_dissect_element_NetrUseEnumCtr_val2_ctr2(tvb, offset, pinfo, tree, drep);
+                       offset = wkssvc_dissect_element_NetrUseEnumCtr_ctr2(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -10209,14 +10209,10 @@ void proto_register_dcerpc_wkssvc(void)
          { "Pipe Maximum", "wkssvc.wkssvc_NetWkstaInfo1045.pipe_maximum", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseInfo2_password,
          { "Password", "wkssvc.wkssvc_NetrUseInfo2.password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1028_info1028,
-         { "Info1028", "wkssvc.wkssvc_NetWkstaInfo_val1028.info1028", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1050_info1050,
-         { "Info1050", "wkssvc.wkssvc_NetWkstaInfo_val1050.info1050", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1010_info1010,
-         { "Info1010", "wkssvc.wkssvc_NetWkstaInfo_val1010.info1010", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrJoinDomain2_join_flags,
          { "Join Flags", "wkssvc.wkssvc_NetrJoinDomain2.join_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr1,
+         { "Ctr1", "wkssvc.wkssvc_NetrUseEnumCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_level,
          { "Level", "wkssvc.wkssvc_NetrWkstaUserSetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseEnum_entries_read,
@@ -10231,6 +10227,8 @@ void proto_register_dcerpc_wkssvc(void)
          { "Account", "wkssvc.wkssvc_NetrSetPrimaryComputername.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown14,
          { "Unknown14", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown14", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_user0,
+         { "User0", "wkssvc.wkssvc_NetWkstaEnumUsersCtr.user0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrGetJoinableOus_domain_name,
          { "Domain Name", "wkssvc.wkssvc_NetrGetJoinableOus.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseInfo2_user_name,
@@ -10241,22 +10239,24 @@ void proto_register_dcerpc_wkssvc(void)
          { "Other Domains", "wkssvc.wkssvc_NetrWkstaUserInfo1.other_domains", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrGetJoinableOus_Account,
          { "Account", "wkssvc.wkssvc_NetrGetJoinableOus.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaTransportCtr_ctr0,
+         { "Ctr0", "wkssvc.wkssvc_NetWkstaTransportCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_dgram_event_reset_freq,
          { "Dgram Event Reset Freq", "wkssvc.wkssvc_NetWkstaInfo502.dgram_event_reset_freq", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo102_lan_root,
          { "Lan Root", "wkssvc.wkssvc_NetWkstaInfo102.lan_root", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWkstaUserInfo1_user_name,
          { "User Name", "wkssvc.wkssvc_NetrWkstaUserInfo1.user_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info502,
+         { "Info502", "wkssvc.wkssvc_NetWkstaInfo.info502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown32,
          { "Unknown32", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown32", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown29,
          { "Unknown29", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown29", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetrWkstaUserInfo_val0_info0,
-         { "Info0", "wkssvc.wkssvc_NetrWkstaUserInfo_val0.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1055_use_raw_write,
          { "Use Raw Write", "wkssvc.wkssvc_NetWkstaInfo1055.use_raw_write", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1054_info1054,
-         { "Info1054", "wkssvc.wkssvc_NetWkstaInfo_val1054.info1054", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1051,
+         { "Info1051", "wkssvc.wkssvc_NetWkstaInfo.info1051", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrValidateName2_name,
          { "Name", "wkssvc.wkssvc_NetrValidateName2.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_dormant_file_limit,
@@ -10273,14 +10273,10 @@ void proto_register_dcerpc_wkssvc(void)
          { "Size Char Buf", "wkssvc.wkssvc_NetWkstaInfo502.size_char_buf", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaTransportCtr0_array,
          { "Array", "wkssvc.wkssvc_NetWkstaTransportCtr0.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1046_info1046,
-         { "Info1046", "wkssvc.wkssvc_NetWkstaInfo_val1046.info1046", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrEnumerateComputerNames_name_type,
          { "Name Type", "wkssvc.wkssvc_NetrEnumerateComputerNames.name_type", FT_UINT1632, BASE_DEC, VALS(wkssvc_wkssvc_ComputerNameType_vals), 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseAdd_parm_err,
          { "Parm Err", "wkssvc.wkssvc_NetrUseAdd.parm_err", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetrUseGetInfoCtr_val2_info2,
-         { "Info2", "wkssvc.wkssvc_NetrUseGetInfoCtr_val2.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown9,
          { "Unknown9", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown9", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrGetJoinableOus2_num_ous,
@@ -10299,10 +10295,10 @@ void proto_register_dcerpc_wkssvc(void)
          { "Unknown4", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown4", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrJoinDomain2_domain_name,
          { "Domain Name", "wkssvc.wkssvc_NetrJoinDomain2.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr2,
+         { "Ctr2", "wkssvc.wkssvc_NetrUseEnumCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown3,
          { "Unknown3", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown3", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val100_info100,
-         { "Info100", "wkssvc.wkssvc_NetWkstaInfo_val100.info100", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrJoinDomain_join_flags,
          { "Join Flags", "wkssvc.wkssvc_NetrJoinDomain.join_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseDel_use_name,
@@ -10311,16 +10307,16 @@ void proto_register_dcerpc_wkssvc(void)
          { "Buf Files Deny Write", "wkssvc.wkssvc_NetWkstaInfo502.buf_files_deny_write", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseGetInfo_use_name,
          { "Use Name", "wkssvc.wkssvc_NetrUseGetInfo.use_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1060,
+         { "Info1060", "wkssvc.wkssvc_NetWkstaInfo.info1060", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_unknown4,
          { "Unknown4", "wkssvc.wkssvc_NetrWorkstationStatisticsGet.unknown4", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1011_info1011,
-         { "Info1011", "wkssvc.wkssvc_NetWkstaInfo_val1011.info1011", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1057,
+         { "Info1057", "wkssvc.wkssvc_NetWkstaInfo.info1057", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaTransportInfo_level,
          { "Level", "wkssvc.wkssvc_NetWkstaTransportInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaTransportInfo0_name,
          { "Name", "wkssvc.wkssvc_NetWkstaTransportInfo0.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1056_info1056,
-         { "Info1056", "wkssvc.wkssvc_NetWkstaInfo_val1056.info1056", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseEnumCtr1_array,
          { "Array", "wkssvc.wkssvc_NetrUseEnumCtr1.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown20,
@@ -10331,10 +10327,8 @@ void proto_register_dcerpc_wkssvc(void)
          { "Entries Read", "wkssvc.wkssvc_NetWkstaEnumUsersCtr1.entries_read", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown37,
          { "Unknown37", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown37", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1018_info1018,
-         { "Info1018", "wkssvc.wkssvc_NetWkstaInfo_val1018.info1018", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1060_info1060,
-         { "Info1060", "wkssvc.wkssvc_NetWkstaInfo_val1060.info1060", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1058,
+         { "Info1058", "wkssvc.wkssvc_NetWkstaInfo.info1058", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseGetInfo_server_name,
          { "Server Name", "wkssvc.wkssvc_NetrUseGetInfo.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE,
@@ -10349,8 +10343,6 @@ void proto_register_dcerpc_wkssvc(void)
          { "Force Cond", "wkssvc.wkssvc_NetrUseDel.force_cond", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaEnumUsers_resume_handle,
          { "Resume Handle", "wkssvc.wkssvc_NetWkstaEnumUsers.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetrUseEnumCtr_val0_ctr0,
-         { "Ctr0", "wkssvc.wkssvc_NetrUseEnumCtr_val0.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseEnumCtr0_count,
          { "Count", "wkssvc.wkssvc_NetrUseEnumCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1053_utilize_nt_caching,
@@ -10363,10 +10355,14 @@ void proto_register_dcerpc_wkssvc(void)
          { "Primary Name", "wkssvc.wkssvc_NetrSetPrimaryComputername.primary_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown36,
          { "Unknown36", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown36", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info0,
+         { "Info0", "wkssvc.wkssvc_NetrUseGetInfoCtr.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseGetInfo_ctr,
          { "Ctr", "wkssvc.wkssvc_NetrUseGetInfo.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseInfo3_unknown2,
          { "Unknown2", "wkssvc.wkssvc_NetrUseInfo3.unknown2", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetrWkstaUserInfo_info1,
+         { "Info1", "wkssvc.wkssvc_NetrWkstaUserInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1048_use_opportunistic_locking,
          { "Use Opportunistic Locking", "wkssvc.wkssvc_NetWkstaInfo1048.use_opportunistic_locking", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown27,
@@ -10389,8 +10385,6 @@ void proto_register_dcerpc_wkssvc(void)
          { "Unknown16", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown16", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_log_election_packets,
          { "Log Election Packets", "wkssvc.wkssvc_NetWkstaInfo502.log_election_packets", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1052_info1052,
-         { "Info1052", "wkssvc.wkssvc_NetWkstaInfo_val1052.info1052", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_use_raw_read,
          { "Use Raw Read", "wkssvc.wkssvc_NetWkstaInfo502.use_raw_read", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrGetJoinableOus_unknown,
@@ -10399,20 +10393,26 @@ void proto_register_dcerpc_wkssvc(void)
          { "Reserved", "wkssvc.wkssvc_NetrSetPrimaryComputername.Reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1027_errorlog_sz,
          { "Errorlog Sz", "wkssvc.wkssvc_NetWkstaInfo1027.errorlog_sz", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1052,
+         { "Info1052", "wkssvc.wkssvc_NetWkstaInfo.info1052", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1012_maximum_collection_count,
          { "Maximum Collection Count", "wkssvc.wkssvc_NetWkstaInfo1012.maximum_collection_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrJoinDomain2_admin_account,
          { "Admin Account", "wkssvc.wkssvc_NetrJoinDomain2.admin_account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr0,
+         { "Ctr0", "wkssvc.wkssvc_NetrUseEnumCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1050_use_close_behind,
          { "Use Close Behind", "wkssvc.wkssvc_NetWkstaInfo1050.use_close_behind", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_use_unlock_behind,
          { "Use Unlock Behind", "wkssvc.wkssvc_NetWkstaInfo502.use_unlock_behind", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaTransportCtr_val0_ctr0,
-         { "Ctr0", "wkssvc.wkssvc_NetWkstaTransportCtr_val0.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_user1,
+         { "User1", "wkssvc.wkssvc_NetWkstaEnumUsersCtr.user1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo102_version_minor,
          { "Version Minor", "wkssvc.wkssvc_NetWkstaInfo102.version_minor", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_ComputerNamesCtr_count,
          { "Count", "wkssvc.wkssvc_ComputerNamesCtr.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1048,
+         { "Info1048", "wkssvc.wkssvc_NetWkstaInfo.info1048", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1018_session_timeout,
          { "Session Timeout", "wkssvc.wkssvc_NetWkstaInfo1018.session_timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_keep_connection,
@@ -10433,8 +10433,6 @@ void proto_register_dcerpc_wkssvc(void)
          { "Wkssvc Join Flags Account Create", "wkssvc.wkssvc_renameflags.WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE", FT_BOOLEAN, 32, TFS(&wkssvc_renameflags_WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown25,
          { "Unknown25", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown25", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1012_info1012,
-         { "Info1012", "wkssvc.wkssvc_NetWkstaInfo_val1012.info1012", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseDel_server_name,
          { "Server Name", "wkssvc.wkssvc_NetrUseDel.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWkstaUserInfo1_logon_server,
@@ -10447,6 +10445,8 @@ void proto_register_dcerpc_wkssvc(void)
          { "Cache File Timeout", "wkssvc.wkssvc_NetWkstaInfo502.cache_file_timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_num_mailslot_buffers,
          { "Num Mailslot Buffers", "wkssvc.wkssvc_NetWkstaInfo502.num_mailslot_buffers", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1055,
+         { "Info1055", "wkssvc.wkssvc_NetWkstaInfo.info1055", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrRenameMachineInDomain_password,
          { "Password", "wkssvc.wkssvc_NetrRenameMachineInDomain.password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown13,
@@ -10475,8 +10475,6 @@ void proto_register_dcerpc_wkssvc(void)
          { "Wkssvc Join Flags Defer Spn", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_DEFER_SPN", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_DEFER_SPN_tfs), ( 0x00000100 ), NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1010_char_wait,
          { "Char Wait", "wkssvc.wkssvc_NetWkstaInfo1010.char_wait", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1061_info1061,
-         { "Info1061", "wkssvc.wkssvc_NetWkstaInfo_val1061.info1061", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrRenameMachineInDomain_RenameOptions,
          { "Renameoptions", "wkssvc.wkssvc_NetrRenameMachineInDomain.RenameOptions", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaEnumUsers_server_name,
@@ -10491,8 +10489,6 @@ void proto_register_dcerpc_wkssvc(void)
          { "Ctr", "wkssvc.wkssvc_NetWkstaEnumUsersInfo.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr0_user0,
          { "User0", "wkssvc.wkssvc_NetWkstaEnumUsersCtr0.user0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetrUseEnumCtr_val1_ctr1,
-         { "Ctr1", "wkssvc.wkssvc_NetrUseEnumCtr_val1.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_buf_read_only_files,
          { "Buf Read Only Files", "wkssvc.wkssvc_NetWkstaInfo502.buf_read_only_files", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUnjoinDomain_server_name,
@@ -10503,42 +10499,44 @@ void proto_register_dcerpc_wkssvc(void)
          { "Wkssvc Join Flags Join Type", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_JOIN_TYPE", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_TYPE_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_buf_named_pipes,
          { "Buf Named Pipes", "wkssvc.wkssvc_NetWkstaInfo502.buf_named_pipes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1058_info1058,
-         { "Info1058", "wkssvc.wkssvc_NetWkstaInfo_val1058.info1058", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseInfo2_ref_count,
          { "Ref Count", "wkssvc.wkssvc_NetrUseInfo2.ref_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1044_pipe_increment,
          { "Pipe Increment", "wkssvc.wkssvc_NetWkstaInfo1044.pipe_increment", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_DOMAIN_JOIN_IF_JOINED,
          { "Wkssvc Join Flags Domain Join If Joined", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_DOMAIN_JOIN_IF_JOINED", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_DOMAIN_JOIN_IF_JOINED_tfs), ( 0x00000020 ), NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val101_info101,
-         { "Info101", "wkssvc.wkssvc_NetWkstaInfo_val101.info101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_AlternateMachineNameToRemove,
          { "Alternatemachinenametoremove", "wkssvc.wkssvc_NetrRemoveAlternateComputerName.AlternateMachineNameToRemove", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetrUseGetInfoCtr_val0_info0,
-         { "Info0", "wkssvc.wkssvc_NetrUseGetInfoCtr_val0.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseEnumCtr2_array,
          { "Array", "wkssvc.wkssvc_NetrUseEnumCtr2.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1013_info1013,
-         { "Info1013", "wkssvc.wkssvc_NetWkstaInfo_val1013.info1013", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaGetInfo_info,
          { "Info", "wkssvc.wkssvc_NetWkstaGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_max_illegal_dgram_events,
          { "Max Illegal Dgram Events", "wkssvc.wkssvc_NetWkstaInfo502.max_illegal_dgram_events", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1047,
+         { "Info1047", "wkssvc.wkssvc_NetWkstaInfo.info1047", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrValidateName_Password,
          { "Password", "wkssvc.wkssvc_NetrValidateName.Password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1028_print_buf_time,
          { "Print Buf Time", "wkssvc.wkssvc_NetWkstaInfo1028.print_buf_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info3,
+         { "Info3", "wkssvc.wkssvc_NetrUseGetInfoCtr.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrGetJoinableOus2_Account,
          { "Account", "wkssvc.wkssvc_NetrGetJoinableOus2.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_RenameOptions,
          { "Renameoptions", "wkssvc.wkssvc_NetrRenameMachineInDomain2.RenameOptions", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetrWkstaUserInfo_info1101,
+         { "Info1101", "wkssvc.wkssvc_NetrWkstaUserInfo.info1101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown17,
          { "Unknown17", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown17", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1013,
+         { "Info1013", "wkssvc.wkssvc_NetWkstaInfo.info1013", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrValidateName2_server_name,
          { "Server Name", "wkssvc.wkssvc_NetrValidateName2.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown34,
          { "Unknown34", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown34", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1018,
+         { "Info1018", "wkssvc.wkssvc_NetWkstaInfo.info1018", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr0_entries_read,
          { "Entries Read", "wkssvc.wkssvc_NetWkstaEnumUsersCtr0.entries_read", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1057_use_encryption,
@@ -10551,40 +10549,36 @@ void proto_register_dcerpc_wkssvc(void)
          { "Unknown35", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown35", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown7,
          { "Unknown7", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown7", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_val1_user1,
-         { "User1", "wkssvc.wkssvc_NetWkstaEnumUsersCtr_val1.user1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaSetInfo_parm_error,
          { "Parm Error", "wkssvc.wkssvc_NetWkstaSetInfo.parm_error", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseInfo0_remote,
          { "Remote", "wkssvc.wkssvc_NetrUseInfo0.remote", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetrWkstaUserInfo_info0,
+         { "Info0", "wkssvc.wkssvc_NetrWkstaUserInfo.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1060_force_core_create_mode,
          { "Force Core Create Mode", "wkssvc.wkssvc_NetWkstaInfo1060.force_core_create_mode", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1027_info1027,
-         { "Info1027", "wkssvc.wkssvc_NetWkstaInfo_val1027.info1027", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWkstaUserInfo0_user_name,
          { "User Name", "wkssvc.wkssvc_NetrWkstaUserInfo0.user_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info101,
+         { "Info101", "wkssvc.wkssvc_NetWkstaInfo.info101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaTransportInfo0_address,
          { "Address", "wkssvc.wkssvc_NetWkstaTransportInfo0.address", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown39,
          { "Unknown39", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown39", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1044_info1044,
-         { "Info1044", "wkssvc.wkssvc_NetWkstaInfo_val1044.info1044", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseEnumCtr2_count,
          { "Count", "wkssvc.wkssvc_NetrUseEnumCtr2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrGetJoinInformation_name_buffer,
          { "Name Buffer", "wkssvc.wkssvc_NetrGetJoinInformation.name_buffer", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrRenameMachineInDomain_NewMachineName,
          { "Newmachinename", "wkssvc.wkssvc_NetrRenameMachineInDomain.NewMachineName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetrWkstaUserInfo_val1_info1,
-         { "Info1", "wkssvc.wkssvc_NetrWkstaUserInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_lock_maximum,
          { "Lock Maximum", "wkssvc.wkssvc_NetWkstaInfo502.lock_maximum", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUnjoinDomain_Account,
          { "Account", "wkssvc.wkssvc_NetrUnjoinDomain.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWkstaUserGetInfo_level,
          { "Level", "wkssvc.wkssvc_NetrWkstaUserGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1042_info1042,
-         { "Info1042", "wkssvc.wkssvc_NetWkstaInfo_val1042.info1042", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1049,
+         { "Info1049", "wkssvc.wkssvc_NetWkstaInfo.info1049", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrGetJoinableOus_num_ous,
          { "Num Ous", "wkssvc.wkssvc_NetrGetJoinableOus.num_ous", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseInfo2_asg_type,
@@ -10601,16 +10595,18 @@ void proto_register_dcerpc_wkssvc(void)
          { "Size Char Buf", "wkssvc.wkssvc_NetWkstaInfo1023.size_char_buf", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo100_domain_name,
          { "Domain Name", "wkssvc.wkssvc_NetWkstaInfo100.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetrUseGetInfoCtr_val3_info3,
-         { "Info3", "wkssvc.wkssvc_NetrUseGetInfoCtr_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaTransportEnum_max_buffer,
          { "Max Buffer", "wkssvc.wkssvc_NetWkstaTransportEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_DC_ACCOUNT,
          { "Wkssvc Join Flags Join Dc Account", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_JOIN_DC_ACCOUNT", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_DC_ACCOUNT_tfs), ( 0x00000200 ), NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1042,
+         { "Info1042", "wkssvc.wkssvc_NetWkstaInfo.info1042", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1045,
+         { "Info1045", "wkssvc.wkssvc_NetWkstaInfo.info1045", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_unknown,
          { "Unknown", "wkssvc.wkssvc_NetrWkstaUserSetInfo.unknown", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetrUseEnumCtr_val2_ctr2,
-         { "Ctr2", "wkssvc.wkssvc_NetrUseEnumCtr_val2.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1011,
+         { "Info1011", "wkssvc.wkssvc_NetWkstaInfo.info1011", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1049_use_unlock_behind,
          { "Use Unlock Behind", "wkssvc.wkssvc_NetWkstaInfo1049.use_unlock_behind", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1062_read_ahead_throughput,
@@ -10643,12 +10639,16 @@ void proto_register_dcerpc_wkssvc(void)
          { "Encryptedpassword", "wkssvc.wkssvc_NetrValidateName2.EncryptedPassword", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWkstaTransportDel_unknown3,
          { "Unknown3", "wkssvc.wkssvc_NetrWkstaTransportDel.unknown3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1062,
+         { "Info1062", "wkssvc.wkssvc_NetWkstaInfo.info1062", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWkstaUserGetInfo_unknown,
          { "Unknown", "wkssvc.wkssvc_NetrWkstaUserGetInfo.unknown", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrAddAlternateComputerName_server_name,
          { "Server Name", "wkssvc.wkssvc_NetrAddAlternateComputerName.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrJoinDomain2_server_name,
          { "Server Name", "wkssvc.wkssvc_NetrJoinDomain2.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info102,
+         { "Info102", "wkssvc.wkssvc_NetWkstaInfo.info102", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrJoinDomain_Account,
          { "Account", "wkssvc.wkssvc_NetrJoinDomain.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1046_dormant_file_limit,
@@ -10657,20 +10657,20 @@ void proto_register_dcerpc_wkssvc(void)
          { "Parm Err", "wkssvc.wkssvc_NetrWkstaTransportAdd.parm_err", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo102_version_major,
          { "Version Major", "wkssvc.wkssvc_NetWkstaInfo102.version_major", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1062_info1062,
-         { "Info1062", "wkssvc.wkssvc_NetWkstaInfo_val1062.info1062", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown22,
          { "Unknown22", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown22", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseInfo1_use_count,
          { "Use Count", "wkssvc.wkssvc_NetrUseInfo1.use_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUnjoinDomain2_server_name,
          { "Server Name", "wkssvc.wkssvc_NetrUnjoinDomain2.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1049_info1049,
-         { "Info1049", "wkssvc.wkssvc_NetWkstaInfo_val1049.info1049", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_use_512_byte_max_transfer,
          { "Use 512 Byte Max Transfer", "wkssvc.wkssvc_NetWkstaInfo502.use_512_byte_max_transfer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaTransportEnum_info,
          { "Info", "wkssvc.wkssvc_NetWkstaTransportEnum.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1033,
+         { "Info1033", "wkssvc.wkssvc_NetWkstaInfo.info1033", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1046,
+         { "Info1046", "wkssvc.wkssvc_NetWkstaInfo.info1046", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaSetInfo_info,
          { "Info", "wkssvc.wkssvc_NetWkstaSetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrMessageBufferSend_message_sender_name,
@@ -10683,22 +10683,22 @@ void proto_register_dcerpc_wkssvc(void)
          { "Count", "wkssvc.wkssvc_NetrUseEnumCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1047_cache_file_timeout,
          { "Cache File Timeout", "wkssvc.wkssvc_NetWkstaInfo1047.cache_file_timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info2,
+         { "Info2", "wkssvc.wkssvc_NetrUseGetInfoCtr.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown30,
          { "Unknown30", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown30", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1028,
+         { "Info1028", "wkssvc.wkssvc_NetWkstaInfo.info1028", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info100,
+         { "Info100", "wkssvc.wkssvc_NetWkstaInfo.info100", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrLogonDomainNameDel_domain_name,
          { "Domain Name", "wkssvc.wkssvc_NetrLogonDomainNameDel.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1013_keep_connection,
          { "Keep Connection", "wkssvc.wkssvc_NetWkstaInfo1013.keep_connection", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetrWkstaUserInfo_val1101_info1101,
-         { "Info1101", "wkssvc.wkssvc_NetrWkstaUserInfo_val1101.info1101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetrUseGetInfoCtr_val1_info1,
-         { "Info1", "wkssvc.wkssvc_NetrUseGetInfoCtr_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrEnumerateComputerNames_server_name,
          { "Server Name", "wkssvc.wkssvc_NetrEnumerateComputerNames.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_info,
          { "Info", "wkssvc.wkssvc_NetrWkstaUserSetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1057_info1057,
-         { "Info1057", "wkssvc.wkssvc_NetWkstaInfo_val1057.info1057", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrMessageBufferSend_message_name,
          { "Message Name", "wkssvc.wkssvc_NetrMessageBufferSend.message_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_session_timeout,
@@ -10713,6 +10713,8 @@ void proto_register_dcerpc_wkssvc(void)
          { "Collection Time", "wkssvc.wkssvc_NetWkstaInfo502.collection_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_IGNORE_UNSUPPORTED_FLAGS,
          { "Wkssvc Join Flags Ignore Unsupported Flags", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_IGNORE_UNSUPPORTED_FLAGS", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_IGNORE_UNSUPPORTED_FLAGS_tfs), ( 0x10000000 ), NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1054,
+         { "Info1054", "wkssvc.wkssvc_NetWkstaInfo.info1054", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown10,
          { "Unknown10", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown10", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1032_wrk_heuristics,
@@ -10725,8 +10727,6 @@ void proto_register_dcerpc_wkssvc(void)
          { "Level", "wkssvc.wkssvc_NetrWkstaTransportAdd.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown33,
          { "Unknown33", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown33", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1059_info1059,
-         { "Info1059", "wkssvc.wkssvc_NetWkstaInfo_val1059.info1059", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrEnumerateComputerNames_ctr,
          { "Ctr", "wkssvc.wkssvc_NetrEnumerateComputerNames.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaTransportEnum_server_name,
@@ -10737,14 +10737,16 @@ void proto_register_dcerpc_wkssvc(void)
          { "Lock Increment", "wkssvc.wkssvc_NetWkstaInfo1042.lock_increment", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseGetInfo_level,
          { "Level", "wkssvc.wkssvc_NetrUseGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1043_info1043,
-         { "Info1043", "wkssvc.wkssvc_NetWkstaInfo_val1043.info1043", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1050,
+         { "Info1050", "wkssvc.wkssvc_NetWkstaInfo.info1050", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_lock_increment,
          { "Lock Increment", "wkssvc.wkssvc_NetWkstaInfo502.lock_increment", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseInfo2_local,
          { "Local", "wkssvc.wkssvc_NetrUseInfo2.local", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrValidateName_server_name,
          { "Server Name", "wkssvc.wkssvc_NetrValidateName.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1041,
+         { "Info1041", "wkssvc.wkssvc_NetWkstaInfo.info1041", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseInfo2_status,
          { "Status", "wkssvc.wkssvc_NetrUseInfo2.status", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown12,
@@ -10759,24 +10761,20 @@ void proto_register_dcerpc_wkssvc(void)
          { "Encryptedpassword", "wkssvc.wkssvc_NetrAddAlternateComputerName.EncryptedPassword", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1058_buf_files_deny_write,
          { "Buf Files Deny Write", "wkssvc.wkssvc_NetWkstaInfo1058.buf_files_deny_write", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1053_info1053,
-         { "Info1053", "wkssvc.wkssvc_NetWkstaInfo_val1053.info1053", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUnjoinDomain2_account,
          { "Account", "wkssvc.wkssvc_NetrUnjoinDomain2.account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_unknown2,
          { "Unknown2", "wkssvc.wkssvc_NetrWorkstationStatisticsGet.unknown2", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1043,
+         { "Info1043", "wkssvc.wkssvc_NetWkstaInfo.info1043", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown21,
          { "Unknown21", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown21", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1023_info1023,
-         { "Info1023", "wkssvc.wkssvc_NetWkstaInfo_val1023.info1023", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo102_server_name,
          { "Server Name", "wkssvc.wkssvc_NetWkstaInfo102.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_use_encryption,
          { "Use Encryption", "wkssvc.wkssvc_NetWkstaInfo502.use_encryption", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1032_info1032,
-         { "Info1032", "wkssvc.wkssvc_NetWkstaInfo_val1032.info1032", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1055_info1055,
-         { "Info1055", "wkssvc.wkssvc_NetWkstaInfo_val1055.info1055", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1059,
+         { "Info1059", "wkssvc.wkssvc_NetWkstaInfo.info1059", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrValidateName_name_type,
          { "Name Type", "wkssvc.wkssvc_NetrValidateName.name_type", FT_UINT1632, BASE_DEC, VALS(wkssvc_wkssvc_NetValidateNameType_vals), 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrMessageBufferSend_message_buffer,
@@ -10785,8 +10783,6 @@ void proto_register_dcerpc_wkssvc(void)
          { "Count", "wkssvc.wkssvc_NetWkstaTransportCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseEnumInfo_level,
          { "Level", "wkssvc.wkssvc_NetrUseEnumInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1047_info1047,
-         { "Info1047", "wkssvc.wkssvc_NetWkstaInfo_val1047.info1047", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1041_lock_quota,
          { "Lock Quota", "wkssvc.wkssvc_NetWkstaInfo1041.lock_quota", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUseAdd_ctr,
@@ -10801,6 +10797,8 @@ void proto_register_dcerpc_wkssvc(void)
          { "Server Name", "wkssvc.wkssvc_NetrUseAdd.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown11,
          { "Unknown11", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown11", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1012,
+         { "Info1012", "wkssvc.wkssvc_NetWkstaInfo.info1012", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUnjoinDomain_password,
          { "Password", "wkssvc.wkssvc_NetrUnjoinDomain.password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrJoinDomain_password,
@@ -10811,10 +10809,12 @@ void proto_register_dcerpc_wkssvc(void)
          { "Domain Name", "wkssvc.wkssvc_NetrGetJoinableOus2.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_pipe_increment,
          { "Pipe Increment", "wkssvc.wkssvc_NetWkstaInfo502.pipe_increment", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val102_info102,
-         { "Info102", "wkssvc.wkssvc_NetWkstaInfo_val102.info102", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1044,
+         { "Info1044", "wkssvc.wkssvc_NetWkstaInfo.info1044", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrGetJoinableOus2_EncryptedPassword,
          { "Encryptedpassword", "wkssvc.wkssvc_NetrGetJoinableOus2.EncryptedPassword", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1010,
+         { "Info1010", "wkssvc.wkssvc_NetWkstaInfo.info1010", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1051_buf_named_pipes,
          { "Buf Named Pipes", "wkssvc.wkssvc_NetWkstaInfo1051.buf_named_pipes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_read_ahead_throughput,
@@ -10853,14 +10853,12 @@ void proto_register_dcerpc_wkssvc(void)
          { "Collection Time", "wkssvc.wkssvc_NetWkstaInfo1011.collection_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrGetJoinInformation_server_name,
          { "Server Name", "wkssvc.wkssvc_NetrGetJoinInformation.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1033_info1033,
-         { "Info1033", "wkssvc.wkssvc_NetWkstaInfo_val1033.info1033", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val502_info502,
-         { "Info502", "wkssvc.wkssvc_NetWkstaInfo_val502.info502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo101_domain_name,
          { "Domain Name", "wkssvc.wkssvc_NetWkstaInfo101.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1045_info1045,
-         { "Info1045", "wkssvc.wkssvc_NetWkstaInfo_val1045.info1045", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1061,
+         { "Info1061", "wkssvc.wkssvc_NetWkstaInfo.info1061", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info1,
+         { "Info1", "wkssvc.wkssvc_NetrUseGetInfoCtr.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaEnumUsersInfo_level,
          { "Level", "wkssvc.wkssvc_NetWkstaEnumUsersInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrSetPrimaryComputername_server_name,
@@ -10895,6 +10893,8 @@ void proto_register_dcerpc_wkssvc(void)
          { "User1", "wkssvc.wkssvc_NetWkstaEnumUsersCtr1.user1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaGetInfo_server_name,
          { "Server Name", "wkssvc.wkssvc_NetWkstaGetInfo.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1023,
+         { "Info1023", "wkssvc.wkssvc_NetWkstaInfo.info1023", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown15,
          { "Unknown15", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown15", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_use_lock_read_unlock,
@@ -10903,8 +10903,6 @@ void proto_register_dcerpc_wkssvc(void)
          { "Asg Type", "wkssvc.wkssvc_NetrUseInfo1.asg_type", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrUnjoinDomain2_unjoin_flags,
          { "Unjoin Flags", "wkssvc.wkssvc_NetrUnjoinDomain2.unjoin_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_val0_user0,
-         { "User0", "wkssvc.wkssvc_NetWkstaEnumUsersCtr_val0.user0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown1,
          { "Unknown1", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown1", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrLogonDomainNameAdd_domain_name,
@@ -10913,12 +10911,8 @@ void proto_register_dcerpc_wkssvc(void)
          { "Unknown26", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown26", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_Account,
          { "Account", "wkssvc.wkssvc_NetrRenameMachineInDomain2.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1051_info1051,
-         { "Info1051", "wkssvc.wkssvc_NetWkstaInfo_val1051.info1051", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaEnumUsers_info,
          { "Info", "wkssvc.wkssvc_NetWkstaEnumUsers.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1048_info1048,
-         { "Info1048", "wkssvc.wkssvc_NetWkstaInfo_val1048.info1048", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrGetJoinInformation_name_type,
          { "Name Type", "wkssvc.wkssvc_NetrGetJoinInformation.name_type", FT_UINT1632, BASE_DEC, VALS(wkssvc_wkssvc_NetJoinStatus_vals), 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrAddAlternateComputerName_NewAlternateMachineName,
@@ -10929,14 +10923,20 @@ void proto_register_dcerpc_wkssvc(void)
          { "Pipe Maximum", "wkssvc.wkssvc_NetWkstaInfo502.pipe_maximum", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo502_char_wait,
          { "Char Wait", "wkssvc.wkssvc_NetWkstaInfo502.char_wait", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1027,
+         { "Info1027", "wkssvc.wkssvc_NetWkstaInfo.info1027", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaInfo1052_use_lock_read_unlock,
          { "Use Lock Read Unlock", "wkssvc.wkssvc_NetWkstaInfo1052.use_lock_read_unlock", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1056,
+         { "Info1056", "wkssvc.wkssvc_NetWkstaInfo.info1056", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrValidateName_Account,
          { "Account", "wkssvc.wkssvc_NetrValidateName.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_wkssvc_wkssvc_NetWkstaInfo_val1041_info1041,
-         { "Info1041", "wkssvc.wkssvc_NetWkstaInfo_val1041.info1041", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1032,
+         { "Info1032", "wkssvc.wkssvc_NetWkstaInfo.info1032", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_Account,
          { "Account", "wkssvc.wkssvc_NetrRemoveAlternateComputerName.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_wkssvc_wkssvc_NetWkstaInfo_info1053,
+         { "Info1053", "wkssvc.wkssvc_NetWkstaInfo.info1053", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_EncryptedPassword,
          { "Encryptedpassword", "wkssvc.wkssvc_NetrRenameMachineInDomain2.EncryptedPassword", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_wkssvc_wkssvc_NetWkstaSetInfo_level,

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-xattr.c b/bin/default/librpc/gen_ndr/packet-dcerpc-xattr.c
index 049109d9daf2edd5675377b7f2a439838a092a9d..6e99334da731cada740949b70ca765b01a3c5a3f 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-xattr.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-xattr.c
@@ -55,6 +55,8 @@ static gint ett_xattr_xattr_sys_acl_hash_wrapper = -1;
 static gint hf_xattr_security_descriptor_hash_v4_sd = -1;
 static gint hf_xattr_security_descriptor_hash_v3_hash = -1;
 static gint hf_xattr_xattr_DOSATTRIB_info = -1;
+static gint hf_xattr_xattr_NTACL_Info_sd = -1;
+static gint hf_xattr_xattr_NTACL_Info_sd_hs3 = -1;
 static gint hf_xattr_xattr_DosInfo2Old_alloc_size = -1;
 static gint hf_xattr_xattr_DosInfo3_change_time = -1;
 static gint hf_xattr_xattr_DosInfo1_create_time = -1;
@@ -64,8 +66,6 @@ static gint hf_xattr_xattr_DosInfo2Old_ea_size = -1;
 static gint hf_xattr_security_descriptor_hash_v4_hash = -1;
 static gint hf_xattr_xattr_DosInfo2Old_size = -1;
 static gint hf_xattr_xattr_DosInfo2Old_name = -1;
-static gint hf_xattr_xattr_NTACL_Info_val3_sd_hs3 = -1;
-static gint hf_xattr_xattr_DosInfo_val3_info3 = -1;
 static gint hf_xattr_xattr_DosInfoValidFlags_XATTR_DOSINFO_SIZE = -1;
 static gint hf_xattr_xattr_DosInfoValidFlags_XATTR_DOSINFO_CREATE_TIME = -1;
 static gint hf_xattr_xattr_sys_acl_hash_wrapper_owner = -1;
@@ -73,24 +73,25 @@ static gint hf_xattr_xattr_DosInfo3_create_time = -1;
 static gint hf_xattr_xattr_DosStreams_num_streams = -1;
 static gint hf_xattr_xattr_DosStream_flags = -1;
 static gint hf_xattr_xattr_DosInfo1_change_time = -1;
-static gint hf_xattr_xattr_DosInfo_val2_oldinfo2 = -1;
 static gint hf_xattr_xattr_DosAttrib_info = -1;
 static gint hf_xattr_xattr_DosInfoFFFFCompat_attrib = -1;
+static gint hf_xattr_xattr_DosInfo_compatinfoFFFF = -1;
 static gint hf_xattr_xattr_DosAttrib_version = -1;
 static gint hf_xattr_xattr_DosStreams_streams = -1;
 static gint hf_xattr_xattr_DosInfo3_alloc_size = -1;
 static gint hf_xattr_xattr_sys_acl_hash_wrapper_acl_as_blob = -1;
 static gint hf_xattr_xattr_DosEAs_num_eas = -1;
-static gint hf_xattr_xattr_NTACL_Info_val4_sd_hs4 = -1;
 static gint hf_xattr_security_descriptor_hash_v4_sys_acl_hash = -1;
 static gint hf_xattr_opnum = -1;
 static gint hf_xattr_xattr_DosInfo2Old_attrib = -1;
 static gint hf_xattr_xattr_DosInfo1_alloc_size = -1;
 static gint hf_xattr_xattr_DosInfoValidFlags_XATTR_DOSINFO_CHANGE_TIME = -1;
 static gint hf_xattr_tdb_xattrs_num_eas = -1;
+static gint hf_xattr_xattr_NTACL_Info_sd_hs2 = -1;
+static gint hf_xattr_xattr_DosInfo_info1 = -1;
 static gint hf_xattr_xattr_parse_DOSATTRIB_x = -1;
 static gint hf_xattr_xattr_DosInfo2Old_change_time = -1;
-static gint hf_xattr_xattr_NTACL_Info_val2_sd_hs2 = -1;
+static gint hf_xattr_xattr_NTACL_Info_sd_hs4 = -1;
 static gint hf_xattr_xattr_DosInfoValidFlags_XATTR_DOSINFO_EA_SIZE = -1;
 static gint hf_xattr_security_descriptor_hash_v3_sd = -1;
 static gint hf_xattr_xattr_DosInfo1_attrib = -1;
@@ -100,23 +101,22 @@ static gint hf_xattr_xattr_EA_value = -1;
 static gint hf_xattr_xattr_DosStream_size = -1;
 static gint hf_xattr_xattr_DOSATTRIB_version = -1;
 static gint hf_xattr_security_descriptor_hash_v4_time = -1;
-static gint hf_xattr_xattr_NTACL_Info_val1_sd = -1;
 static gint hf_xattr_xattr_sys_acl_hash_wrapper_mode = -1;
 static gint hf_xattr_security_descriptor_hash_v4_description = -1;
-static gint hf_xattr_xattr_DosInfo_val0xFFFF_compatinfoFFFF = -1;
 static gint hf_xattr_xattr_DosInfoValidFlags_XATTR_DOSINFO_ATTRIB = -1;
 static gint hf_xattr_xattr_DosEAs_eas = -1;
 static gint hf_xattr_security_descriptor_hash_v3_hash_type = -1;
-static gint hf_xattr_xattr_DosInfo_val1_info1 = -1;
 static gint hf_xattr_xattr_DosInfo3_attrib = -1;
 static gint hf_xattr_xattr_DosInfo3_valid_flags = -1;
 static gint hf_xattr_xattr_DosInfo1_ea_size = -1;
+static gint hf_xattr_xattr_DosInfo_info3 = -1;
 static gint hf_xattr_security_descriptor_hash_v4_hash_type = -1;
 static gint hf_xattr_xattr_DosStream_alloc_size = -1;
 static gint hf_xattr_xattr_DOSATTRIB_attrib_hex = -1;
 static gint hf_xattr_xattr_EA_name = -1;
 static gint hf_xattr_xattr_DosInfoValidFlags_XATTR_DOSINFO_ALLOC_SIZE = -1;
 static gint hf_xattr_xattr_DosInfo2Old_flags = -1;
+static gint hf_xattr_xattr_DosInfo_oldinfo2 = -1;
 static gint hf_xattr_xattr_DosStream_name = -1;
 static gint hf_xattr_xattr_NTACL_info = -1;
 static gint hf_xattr_xattr_DosInfo3_size = -1;
@@ -183,10 +183,10 @@ static int xattr_dissect_element_DosInfo3_size(tvbuff_t *tvb _U_, int offset _U_
 static int xattr_dissect_element_DosInfo3_alloc_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int xattr_dissect_element_DosInfo3_create_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int xattr_dissect_element_DosInfo3_change_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int xattr_dissect_element_DosInfo_val0xFFFF_compatinfoFFFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int xattr_dissect_element_DosInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int xattr_dissect_element_DosInfo_val2_oldinfo2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int xattr_dissect_element_DosInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int xattr_dissect_element_DosInfo_compatinfoFFFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int xattr_dissect_element_DosInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int xattr_dissect_element_DosInfo_oldinfo2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int xattr_dissect_element_DosInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int xattr_dissect_element_DosAttrib_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
 static int xattr_dissect_element_DosAttrib_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
 static int xattr_dissect_element_DOSATTRIB_attrib_hex(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -227,14 +227,14 @@ static int xattr_dissect_element_security_descriptor_hash_v4_description(tvbuff_
 static int xattr_dissect_element_security_descriptor_hash_v4_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int xattr_dissect_element_security_descriptor_hash_v4_sys_acl_hash(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int xattr_dissect_element_security_descriptor_hash_v4_sys_acl_hash_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int xattr_dissect_element_NTACL_Info_val1_sd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int xattr_dissect_element_NTACL_Info_val1_sd_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int xattr_dissect_element_NTACL_Info_val2_sd_hs2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int xattr_dissect_element_NTACL_Info_val2_sd_hs2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int xattr_dissect_element_NTACL_Info_val3_sd_hs3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int xattr_dissect_element_NTACL_Info_val3_sd_hs3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int xattr_dissect_element_NTACL_Info_val4_sd_hs4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int xattr_dissect_element_NTACL_Info_val4_sd_hs4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int xattr_dissect_element_NTACL_Info_sd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int xattr_dissect_element_NTACL_Info_sd_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int xattr_dissect_element_NTACL_Info_sd_hs2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int xattr_dissect_element_NTACL_Info_sd_hs2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int xattr_dissect_element_NTACL_Info_sd_hs3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int xattr_dissect_element_NTACL_Info_sd_hs3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int xattr_dissect_element_NTACL_Info_sd_hs4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
+static int xattr_dissect_element_NTACL_Info_sd_hs4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int xattr_dissect_element_NTACL_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
 static int xattr_dissect_element_NTACL_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
 static int xattr_dissect_element_sys_acl_hash_wrapper_acl_as_blob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -718,33 +718,33 @@ xattr_dissect_struct_DosInfo3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 /* IDL: } */
 
 static int
-xattr_dissect_element_DosInfo_val0xFFFF_compatinfoFFFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+xattr_dissect_element_DosInfo_compatinfoFFFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = xattr_dissect_struct_DosInfoFFFFCompat(tvb,offset,pinfo,tree,drep,hf_xattr_xattr_DosInfo_val0xFFFF_compatinfoFFFF,0);
+       offset = xattr_dissect_struct_DosInfoFFFFCompat(tvb,offset,pinfo,tree,drep,hf_xattr_xattr_DosInfo_compatinfoFFFF,0);
 
        return offset;
 }
 
 static int
-xattr_dissect_element_DosInfo_val1_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+xattr_dissect_element_DosInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = xattr_dissect_struct_DosInfo1(tvb,offset,pinfo,tree,drep,hf_xattr_xattr_DosInfo_val1_info1,0);
+       offset = xattr_dissect_struct_DosInfo1(tvb,offset,pinfo,tree,drep,hf_xattr_xattr_DosInfo_info1,0);
 
        return offset;
 }
 
 static int
-xattr_dissect_element_DosInfo_val2_oldinfo2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+xattr_dissect_element_DosInfo_oldinfo2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = xattr_dissect_struct_DosInfo2Old(tvb,offset,pinfo,tree,drep,hf_xattr_xattr_DosInfo_val2_oldinfo2,0);
+       offset = xattr_dissect_struct_DosInfo2Old(tvb,offset,pinfo,tree,drep,hf_xattr_xattr_DosInfo_oldinfo2,0);
 
        return offset;
 }
 
 static int
-xattr_dissect_element_DosInfo_val3_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+xattr_dissect_element_DosInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = xattr_dissect_struct_DosInfo3(tvb,offset,pinfo,tree,drep,hf_xattr_xattr_DosInfo_val3_info3,0);
+       offset = xattr_dissect_struct_DosInfo3(tvb,offset,pinfo,tree,drep,hf_xattr_xattr_DosInfo_info3,0);
 
        return offset;
 }
@@ -768,19 +768,19 @@ xattr_dissect_DosInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_,
 
        switch(level) {
                case 0xFFFF:
-                       offset = xattr_dissect_element_DosInfo_val0xFFFF_compatinfoFFFF(tvb, offset, pinfo, tree, drep);
+                       offset = xattr_dissect_element_DosInfo_compatinfoFFFF(tvb, offset, pinfo, tree, drep);
                break;
 
                case 1:
-                       offset = xattr_dissect_element_DosInfo_val1_info1(tvb, offset, pinfo, tree, drep);
+                       offset = xattr_dissect_element_DosInfo_info1(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = xattr_dissect_element_DosInfo_val2_oldinfo2(tvb, offset, pinfo, tree, drep);
+                       offset = xattr_dissect_element_DosInfo_oldinfo2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = xattr_dissect_element_DosInfo_val3_info3(tvb, offset, pinfo, tree, drep);
+                       offset = xattr_dissect_element_DosInfo_info3(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -1538,65 +1538,65 @@ xattr_dissect_struct_security_descriptor_hash_v4(tvbuff_t *tvb _U_, int offset _
 /* IDL: } */
 
 static int
-xattr_dissect_element_NTACL_Info_val1_sd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+xattr_dissect_element_NTACL_Info_sd(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, xattr_dissect_element_NTACL_Info_val1_sd_, NDR_POINTER_UNIQUE, "Pointer to Sd (security_descriptor)",hf_xattr_xattr_NTACL_Info_val1_sd);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, xattr_dissect_element_NTACL_Info_sd_, NDR_POINTER_UNIQUE, "Pointer to Sd (security_descriptor)",hf_xattr_xattr_NTACL_Info_sd);
 
        return offset;
 }
 
 static int
-xattr_dissect_element_NTACL_Info_val1_sd_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+xattr_dissect_element_NTACL_Info_sd_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = xattr_dissect_struct_security_descriptor(tvb,offset,pinfo,tree,drep,hf_xattr_xattr_NTACL_Info_val1_sd,0);
+       offset = xattr_dissect_struct_security_descriptor(tvb,offset,pinfo,tree,drep,hf_xattr_xattr_NTACL_Info_sd,0);
 
        return offset;
 }
 
 static int
-xattr_dissect_element_NTACL_Info_val2_sd_hs2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+xattr_dissect_element_NTACL_Info_sd_hs2(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, xattr_dissect_element_NTACL_Info_val2_sd_hs2_, NDR_POINTER_UNIQUE, "Pointer to Sd Hs2 (security_descriptor_hash_v2)",hf_xattr_xattr_NTACL_Info_val2_sd_hs2);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, xattr_dissect_element_NTACL_Info_sd_hs2_, NDR_POINTER_UNIQUE, "Pointer to Sd Hs2 (security_descriptor_hash_v2)",hf_xattr_xattr_NTACL_Info_sd_hs2);
 
        return offset;
 }
 
 static int
-xattr_dissect_element_NTACL_Info_val2_sd_hs2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+xattr_dissect_element_NTACL_Info_sd_hs2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = xattr_dissect_struct_security_descriptor_hash_v2(tvb,offset,pinfo,tree,drep,hf_xattr_xattr_NTACL_Info_val2_sd_hs2,0);
+       offset = xattr_dissect_struct_security_descriptor_hash_v2(tvb,offset,pinfo,tree,drep,hf_xattr_xattr_NTACL_Info_sd_hs2,0);
 
        return offset;
 }
 
 static int
-xattr_dissect_element_NTACL_Info_val3_sd_hs3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+xattr_dissect_element_NTACL_Info_sd_hs3(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, xattr_dissect_element_NTACL_Info_val3_sd_hs3_, NDR_POINTER_UNIQUE, "Pointer to Sd Hs3 (security_descriptor_hash_v3)",hf_xattr_xattr_NTACL_Info_val3_sd_hs3);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, xattr_dissect_element_NTACL_Info_sd_hs3_, NDR_POINTER_UNIQUE, "Pointer to Sd Hs3 (security_descriptor_hash_v3)",hf_xattr_xattr_NTACL_Info_sd_hs3);
 
        return offset;
 }
 
 static int
-xattr_dissect_element_NTACL_Info_val3_sd_hs3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+xattr_dissect_element_NTACL_Info_sd_hs3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = xattr_dissect_struct_security_descriptor_hash_v3(tvb,offset,pinfo,tree,drep,hf_xattr_xattr_NTACL_Info_val3_sd_hs3,0);
+       offset = xattr_dissect_struct_security_descriptor_hash_v3(tvb,offset,pinfo,tree,drep,hf_xattr_xattr_NTACL_Info_sd_hs3,0);
 
        return offset;
 }
 
 static int
-xattr_dissect_element_NTACL_Info_val4_sd_hs4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+xattr_dissect_element_NTACL_Info_sd_hs4(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, xattr_dissect_element_NTACL_Info_val4_sd_hs4_, NDR_POINTER_UNIQUE, "Pointer to Sd Hs4 (security_descriptor_hash_v4)",hf_xattr_xattr_NTACL_Info_val4_sd_hs4);
+       offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, xattr_dissect_element_NTACL_Info_sd_hs4_, NDR_POINTER_UNIQUE, "Pointer to Sd Hs4 (security_descriptor_hash_v4)",hf_xattr_xattr_NTACL_Info_sd_hs4);
 
        return offset;
 }
 
 static int
-xattr_dissect_element_NTACL_Info_val4_sd_hs4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
+xattr_dissect_element_NTACL_Info_sd_hs4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = xattr_dissect_struct_security_descriptor_hash_v4(tvb,offset,pinfo,tree,drep,hf_xattr_xattr_NTACL_Info_val4_sd_hs4,0);
+       offset = xattr_dissect_struct_security_descriptor_hash_v4(tvb,offset,pinfo,tree,drep,hf_xattr_xattr_NTACL_Info_sd_hs4,0);
 
        return offset;
 }
@@ -1620,19 +1620,19 @@ xattr_dissect_NTACL_Info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _
 
        switch(level) {
                case 1:
-                       offset = xattr_dissect_element_NTACL_Info_val1_sd(tvb, offset, pinfo, tree, drep);
+                       offset = xattr_dissect_element_NTACL_Info_sd(tvb, offset, pinfo, tree, drep);
                break;
 
                case 2:
-                       offset = xattr_dissect_element_NTACL_Info_val2_sd_hs2(tvb, offset, pinfo, tree, drep);
+                       offset = xattr_dissect_element_NTACL_Info_sd_hs2(tvb, offset, pinfo, tree, drep);
                break;
 
                case 3:
-                       offset = xattr_dissect_element_NTACL_Info_val3_sd_hs3(tvb, offset, pinfo, tree, drep);
+                       offset = xattr_dissect_element_NTACL_Info_sd_hs3(tvb, offset, pinfo, tree, drep);
                break;
 
                case 4:
-                       offset = xattr_dissect_element_NTACL_Info_val4_sd_hs4(tvb, offset, pinfo, tree, drep);
+                       offset = xattr_dissect_element_NTACL_Info_sd_hs4(tvb, offset, pinfo, tree, drep);
                break;
        }
        proto_item_set_len(item, offset-old_offset);
@@ -1815,6 +1815,10 @@ void proto_register_dcerpc_xattr(void)
          { "Hash", "xattr.security_descriptor_hash_v3.hash", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DOSATTRIB_info,
          { "Info", "xattr.xattr_DOSATTRIB.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_xattr_xattr_NTACL_Info_sd,
+         { "Sd", "xattr.xattr_NTACL_Info.sd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_xattr_xattr_NTACL_Info_sd_hs3,
+         { "Sd Hs3", "xattr.xattr_NTACL_Info.sd_hs3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosInfo2Old_alloc_size,
          { "Alloc Size", "xattr.xattr_DosInfo2Old.alloc_size", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosInfo3_change_time,
@@ -1833,10 +1837,6 @@ void proto_register_dcerpc_xattr(void)
          { "Size", "xattr.xattr_DosInfo2Old.size", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosInfo2Old_name,
          { "Name", "xattr.xattr_DosInfo2Old.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_xattr_xattr_NTACL_Info_val3_sd_hs3,
-         { "Sd Hs3", "xattr.xattr_NTACL_Info_val3.sd_hs3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_xattr_xattr_DosInfo_val3_info3,
-         { "Info3", "xattr.xattr_DosInfo_val3.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosInfoValidFlags_XATTR_DOSINFO_SIZE,
          { "Xattr Dosinfo Size", "xattr.xattr_DosInfoValidFlags.XATTR_DOSINFO_SIZE", FT_BOOLEAN, 32, TFS(&xattr_DosInfoValidFlags_XATTR_DOSINFO_SIZE_tfs), ( 0x00000004 ), NULL, HFILL }},
        { &hf_xattr_xattr_DosInfoValidFlags_XATTR_DOSINFO_CREATE_TIME,
@@ -1851,12 +1851,12 @@ void proto_register_dcerpc_xattr(void)
          { "Flags", "xattr.xattr_DosStream.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosInfo1_change_time,
          { "Change Time", "xattr.xattr_DosInfo1.change_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
-       { &hf_xattr_xattr_DosInfo_val2_oldinfo2,
-         { "Oldinfo2", "xattr.xattr_DosInfo_val2.oldinfo2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosAttrib_info,
          { "Info", "xattr.xattr_DosAttrib.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosInfoFFFFCompat_attrib,
          { "Attrib", "xattr.xattr_DosInfoFFFFCompat.attrib", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_xattr_xattr_DosInfo_compatinfoFFFF,
+         { "Compatinfoffff", "xattr.xattr_DosInfo.compatinfoFFFF", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosAttrib_version,
          { "Version", "xattr.xattr_DosAttrib.version", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosStreams_streams,
@@ -1867,8 +1867,6 @@ void proto_register_dcerpc_xattr(void)
          { "Acl As Blob", "xattr.xattr_sys_acl_hash_wrapper.acl_as_blob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosEAs_num_eas,
          { "Num Eas", "xattr.xattr_DosEAs.num_eas", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_xattr_xattr_NTACL_Info_val4_sd_hs4,
-         { "Sd Hs4", "xattr.xattr_NTACL_Info_val4.sd_hs4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_security_descriptor_hash_v4_sys_acl_hash,
          { "Sys Acl Hash", "xattr.security_descriptor_hash_v4.sys_acl_hash", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_opnum,
@@ -1881,12 +1879,16 @@ void proto_register_dcerpc_xattr(void)
          { "Xattr Dosinfo Change Time", "xattr.xattr_DosInfoValidFlags.XATTR_DOSINFO_CHANGE_TIME", FT_BOOLEAN, 32, TFS(&xattr_DosInfoValidFlags_XATTR_DOSINFO_CHANGE_TIME_tfs), ( 0x00000020 ), NULL, HFILL }},
        { &hf_xattr_tdb_xattrs_num_eas,
          { "Num Eas", "xattr.tdb_xattrs.num_eas", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_xattr_xattr_NTACL_Info_sd_hs2,
+         { "Sd Hs2", "xattr.xattr_NTACL_Info.sd_hs2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_xattr_xattr_DosInfo_info1,
+         { "Info1", "xattr.xattr_DosInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_parse_DOSATTRIB_x,
          { "X", "xattr.xattr_parse_DOSATTRIB.x", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosInfo2Old_change_time,
          { "Change Time", "xattr.xattr_DosInfo2Old.change_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
-       { &hf_xattr_xattr_NTACL_Info_val2_sd_hs2,
-         { "Sd Hs2", "xattr.xattr_NTACL_Info_val2.sd_hs2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+       { &hf_xattr_xattr_NTACL_Info_sd_hs4,
+         { "Sd Hs4", "xattr.xattr_NTACL_Info.sd_hs4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosInfoValidFlags_XATTR_DOSINFO_EA_SIZE,
          { "Xattr Dosinfo Ea Size", "xattr.xattr_DosInfoValidFlags.XATTR_DOSINFO_EA_SIZE", FT_BOOLEAN, 32, TFS(&xattr_DosInfoValidFlags_XATTR_DOSINFO_EA_SIZE_tfs), ( 0x00000002 ), NULL, HFILL }},
        { &hf_xattr_security_descriptor_hash_v3_sd,
@@ -1905,28 +1907,24 @@ void proto_register_dcerpc_xattr(void)
          { "Version", "xattr.xattr_DOSATTRIB.version", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_xattr_security_descriptor_hash_v4_time,
          { "Time", "xattr.security_descriptor_hash_v4.time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0, NULL, HFILL }},
-       { &hf_xattr_xattr_NTACL_Info_val1_sd,
-         { "Sd", "xattr.xattr_NTACL_Info_val1.sd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_sys_acl_hash_wrapper_mode,
          { "Mode", "xattr.xattr_sys_acl_hash_wrapper.mode", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_xattr_security_descriptor_hash_v4_description,
          { "Description", "xattr.security_descriptor_hash_v4.description", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-       { &hf_xattr_xattr_DosInfo_val0xFFFF_compatinfoFFFF,
-         { "Compatinfoffff", "xattr.xattr_DosInfo_val0xFFFF.compatinfoFFFF", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosInfoValidFlags_XATTR_DOSINFO_ATTRIB,
          { "Xattr Dosinfo Attrib", "xattr.xattr_DosInfoValidFlags.XATTR_DOSINFO_ATTRIB", FT_BOOLEAN, 32, TFS(&xattr_DosInfoValidFlags_XATTR_DOSINFO_ATTRIB_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_xattr_xattr_DosEAs_eas,
          { "Eas", "xattr.xattr_DosEAs.eas", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_security_descriptor_hash_v3_hash_type,
          { "Hash Type", "xattr.security_descriptor_hash_v3.hash_type", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-       { &hf_xattr_xattr_DosInfo_val1_info1,
-         { "Info1", "xattr.xattr_DosInfo_val1.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosInfo3_attrib,
          { "Attrib", "xattr.xattr_DosInfo3.attrib", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosInfo3_valid_flags,
          { "Valid Flags", "xattr.xattr_DosInfo3.valid_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosInfo1_ea_size,
          { "Ea Size", "xattr.xattr_DosInfo1.ea_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_xattr_xattr_DosInfo_info3,
+         { "Info3", "xattr.xattr_DosInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_security_descriptor_hash_v4_hash_type,
          { "Hash Type", "xattr.security_descriptor_hash_v4.hash_type", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosStream_alloc_size,
@@ -1939,6 +1937,8 @@ void proto_register_dcerpc_xattr(void)
          { "Xattr Dosinfo Alloc Size", "xattr.xattr_DosInfoValidFlags.XATTR_DOSINFO_ALLOC_SIZE", FT_BOOLEAN, 32, TFS(&xattr_DosInfoValidFlags_XATTR_DOSINFO_ALLOC_SIZE_tfs), ( 0x00000008 ), NULL, HFILL }},
        { &hf_xattr_xattr_DosInfo2Old_flags,
          { "Flags", "xattr.xattr_DosInfo2Old.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+       { &hf_xattr_xattr_DosInfo_oldinfo2,
+         { "Oldinfo2", "xattr.xattr_DosInfo.oldinfo2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_DosStream_name,
          { "Name", "xattr.xattr_DosStream.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_xattr_xattr_NTACL_info,