[PATCH] sync samba pidl with wireshark pidl

Wed May 18 15:28:40 UTC 2016

On Wed, 18 May 2016 14:03:32 +0200 Aurélien Aptel <aaptel at suse.com>
wrote:
> It also happens in the wireshark repo. Will look into it.

I've added 2 patches to the patchset.

#19 fixes 2 test failures in the Pidl test suite. 
    - commit 02cd7808 changed the error the test was expecting
      => update expected output in the test
    - commit c76b65e changed whitespaces in the output
      => revert to the old output in the generator

#20 is from the Wireshark repo that and fixes the generated MAPI
dissector (couldnt compile previously). Note: it is not generated in samba.

For future reference, here's how I compare generated output:

# dirs containing generated files
cat << EOF > /tmp/pidlgendirs
bin/default/librpc/gen_ndr
bin/default/source3/librpc/gen_ndr
bin/default/source4/lib/registry
bin/default/source4/librpc/gen_ndr
EOF

cd $SAMBA_GIT

# checkout <before changes rev>
# clean & build
mkdir gen-before
while read i; do cp -R --parents "$i" gen-before ; done < /tmp/pidlgendirs

# apply changes
# clean & build
mkdir gen-after
while read i; do cp -R --parents "$i" gen-after ; done < /tmp/pidlgendirs

# compare
find gen-before gen-after -iname '*.o' -delete
find gen-before gen-after -iname '*.d' -delete
diff -ru gen-before gen-after

-- 
Aurélien Aptel / SUSE Labs Samba Team
GPG: 1839 CB5F 9F5B FB9B AA97  8C99 03C8 A49B 521B D5D3
SUSE Linux GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG
Nürnberg)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-pidl-ws-Fix-Dead-Store-Dead-assignement-Dead-increme.patch
Type: text/x-patch
Size: 1396 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0001-pidl-ws-Fix-Dead-Store-Dead-assignement-Dead-increme.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-pidl-ws-fix-Wmissing-prototype.patch
Type: text/x-patch
Size: 1943 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0002-pidl-ws-fix-Wmissing-prototype.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-pidl-ws-enhance-dissector.patch
Type: text/x-patch
Size: 1485 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0003-pidl-ws-enhance-dissector.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0004-pidl-ws-Fix-Dead-Store-Dead-assignement-Dead-increme.patch
Type: text/x-patch
Size: 1801 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0004-pidl-ws-Fix-Dead-Store-Dead-assignement-Dead-increme.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0005-pidl-ws-fix-indent-use-4-tabs-and-remove-trailing-wh.patch
Type: text/x-patch
Size: 8844 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0005-pidl-ws-fix-indent-use-4-tabs-and-remove-trailing-wh.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0006-pidl-ws-fix-Assigned-value-is-garbage-or-undefined-f.patch
Type: text/x-patch
Size: 1774 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0006-pidl-ws-fix-Assigned-value-is-garbage-or-undefined-f.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0007-pidl-ws-Remove-pragma-warning-MSVC.patch
Type: text/x-patch
Size: 1573 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0007-pidl-ws-Remove-pragma-warning-MSVC.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0008-pidl-ws-Eliminate-e_uuid_t-in-favor-of-e_guid_t.patch
Type: text/x-patch
Size: 1438 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0008-pidl-ws-Eliminate-e_uuid_t-in-favor-of-e_guid_t.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0009-pidl-use-https-urls-and-update-dead-msdn-link.patch
Type: text/x-patch
Size: 1677 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0009-pidl-use-https-urls-and-update-dead-msdn-link.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0010-pidl-ws-avoid-trailing-tabs.patch
Type: text/x-patch
Size: 1264 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0010-pidl-ws-avoid-trailing-tabs.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0011-pidl-ws-remove-any-starting-_-in-WS-field-names.patch
Type: text/x-patch
Size: 798 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0011-pidl-ws-remove-any-starting-_-in-WS-field-names.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0012-pidl-ws-Remove-pinfo-private_data-from-DCERPC-dissec.patch
Type: text/x-patch
Size: 26344 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0012-pidl-ws-Remove-pinfo-private_data-from-DCERPC-dissec.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0013-pidl-ws-dereference-pointers-when-passing-name-param.patch
Type: text/x-patch
Size: 4138 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0013-pidl-ws-dereference-pointers-when-passing-name-param.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0014-pidl-ws-Add-HEADER-START-HEADER-END-in-ws-dissector.patch
Type: text/x-patch
Size: 4246 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0014-pidl-ws-Add-HEADER-START-HEADER-END-in-ws-dissector.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0015-pidl-ws-whitespace-cleanup.patch
Type: text/x-patch
Size: 3482 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0015-pidl-ws-whitespace-cleanup.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0016-pidl-ws-Document-CODE_START-and-HEADER_START.patch
Type: text/x-patch
Size: 1373 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0016-pidl-ws-Document-CODE_START-and-HEADER_START.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0017-pidl-ws-directly-use-di-param-instead-of-casting-pri.patch
Type: text/x-patch
Size: 1806 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0017-pidl-ws-directly-use-di-param-instead-of-casting-pri.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0018-pidl-s4-python-typo-in-comment.patch
Type: text/x-patch
Size: 828 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0018-pidl-s4-python-typo-in-comment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0019-pidl-ws-fix-failing-tests.patch
Type: text/x-patch
Size: 2172 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0019-pidl-ws-fix-failing-tests.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0020-pidl-ws-fix-missing-name-when-generating-MAPI-dissec.patch
Type: text/x-patch
Size: 1376 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/0020-pidl-ws-fix-missing-name-when-generating-MAPI-dissec.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/3f5c5d74/attachment.sig>