Changeset 988 for vendor/current/librpc/tools/ndrdump.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/librpc/tools/ndrdump.c (modified) (12 diffs)

vendor/current/librpc/tools/ndrdump.c

@@ -24 +24 @@
 #include "librpc/ndr/libndr.h"
 #include "librpc/ndr/ndr_table.h"
-#if (_SAMBA_BUILD_ >= 4)
+#include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "lib/cmdline/popt_common.h"
 #include "param/param.h"
-#endif
 
 static const struct ndr_interface_call *find_function(
@@ -120 +119 @@
                 printf("%s: Unable to find DCE/RPC interface table for '%s': %s\n", plugin, pipe_name, dlerror());
                 talloc_free(symbol);
+                dlclose(handle);
                 return NULL;
         }
@@ -128 +128 @@
 }
 
-static void printf_cb(const char *buf, void *private_data)
-{
-        printf("%s", buf);
-}
-
 static void ndrdump_data(uint8_t *d, uint32_t l, bool force)
 {
-        dump_data_cb(d, l, !force, printf_cb, NULL);
+        dump_data_file(d, l, !force, stdout);
 }
 
@@ -150 +145 @@
                 uint64_t idx = 0;
                 while (true) {
+                        void *saved_mem_ctx;
                         uint32_t *count;
                         void *c;
@@ -166 +162 @@
                                         (unsigned long long)idx);
 
+                        saved_mem_ctx = ndr_pull->current_mem_ctx;
+                        ndr_pull->current_mem_ctx = c;
                         ndr_err = pipes->pipes[i].ndr_pull(ndr_pull, NDR_SCALARS, c);
+                        ndr_pull->current_mem_ctx = saved_mem_ctx;
                         status = ndr_map_error2ntstatus(ndr_err);
 
                         printf("pull returned %s\n", nt_errstr(status));
                         if (!NT_STATUS_IS_OK(status)) {
+                                talloc_free(c);
                                 return status;
                         }
                         pipes->pipes[i].ndr_print(ndr_print, n, c);
-
+                        talloc_free(c);
                         if (*count == 0) {
                                 break;
@@ -220 +220 @@
                 { NULL }
         };
-        struct ndr_interface_call_pipes *in_pipes = NULL;
-        struct ndr_interface_call_pipes *out_pipes = NULL;
+        const struct ndr_interface_call_pipes *in_pipes = NULL;
+        const struct ndr_interface_call_pipes *out_pipes = NULL;
+        uint32_t highest_ofs;
+        struct dcerpc_sec_verification_trailer *sec_vt = NULL;
 
         ndr_table_init();
 
         /* Initialise samba stuff */
-        load_case_tables();
+        smb_init_locale();
 
         setlinebuf(stdout);
@@ -342 +344 @@
 
                 ndr_pull = ndr_pull_init_blob(&blob, mem_ctx);
+                if (ndr_pull == NULL) {
+                        perror("ndr_pull_init_blob");
+                        exit(1);
+                }
                 ndr_pull->flags |= LIBNDR_FLAG_REF_ALLOC;
                 if (assume_ndr64) {
@@ -349 +355 @@
                 ndr_err = f->ndr_pull(ndr_pull, NDR_IN, st);
 
-                if (ndr_pull->offset != ndr_pull->data_size) {
-                        printf("WARNING! %d unread bytes while parsing context file\n", ndr_pull->data_size - ndr_pull->offset);
+                if (ndr_pull->offset > ndr_pull->relative_highest_offset) {
+                        highest_ofs = ndr_pull->offset;
+                } else {
+                        highest_ofs = ndr_pull->relative_highest_offset;
+                }
+
+                if (highest_ofs != ndr_pull->data_size) {
+                        printf("WARNING! %d unread bytes while parsing context file\n", ndr_pull->data_size - highest_ofs);
                 }
 
@@ -378 +390 @@
 
         ndr_pull = ndr_pull_init_blob(&blob, mem_ctx);
+        if (ndr_pull == NULL) {
+                perror("ndr_pull_init_blob");
+                exit(1);
+        }
         ndr_pull->flags |= LIBNDR_FLAG_REF_ALLOC;
         if (assume_ndr64) {
@@ -386 +402 @@
         ndr_print->print = ndr_print_printf_helper;
         ndr_print->depth = 1;
+
+        ndr_err = ndr_pop_dcerpc_sec_verification_trailer(ndr_pull, mem_ctx, &sec_vt);
+        status = ndr_map_error2ntstatus(ndr_err);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("ndr_pop_dcerpc_sec_verification_trailer returned %s\n",
+                       nt_errstr(status));
+        }
+
+        if (sec_vt != NULL && sec_vt->count.count > 0) {
+                printf("SEC_VT: consumed %d bytes\n",
+                       (int)(blob.length - ndr_pull->data_size));
+                if (dumpdata) {
+                        ndrdump_data(blob.data + ndr_pull->data_size,
+                                     blob.length - ndr_pull->data_size,
+                                     dumpdata);
+                }
+                ndr_print_dcerpc_sec_verification_trailer(ndr_print, "SEC_VT", sec_vt);
+        }
+        TALLOC_FREE(sec_vt);
 
         if (out_pipes) {
@@ -400 +435 @@
         printf("pull returned %s\n", nt_errstr(status));
 
-        if (ndr_pull->offset != ndr_pull->data_size) {
-                printf("WARNING! %d unread bytes\n", ndr_pull->data_size - ndr_pull->offset);
-                ndrdump_data(ndr_pull->data+ndr_pull->offset,
-                             ndr_pull->data_size - ndr_pull->offset,
+        if (ndr_pull->offset > ndr_pull->relative_highest_offset) {
+                highest_ofs = ndr_pull->offset;
+        } else {
+                highest_ofs = ndr_pull->relative_highest_offset;
+        }
+
+        if (highest_ofs != ndr_pull->data_size) {
+                printf("WARNING! %d unread bytes\n", ndr_pull->data_size - highest_ofs);
+                ndrdump_data(ndr_pull->data+highest_ofs,
+                             ndr_pull->data_size - highest_ofs,
                              dumpdata);
         }
@@ -454 +495 @@
 
                 ndr_v_pull = ndr_pull_init_blob(&v_blob, mem_ctx);
+                if (ndr_v_pull == NULL) {
+                        perror("ndr_pull_init_blob");
+                        exit(1);
+                }
                 ndr_v_pull->flags |= LIBNDR_FLAG_REF_ALLOC;