ndrdump: Show the actual struct/function name in the print, not just what it was...

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/librpc/tools/ndrdump.c b/librpc/tools/ndrdump.c
index f02b1edab0261d2bc071183a54514e245b91f98b..73902be55bd3824c07d0c8fc90eb3168d5835993 100644 (file)
--- a/librpc/tools/ndrdump.c
+++ b/librpc/tools/ndrdump.c
@@ -623,7 +623,7 @@ static void ndr_print_dummy(struct ndr_print *ndr, const char *format, ...)
                        f->name);
        }
 
-       f->ndr_print(ndr_print, format, flags, st);
+       f->ndr_print(ndr_print, f->name, flags, st);
 
        if (flags & NDR_IN) {
                status = ndrdump_pull_and_print_pipes(format,

diff --git a/python/samba/tests/blackbox/ndrdump.py b/python/samba/tests/blackbox/ndrdump.py
index ca637b3ac7b604030bfb62fbd33be0eb4789ee45..dcc82e4dba7c96a014f1c45138b08fbe09c26158 100644 (file)
--- a/python/samba/tests/blackbox/ndrdump.py
+++ b/python/samba/tests/blackbox/ndrdump.py
@@ -97,7 +97,7 @@ class NdrDumpTests(BlackboxTestCase):
 
     def test_ndrdump_with_binary_struct_number(self):
         expected = '''pull returned Success
-    0                        : 33323130-3534-3736-3839-616263646566
+    GUID                     : 33323130-3534-3736-3839-616263646566
 dump OK
 '''
         try: