From bbae56411c716d8678687cf7c559488b618e8935 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 20 Nov 2019 18:53:09 +1300 Subject: [PATCH] ndrdump: Show the actual struct/function name in the print, not just what it was called Signed-off-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- librpc/tools/ndrdump.c | 2 +- python/samba/tests/blackbox/ndrdump.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/librpc/tools/ndrdump.c b/librpc/tools/ndrdump.c index f02b1edab02..73902be55bd 100644 --- 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 ca637b3ac7b..dcc82e4dba7 100644 --- 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: -- 2.47.3