]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
pidl: Update Wireshark generated DRSUAPI code
authorJohn Thacker <johnthacker@gmail.com>
Wed, 3 Jul 2024 11:42:26 +0000 (07:42 -0400)
committerStefan Metzmacher <metze@samba.org>
Fri, 12 Jul 2024 09:59:32 +0000 (09:59 +0000)
Picked from Wireshark:

    commit b1249b0be4badc44cbbb30ff414d32d1b884a668
    Author: hidd3ncod3s Sec <hidd3ncod3s@gmail.com>
    Date:   Tue Aug 15 04:29:08 2023 +0000

        DCERPC: Update DRSUAPI support

Signed-off-by: John Thacker <johnthacker@gmail.com>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
pidl/lib/Parse/Pidl/Wireshark/NDR.pm

index 44d81dbabe249a3376b321ae7666c176f693244e..64e1fd8bd96dde9628fdaf6d556d2b132bd4de6e 100644 (file)
@@ -1117,16 +1117,10 @@ sub Initialize($$)
        $self->register_type("NTTIME_hyper", "offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, di, drep, \@HF\@);","FT_ABSOLUTE_TIME", "ABSOLUTE_TIME_LOCAL", 0, "NULL", 4);
        $self->register_type("time_t", "offset = dissect_ndr_time_t(tvb, offset, pinfo,tree, di, drep, \@HF\@, NULL);","FT_ABSOLUTE_TIME", "ABSOLUTE_TIME_LOCAL", 0, "NULL", 4);
        $self->register_type("NTTIME_1sec", "offset = dissect_ndr_nt_NTTIME(tvb, offset, pinfo, tree, di, drep, \@HF\@);", "FT_ABSOLUTE_TIME", "ABSOLUTE_TIME_LOCAL", 0, "NULL", 4);
-       $self->register_type("dom_sid28", "
-               di->hf_index = \@HF\@;
-
-               offset = dissect_ndr_nt_SID28(tvb, offset, pinfo, tree, di, drep);
-       ", "FT_STRING", "BASE_NONE", 0, "NULL", 4);
-       $self->register_type("SID", "
-               di->hf_index = \@HF\@;
-
-               offset = dissect_ndr_nt_SID_with_options(tvb, offset, pinfo, tree, di, drep, param);
-       ","FT_STRING", "BASE_NONE", 0, "NULL", 4);
+       $self->register_type("dom_sid28",
+               "offset = dissect_ndr_nt_SID28(tvb, offset, pinfo, tree, di, drep, \@HF\@);", "FT_STRING", "BASE_NONE", 0, "NULL", 4);
+       $self->register_type("SID",
+               "offset = dissect_ndr_nt_SID_with_options(tvb, offset, pinfo, tree, di, drep, param, \@HF\@);","FT_STRING", "BASE_NONE", 0, "NULL", 4);
        $self->register_type("WERROR",
                "offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, di, drep, \@HF\@, \@PARAM\@);","FT_UINT32", "BASE_DEC", 0, "VALS(WERR_errors)", 4);
        $self->register_type("NTSTATUS",