blackbox.ndrdump: adjust example files to changed dump_data() output.

The cleanup using dump_data_block16() fixed the space handling.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14956

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 9110a8854a518befa2908c26076e17a085c5ec48)

diff --git a/python/samba/tests/blackbox/ndrdump.py b/python/samba/tests/blackbox/ndrdump.py
index 9a4e6cabe8b43d909747ec52027eba4799951e05..b64ac705868a50f27602053cb1f6128f519843de 100644 (file)
--- a/python/samba/tests/blackbox/ndrdump.py
+++ b/python/samba/tests/blackbox/ndrdump.py
@@ -171,7 +171,7 @@ dump OK
     def test_ndrdump_input_cmdline_short_struct_name_dump(self):
         expected = '''pull returned Buffer Size Error
 6 bytes consumed
-[0000] 61 62 63 64 65 66 67                               abcdefg ''' \
+[0000] 61 62 63 64 65 66 67                                abcdefg''' \
         '''
 '''
         try:
@@ -187,10 +187,10 @@ dump OK
     def test_ndrdump_input_cmdline_short_struct_name_print_fail(self):
         expected = '''pull returned Buffer Size Error
 6 bytes consumed
-[0000] 61 62 63 64 65 66 67                               abcdefg ''' \
+[0000] 61 62 63 64 65 66 67                                abcdefg''' \
         '''
 WARNING! 1 unread bytes
-[0000] 67                                                 g ''' \
+[0000] 67                                                  g''' \
     '''
 WARNING: pull of GUID was incomplete, therefore the parse below may SEGFAULT
     GUID                     : 64636261-6665-0000-0000-000000000000
@@ -212,7 +212,7 @@ WARNING! 53 unread bytes
 [0000] 00 FF 00 00 FF 00 00 00   00 09 00 00 00 08 00 33   ........ .......3
 [0010] 33 32 37 36 32 36 39 33   32 37 36 38 34 01 00 00   32762693 27684...
 [0020] 80 32 0D FF 00 00 FF 00   00 00 00 08 00 00 00 1C   .2...... ........
-[0030] F1 29 08 00 00                                     .)... ''' \
+[0030] F1 29 08 00 00                                      .)...''' \
         b'''
     clusapi_QueryAllValues: struct clusapi_QueryAllValues
         out: struct clusapi_QueryAllValues
@@ -397,7 +397,7 @@ dump OK
     def test_ndrdump_fuzzed_spoolss_EnumForms(self):
         expected_head = b'''pull returned Success
 WARNING! 2 unread bytes
-[0000] 00 00                                              .. ''' b'''
+[0000] 00 00                                               ..''' b'''
     spoolss_EnumForms: struct spoolss_EnumForms
         out: struct spoolss_EnumForms
             count                    : *

diff --git a/selftest/knownfail.d/blackbox.ndrdump b/selftest/knownfail.d/blackbox.ndrdump
deleted file mode 100644 (file)
index ff92bf3..0000000
--- a/selftest/knownfail.d/blackbox.ndrdump
+++ /dev/null
@@ -1,9 +0,0 @@
-^samba.tests.blackbox.ndrdump.samba.tests.blackbox.ndrdump.NdrDumpTests.test_fuzzed_drsuapi_DsGetNCChanges
-^samba.tests.blackbox.ndrdump.samba.tests.blackbox.ndrdump.NdrDumpTests.test_ndrdump_Krb5ccache
-^samba.tests.blackbox.ndrdump.samba.tests.blackbox.ndrdump.NdrDumpTests.test_ndrdump_fuzzed_clusapi_QueryAllValues
-^samba.tests.blackbox.ndrdump.samba.tests.blackbox.ndrdump.NdrDumpTests.test_ndrdump_fuzzed_drsuapi_DsAddEntry_1
-^samba.tests.blackbox.ndrdump.samba.tests.blackbox.ndrdump.NdrDumpTests.test_ndrdump_fuzzed_drsuapi_DsReplicaAttribute
-^samba.tests.blackbox.ndrdump.samba.tests.blackbox.ndrdump.NdrDumpTests.test_ndrdump_fuzzed_spoolss_EnumForms
-^samba.tests.blackbox.ndrdump.samba.tests.blackbox.ndrdump.NdrDumpTests.test_ndrdump_input_cmdline_short_struct_name_dump
-^samba.tests.blackbox.ndrdump.samba.tests.blackbox.ndrdump.NdrDumpTests.test_ndrdump_input_cmdline_short_struct_name_print_fail
-^samba.tests.blackbox.ndrdump.samba.tests.blackbox.ndrdump.NdrDumpTests.test_ndrdump_with_hex_struct_name

diff --git a/source3/selftest/ktest-krb5_ccache-2.txt b/source3/selftest/ktest-krb5_ccache-2.txt
index c86750ae585128bbd1104023dde43dbffa02fdf3..4b899596568d7979928ea8147c9d497f0a6ba26b 100644 (file)
--- a/source3/selftest/ktest-krb5_ccache-2.txt
+++ b/source3/selftest/ktest-krb5_ccache-2.txt
@@ -113,7 +113,7 @@ pull returned Success
 [03D0] 66 21 17 77 51 A7 1F 1D   84 3B 7C B1 5D 4E B8 D4   f!.wQ... .;|.]N..
 [03E0] F9 C5 75 06 AA 19 45 1C   E9 06 9E AD 23 26 6B 10   ..u...E. ....#&k.
 [03F0] 53 A0 36 D3 58 9F 5E 8C   CB A5 F6 BC C9 30 3C BC   S.6.X.^. .....0<.
-[0400] AD FF 7C 92 F0 C6 9A 02                             ..|..... 
+[0400] AD FF 7C 92 F0 C6 9A 02                             ..|.....
             second_ticket            : DATA_BLOB length=0
         further_creds            : DATA_BLOB length=10683
 [0000] 00 00 00 01 00 00 00 01   00 00 00 17 4B 54 45 53   ........ ....KTES
@@ -900,7 +900,7 @@ pull returned Success
 [03D0] 66 21 17 77 51 A7 1F 1D   84 3B 7C B1 5D 4E B8 D4   f!.wQ... .;|.]N..
 [03E0] F9 C5 75 06 AA 19 45 1C   E9 06 9E AD 23 26 6B 10   ..u...E. ....#&k.
 [03F0] 53 A0 36 D3 58 9F 5E 8C   CB A5 F6 BC C9 30 3C BC   S.6.X.^. .....0<.
-[0400] AD FF 7C 92 F0 C6 9A 02                             ..|..... 
+[0400] AD FF 7C 92 F0 C6 9A 02                             ..|.....
             second_ticket            : DATA_BLOB length=0
         further_creds            : DATA_BLOB length=10683
 [0000] 00 00 00 01 00 00 00 01   00 00 00 17 4B 54 45 53   ........ ....KTES

diff --git a/source3/selftest/ktest-krb5_ccache-3.txt b/source3/selftest/ktest-krb5_ccache-3.txt
index 76c492cd2b1fb99a9d89788a4b2fee50a2356778..2d3e669b6cb43b9b4fe1ef2f18e4022ad125dfb3 100644 (file)
--- a/source3/selftest/ktest-krb5_ccache-3.txt
+++ b/source3/selftest/ktest-krb5_ccache-3.txt
@@ -113,7 +113,7 @@ pull returned Success
 [03D0] 60 CA 17 FF 8E 66 80 76   CB 35 46 26 C3 BD CA 83   `....f.v .5F&....
 [03E0] F0 04 08 0D 4C 5D B2 E4   7C 1C 82 28 D7 2C 42 B1   ....L].. |..(.,B.
 [03F0] 36 72 60 5E 26 4A 79 D0   41 94 3C 2C 65 0E 32 18   6r`^&Jy. A.<,e.2.
-[0400] B8 56 26 9D D3 84 78 BB                             .V&...x. 
+[0400] B8 56 26 9D D3 84 78 BB                             .V&...x.
             second_ticket            : DATA_BLOB length=0
         further_creds            : DATA_BLOB length=4748
 [0000] 00 00 00 01 00 00 00 01   00 00 00 17 4B 54 45 53   ........ ....KTES
@@ -529,7 +529,7 @@ pull returned Success
 [03D0] 60 CA 17 FF 8E 66 80 76   CB 35 46 26 C3 BD CA 83   `....f.v .5F&....
 [03E0] F0 04 08 0D 4C 5D B2 E4   7C 1C 82 28 D7 2C 42 B1   ....L].. |..(.,B.
 [03F0] 36 72 60 5E 26 4A 79 D0   41 94 3C 2C 65 0E 32 18   6r`^&Jy. A.<,e.2.
-[0400] B8 56 26 9D D3 84 78 BB                             .V&...x. 
+[0400] B8 56 26 9D D3 84 78 BB                             .V&...x.
             second_ticket            : DATA_BLOB length=0
         further_creds            : DATA_BLOB length=4748
 [0000] 00 00 00 01 00 00 00 01   00 00 00 17 4B 54 45 53   ........ ....KTES

diff --git a/source4/librpc/tests/dns-decode_dns_name_packet-hex.txt b/source4/librpc/tests/dns-decode_dns_name_packet-hex.txt
index 02e95c0bd203fe6bfc224dbea6186191eb06d473..84b55f2d3622b7095e6b88824a0dd6e6afe63bfd 100644 (file)
--- a/source4/librpc/tests/dns-decode_dns_name_packet-hex.txt
+++ b/source4/librpc/tests/dns-decode_dns_name_packet-hex.txt
@@ -30,6 +30,6 @@ pull returned Success
                 cname_record             : ''
                 unexpected               : DATA_BLOB length=18
 [0000] 0F 62 6E 61 6D 65 64 6F   74 70 72 65 66 69 78 32   .bnamedo tprefix2
-[0010] C0 0C                                              .. 
+[0010] C0 0C                                               ..
         additional: ARRAY(0)
 dump OK

diff --git a/source4/librpc/tests/fuzzed_drsuapi_DsAddEntry_1.txt b/source4/librpc/tests/fuzzed_drsuapi_DsAddEntry_1.txt
index 79b289db49101cfbe4aa89c7419b26cec3c2f690..f3a4bcd914bbf36be06be39c7d6729624c0a719f 100644 (file)
--- a/source4/librpc/tests/fuzzed_drsuapi_DsAddEntry_1.txt
+++ b/source4/librpc/tests/fuzzed_drsuapi_DsAddEntry_1.txt
@@ -60,7 +60,7 @@ WARNING! 47 unread bytes
                                                     values: ARRAY(1)
                                                         values: struct drsuapi_DsAttributeValue
                                                             attid                    : DATA_BLOB length=3
-[0000] 2F 00 17                                           /.. 
+[0000] 2F 00 17                                            /..
                                         attributes: struct drsuapi_DsReplicaAttribute
                                             attid                    : DRSUAPI_ATTID_objectCategory (0x9030E)
                                             value_ctr: struct drsuapi_DsAttributeValueCtr
@@ -82,7 +82,7 @@ skipping zero buffer bytes
 [0090] 6D 00 62 00 61 00 32 00   30 00 30 00 38 00 72 00   m.b.a.2. 0.0.8.r.
 [00A0] 32 00 2C 00 44 00 43 00   3D 00 65 00 78 00 61 00   2.,.D.C. =.e.x.a.
 [00B0] 6D 00 70 00 6C 00 65 00   2C 00 44 00 43 00 3D 00   m.p.l.e. ,.D.C.=.
-[00C0] 63 00 6F 00 6D 00 00 00                             c.o.m... 
+[00C0] 63 00 6F 00 6D 00 00 00                             c.o.m...
                                         attributes: struct drsuapi_DsReplicaAttribute
                                             attid                    : DRSUAPI_ATTID_invocationId (0x20073)
                                             value_ctr: struct drsuapi_DsAttributeValueCtr
@@ -218,7 +218,7 @@ skipping zero buffer bytes
                                                             __ndr_size               : 0x00000004 (4)
                                                             blob                     : *
                                                                 blob                     : DATA_BLOB length=4
-[0000] 04 00 00 00                                        .... 
+[0000] 04 00 00 00                                         ....
                                         attributes: struct drsuapi_DsReplicaAttribute
                                             attid                    : DRSUAPI_ATTID_systemFlags (0x90177)
                                             value_ctr: struct drsuapi_DsAttributeValueCtr
@@ -229,7 +229,7 @@ skipping zero buffer bytes
                                                             __ndr_size               : 0x00000004 (4)
                                                             blob                     : *
                                                                 blob                     : DATA_BLOB length=4
-[0000] 00 00 00 02                                        .... 
+[0000] 00 00 00 02                                         ....
                                         attributes: struct drsuapi_DsReplicaAttribute
                                             attid                    : DRSUAPI_ATTID_replPropertyMetaData (0x90003)
                                             value_ctr: struct drsuapi_DsAttributeValueCtr
@@ -250,7 +250,7 @@ skipping zero buffer bytes
 [0080] 61 00 32 00 30 00 30 00   38 00 72 00 32 00 2C 00   a.2.0.0. 8.r.2.,.
 [0090] 44 00 43 00 3D 00 65 00   78 00 61 00 6D 00 70 00   D.C.=.e. x.a.m.p.
 [00A0] 6C 00 65 00 2C 00 44 00   43 00 3D 00 63 00 6F 00   l.e.,.D. C.=.c.o.
-[00B0] 6D 00 EB 00                                        m... 
+[00B0] 6D 00 EB 00                                         m...
 push returned Success
 pull returned Success
     drsuapi_DsAddEntry: struct drsuapi_DsAddEntry
@@ -310,7 +310,7 @@ pull returned Success
                                                     values: ARRAY(1)
                                                         values: struct drsuapi_DsAttributeValue
                                                             attid                    : DATA_BLOB length=3
-[0000] 2F 00 17                                           /.. 
+[0000] 2F 00 17                                            /..
                                         attributes: struct drsuapi_DsReplicaAttribute
                                             attid                    : DRSUAPI_ATTID_objectCategory (0x9030E)
                                             value_ctr: struct drsuapi_DsAttributeValueCtr
@@ -332,7 +332,7 @@ skipping zero buffer bytes
 [0090] 6D 00 62 00 61 00 32 00   30 00 30 00 38 00 72 00   m.b.a.2. 0.0.8.r.
 [00A0] 32 00 2C 00 44 00 43 00   3D 00 65 00 78 00 61 00   2.,.D.C. =.e.x.a.
 [00B0] 6D 00 70 00 6C 00 65 00   2C 00 44 00 43 00 3D 00   m.p.l.e. ,.D.C.=.
-[00C0] 63 00 6F 00 6D 00 00 00                             c.o.m... 
+[00C0] 63 00 6F 00 6D 00 00 00                             c.o.m...
                                         attributes: struct drsuapi_DsReplicaAttribute
                                             attid                    : DRSUAPI_ATTID_invocationId (0x20073)
                                             value_ctr: struct drsuapi_DsAttributeValueCtr
@@ -468,7 +468,7 @@ skipping zero buffer bytes
                                                             __ndr_size               : 0x00000004 (4)
                                                             blob                     : *
                                                                 blob                     : DATA_BLOB length=4
-[0000] 04 00 00 00                                        .... 
+[0000] 04 00 00 00                                         ....
                                         attributes: struct drsuapi_DsReplicaAttribute
                                             attid                    : DRSUAPI_ATTID_systemFlags (0x90177)
                                             value_ctr: struct drsuapi_DsAttributeValueCtr
@@ -479,7 +479,7 @@ skipping zero buffer bytes
                                                             __ndr_size               : 0x00000004 (4)
                                                             blob                     : *
                                                                 blob                     : DATA_BLOB length=4
-[0000] 00 00 00 02                                        .... 
+[0000] 00 00 00 02                                         ....
                                         attributes: struct drsuapi_DsReplicaAttribute
                                             attid                    : DRSUAPI_ATTID_replPropertyMetaData (0x90003)
                                             value_ctr: struct drsuapi_DsAttributeValueCtr
@@ -500,7 +500,7 @@ skipping zero buffer bytes
 [0080] 61 00 32 00 30 00 30 00   38 00 72 00 32 00 2C 00   a.2.0.0. 8.r.2.,.
 [0090] 44 00 43 00 3D 00 65 00   78 00 61 00 6D 00 70 00   D.C.=.e. x.a.m.p.
 [00A0] 6C 00 65 00 2C 00 44 00   43 00 3D 00 63 00 6F 00   l.e.,.D. C.=.c.o.
-[00B0] 6D 00 EB 00                                        m... 
+[00B0] 6D 00 EB 00                                         m...
 WARNING! orig bytes:2555 validated pushed bytes:2504
 WARNING! orig pulled bytes:2508 validated pulled bytes:2504
 WARNING! orig and validated differ at byte 0x30 (48)

diff --git a/source4/librpc/tests/fuzzed_drsuapi_DsGetNCChanges.txt b/source4/librpc/tests/fuzzed_drsuapi_DsGetNCChanges.txt
index d688e7b40e91eb95413232ac21296c68f286c38c..1e2636441697a2b2d6c22545c2c39c262a7230b7 100644 (file)
--- a/source4/librpc/tests/fuzzed_drsuapi_DsGetNCChanges.txt
+++ b/source4/librpc/tests/fuzzed_drsuapi_DsGetNCChanges.txt
@@ -1,6 +1,6 @@
 pull returned Success
 WARNING! 4 unread bytes
-[0000] 00 00 00 00                                        .... 
+[0000] 00 00 00 00                                         ....
     drsuapi_DsGetNCChanges: struct drsuapi_DsGetNCChanges
         out: struct drsuapi_DsGetNCChanges
             level_out                : *

diff --git a/source4/librpc/tests/fuzzed_drsuapi_DsReplicaAttribute.txt b/source4/librpc/tests/fuzzed_drsuapi_DsReplicaAttribute.txt
index 9e9a8859627aad29cc90c3165ef765d427b7a372..302ccb401ef95f81b90f1235acd62e44975a6ed7 100644 (file)
--- a/source4/librpc/tests/fuzzed_drsuapi_DsReplicaAttribute.txt
+++ b/source4/librpc/tests/fuzzed_drsuapi_DsReplicaAttribute.txt
@@ -3,10 +3,13 @@ WARNING! 179 unread bytes
 [0000] 00 00 00 00 00 FF 00 00   00 00 00 00 00 00 00 00   ........ ........
 skipping zero buffer bytes
 [0040] 00 00 00 00 00 00 00 00   00 40 00 00 00 00 00 00   ........ .@......
+skipping zero buffer bytes
 [0060] 00 00 00 40 00 00 00 00   00 00 00 00 00 00 00 00   ...@.... ........
+skipping zero buffer bytes
 [0080] 00 00 00 40 00 00 00 00   00 00 00 00 00 00 00 00   ...@.... ........
 [0090] 00 00 00 00 00 00 00 00   00 00 00 00 00 40 00 00   ........ .....@..
-[00B0] 00 00 00                                           ... 
+skipping zero buffer bytes
+[00B0] 00 00 00                                            ...
     drsuapi_DsReplicaAttribute: struct drsuapi_DsReplicaAttribute
         attid                    : DRSUAPI_ATTID_objectClass (0x0)
         value_ctr: struct drsuapi_DsAttributeValueCtr