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

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-drsuapi.c b/bin/default/librpc/gen_ndr/packet-dcerpc-drsuapi.c
index e6e14c8e975624fd992d076af98b88b0134da32b..d830c2d8b39cedea88cb060d1171b5d40c003235 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-drsuapi.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-drsuapi.c
@@ -3945,7 +3945,12 @@ drsuapi_dissect_element_DsReplicaObjectIdentifier_guid(tvbuff_t *tvb _U_, int of
 static int
 drsuapi_dissect_element_DsReplicaObjectIdentifier_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_dom_sid28(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaObjectIdentifier_sid,0);
+       {
+               dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
+               di->hf_index = hf_drsuapi_drsuapi_DsReplicaObjectIdentifier_sid;
+
+               offset = dissect_ndr_nt_SID28(tvb, offset, pinfo, tree, drep);
+       }
 
        return offset;
 }
@@ -5811,7 +5816,12 @@ drsuapi_dissect_element_DsReplicaObjectIdentifier3_guid(tvbuff_t *tvb _U_, int o
 static int
 drsuapi_dissect_element_DsReplicaObjectIdentifier3_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_dom_sid28(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3_sid,0);
+       {
+               dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
+               di->hf_index = hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3_sid;
+
+               offset = dissect_ndr_nt_SID28(tvb, offset, pinfo, tree, drep);
+       }
 
        return offset;
 }
@@ -5918,7 +5928,12 @@ drsuapi_dissect_element_DsReplicaObjectIdentifier3Binary_guid(tvbuff_t *tvb _U_,
 static int
 drsuapi_dissect_element_DsReplicaObjectIdentifier3Binary_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_)
 {
-       offset = drsuapi_dissect_struct_dom_sid28(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3Binary_sid,0);
+       {
+               dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
+               di->hf_index = hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3Binary_sid;
+
+               offset = dissect_ndr_nt_SID28(tvb, offset, pinfo, tree, drep);
+       }
 
        return offset;
 }
@@ -8766,7 +8781,12 @@ drsuapi_dissect_element_DsGetMembershipsCtr1_sids__(tvbuff_t *tvb _U_, int offse
 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_)
 {
-       offset = drsuapi_dissect_struct_dom_sid28(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsGetMembershipsCtr1_sids,0);
+       {
+               dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
+               di->hf_index = hf_drsuapi_drsuapi_DsGetMembershipsCtr1_sids;
+
+               offset = dissect_ndr_nt_SID28(tvb, offset, pinfo, tree, drep);
+       }
 
        return offset;
 }
@@ -13229,7 +13249,12 @@ drsuapi_dissect_element_DsReplicaObjectIdentifier2_guid(tvbuff_t *tvb _U_, int o
 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_)
 {
-       offset = drsuapi_dissect_struct_dom_sid28(tvb,offset,pinfo,tree,drep,hf_drsuapi_drsuapi_DsReplicaObjectIdentifier2_sid,0);
+       {
+               dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
+               di->hf_index = hf_drsuapi_drsuapi_DsReplicaObjectIdentifier2_sid;
+
+               offset = dissect_ndr_nt_SID28(tvb, offset, pinfo, tree, drep);
+       }
 
        return offset;
 }
@@ -19485,7 +19510,7 @@ void proto_register_dcerpc_drsuapi(void)
        { &hf_drsuapi_drsuapi_DsReplicaObjectFlags_DRSUAPI_DS_REPLICA_OBJECT_REMOTE_MODIFY,
          { "Drsuapi Ds Replica Object Remote Modify", "drsuapi.drsuapi_DsReplicaObjectFlags.DRSUAPI_DS_REPLICA_OBJECT_REMOTE_MODIFY", FT_BOOLEAN, 32, TFS(&drsuapi_DsReplicaObjectFlags_DRSUAPI_DS_REPLICA_OBJECT_REMOTE_MODIFY_tfs), ( 0x00010000 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsGetMembershipsCtr1_sids,
-         { "Sids", "drsuapi.drsuapi_DsGetMembershipsCtr1.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+         { "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_DsGetNCChangesRequest8_partial_attribute_set_ex,
@@ -19523,7 +19548,7 @@ void proto_register_dcerpc_drsuapi(void)
        { &hf_drsuapi_drsuapi_DsReplica06Ctr_array,
          { "Array", "drsuapi.drsuapi_DsReplica06Ctr.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjectIdentifier2_sid,
-         { "Sid", "drsuapi.drsuapi_DsReplicaObjectIdentifier2.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+         { "Sid", "drsuapi.drsuapi_DsReplicaObjectIdentifier2.sid", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_BASE,
          { "Drsuapi Supported Extension Base", "drsuapi.drsuapi_SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_BASE", FT_BOOLEAN, 32, TFS(&drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_BASE_tfs), ( 0x00000001 ), NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsNameRequest1_format_flags,
@@ -19539,7 +19564,7 @@ void proto_register_dcerpc_drsuapi(void)
        { &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_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+         { "Sid", "drsuapi.drsuapi_DsReplicaObjectIdentifier3.sid", FT_STRING, 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,
@@ -19739,7 +19764,7 @@ void proto_register_dcerpc_drsuapi(void)
        { &hf_drsuapi_drsuapi_QuerySitesByCostCtr1_num_info,
          { "Num Info", "drsuapi.drsuapi_QuerySitesByCostCtr1.num_info", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjectIdentifier3Binary_sid,
-         { "Sid", "drsuapi.drsuapi_DsReplicaObjectIdentifier3Binary.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+         { "Sid", "drsuapi.drsuapi_DsReplicaObjectIdentifier3Binary.sid", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaOp_remote_dsa_obj_dn,
          { "Remote Dsa Obj Dn", "drsuapi.drsuapi_DsReplicaOp.remote_dsa_obj_dn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntry_RefErrListItem_V1_addr_list,
@@ -20445,7 +20470,7 @@ void proto_register_dcerpc_drsuapi(void)
        { &hf_drsuapi_drsuapi_DsReplicaGetInfoRequest2_object_dn,
          { "Object Dn", "drsuapi.drsuapi_DsReplicaGetInfoRequest2.object_dn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaObjectIdentifier_sid,
-         { "Sid", "drsuapi.drsuapi_DsReplicaObjectIdentifier.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+         { "Sid", "drsuapi.drsuapi_DsReplicaObjectIdentifier.sid", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsAddEntryCtr2_extended_data,
          { "Extended Data", "drsuapi.drsuapi_DsAddEntryCtr2.extended_data", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
        { &hf_drsuapi_drsuapi_DsReplicaGetInfo_level,