Add missing decrement of concatlen based on master-2.2 version.
Bug: 14080
Change-Id: I00f7e34f8e599718316a4ce8916d91b780ec7c14
Reviewed-on: https://code.wireshark.org/review/23663
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Add support for dissecting the old-style Broadcom tag with Ethertype 0x8874,
this was supported by switches like Broadcom BCM5325. Newer switches use a
different tag format (with no Ethertype) which will be supported later.
Change-Id: Iec26f8d13058399a35fb258ccadc48f7f5ac8474
Reviewed-on: https://code.wireshark.org/review/23592
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Pick up change from Samba:
commit 67040cf61232dd1cdcc820237919ac1e073c31c2
Author: Volker Lendecke <vl@samba.org>
Date: Tue Jun 20 15:31:18 2017 +0200
pidl: Fix array range checks in python output
Without this, we generated code like
if (ndr_table_dnsserver.num_calls < 0) {
PyErr_SetString(PyExc_TypeError, "Internal Error, ndr_interface_call missing for py_DnssrvOperation_ndr_pack");
return NULL;
}
call = &ndr_table_dnsserver.calls[0];
This does not really make sense, and Coverity found comparing the unsigned
num_calls against <0 a bit pointless.
Should fix 138 Coverity findings and make the code a bit more correct.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Change-Id: I401e3771e6f3c1125ff847749073693af23884fc
Reviewed-on: https://code.wireshark.org/review/23723
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit 40e409bf9e89a163c771b2a58493d2c1b496fae7
Author: Petr Viktorin <pviktori@redhat.com>
Date: Wed May 3 16:57:07 2017 +0200
python3: Use "y#" instead of "s#" for binary data in PyArg_ParseTuple
The "s#" format code for PyArg_ParseTupleAndKeywords and Py_BuildValue
converts a char* and size to/from Python str (with utf-8 encoding under
Python 3).
In some cases, we want bytes (str on Python 2, bytes on 3) instead. The
code for this is "y#" in Python 3, but that is not available in 2.
Introduce a PYARG_BYTES_LEN macro that expands to "s#" or "y#", and use
that in:
- credentials.get_ntlm_response (for input and output)
- ndr_unpack argument in PIDL generated code
Signed-off-by: Petr Viktorin <pviktori@redhat.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Change-Id: If4d9cdabc5016127f60682caf300f6801a360083
Reviewed-on: https://code.wireshark.org/review/23722
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit 9703464b942fdddbf7bc4380cbd26d1803f9bc00
Author: Jeremy Allison <jra@samba.org>
Date: Tue May 2 08:10:40 2017 -0700
pidl: Fix Coverity warnings from duplicate NULL checks.
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Sat May 6 16:03:17 CEST 2017 on sn-devel-144
Change-Id: I25c6ae984c6a963c05f33d9a649b64f9795c7292
Reviewed-on: https://code.wireshark.org/review/23721
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit 2de5fa45e0abfdb50f604f87e494bf334c39003a
Author: Lumir Balhar <lbalhar@redhat.com>
Date: Mon Jan 23 21:03:17 2017 +0100
python: pidl: Port Python interface generator
Port PIDL generator of Python interfaces to generate interfaces in
Python 3 compatible form.
Python 2.7 is now required, so we can use PyCapsule in both versions.
Signed-off-by: Lumir Balhar <lbalhar@redhat.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Pair-programmed-by: Andrew Bartlett <abartlet@samba.org>
Change-Id: I981993e326132a1911bfbb686ca5ae033dd1df49
Reviewed-on: https://code.wireshark.org/review/23720
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit 2170f556299c6ab4ce33f22169ca26ecad3440e3
Author: Stefan Metzmacher <metze@samba.org>
Date: Mon Feb 20 18:02:09 2017 +0100
pidl:Python: use of pytalloc_GenericObject_reference*() for pyrpc_{ex,im}port_union() wrapping
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12601
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Sat Feb 25 06:33:33 CET 2017 on sn-devel-144
Change-Id: I4d3cb70c79531e5faf5249b67948cc6d354c1bd0
Reviewed-on: https://code.wireshark.org/review/23719
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit d62eb3cc9f97b203d21ec6e75c48c739a43bc163
Author: Stefan Metzmacher <metze@samba.org>
Date: Wed Feb 22 10:08:46 2017 +0100
pidl:Python: make sure print HASH references for STRUCT types
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12601
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Change-Id: Ieef766844ce66160eaaacecc73a51f94f69319fb
Reviewed-on: https://code.wireshark.org/review/23717
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit 57539c84416aeb8fc8e3a8653f790b329e6fa9a1
Author: Stefan Metzmacher <metze@samba.org>
Date: Mon Sep 12 09:20:44 2016 +0200
pidl:Python: add PyTypeObject objects for function structs
They provide get/set methods for the in_* and out_* elements
and the magic __ndr_{push,pull,print}_{in,out}__ hooks to enable
the marshalling via ndr_{push,pull,print}_{in,out}().
This provides an easy way to generate and parse the payload of
DCERPC requests and responses, which is very useful for writing
tests.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: I8f0e70fb771a91ba9590e2e92b5713b48313d2de
Reviewed-on: https://code.wireshark.org/review/23716
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up a change from Samba:
commit a546124f10d1e2bee29bc06c0b8754257d2bdc23
Author: Stefan Metzmacher <metze@samba.org>
Date: Mon Sep 12 09:20:04 2016 +0200
pidl:Python: split out a PythonElementGetSet() helper function
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: Ica8b699189b69833abfa6049dd3c4e489788ce54
Reviewed-on: https://code.wireshark.org/review/23715
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit 40175613519e7405a16e8f896dfdc2949430bc4b
Author: Stefan Metzmacher <metze@samba.org>
Date: Tue Sep 13 01:06:18 2016 +0200
pidl:Python: the py_{import,export}_*() functions can be static now.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: I6e06c97b44a04cab36d134916eddf4c501ccc35d
Reviewed-on: https://code.wireshark.org/review/23714
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up a change from Samba:
commit f7707c04a5e039e757b288ad67a0c3cac9c6466a
Author: Stefan Metzmacher <metze@samba.org>
Date: Mon Sep 12 16:33:38 2016 +0200
pidl:Python: make use of the pyrpc_{import,export}_union() functions
This avoids the linking problems at C shared object level.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: I62c1d03b10e965552a4d598fa2370692ee0cd12a
Reviewed-on: https://code.wireshark.org/review/23713
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up a change from Samba:
commit e0324c0cf7e7c363a5791c2e35c8820b79640a47
Author: Stefan Metzmacher <metze@samba.org>
Date: Mon Sep 12 16:33:38 2016 +0200
pidl:Python: provide a PyTypeObject with METH_CLASS __import__() and __export__() hooks
These are wrappers around the currently public C functions
'py_import_*() and 'py_export_*().
In order to let other python module use these function, we should
resolve the needed type object and call the __import__() or __export__()
hooks instead of linking to the other shared module at C level.
We already do the same for structs.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: I47813a544365085407a31d174ee180778674e42b
Reviewed-on: https://code.wireshark.org/review/23712
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit 3a0ce3e41d9fdab58273c239955862b03396ea19
Author: Stefan Metzmacher <metze@samba.org>
Date: Sun Sep 25 00:48:29 2016 +0200
pidl:Python: provide the abstract syntax as <module>.<interface>_abstract_syntax
The <module>.abstract_syntax alias is only kept as legacy for
the first interface in a module.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: Ie6d3d48ea3012bd328eb20e2e6693928fe24ead8
Reviewed-on: https://code.wireshark.org/review/23711
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit a560116aa5228885e5f52fc46fa92151357de69c
Author: Stefan Metzmacher <metze@samba.org>
Date: Tue Sep 13 09:07:32 2016 +0200
pidl:Python: improve the .doc string for the get/set elements
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: I8ecb22fd88298ecd4e350b1815d8720b493aac27
Reviewed-on: https://code.wireshark.org/review/23709
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit 47b40ac96afbd4fb28e519b9658256ecaa304e71
Author: Stefan Metzmacher <metze@samba.org>
Date: Mon Sep 12 15:12:24 2016 +0200
pidl:Python: make use of NDR_ERR_CODE_IS_SUCCESS()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: I550b83596fe27bad5ba4f7d91eb0ac62380f4eac
Reviewed-on: https://code.wireshark.org/review/23708
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit d4660e869790c7da1cb97e9d95a995e5a32b34ef
Author: Stefan Metzmacher <metze@samba.org>
Date: Sun Sep 25 01:07:14 2016 +0200
pidl:Python: __ndr_print__ functions don't get arguments and need METH_NOARGS
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: Ic0648f65b8c3f60e614361778d2c0bf72d61be35
Reviewed-on: https://code.wireshark.org/review/23707
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit 306783d6f5d577a0b8bd31d659d8c802f22f0333
Author: Jeremy Allison <jra@samba.org>
Date: Thu Apr 20 12:24:43 2017 -0700
lib: modules: Change XXX_init interface from XXX_init(void) to XXX_init(TALLOC_CTX *)
Not currently used - no logic changes inside.
This will make it possible to pass down a long-lived talloc
context from the loading function for modules to use instead
of having them internally all use talloc_autofree_context()
which is a hidden global.
Updated all known module interface numbers, and added a
WHATSNEW.
Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: Ralph Böhme <slow@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sat Apr 22 01:17:00 CEST 2017 on sn-devel-144
Change-Id: I549e24e2e1fec12d8e7d3f3304cdac29882892a5
Reviewed-on: https://code.wireshark.org/review/23705
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit ffb8b50e3c07c833fb7b1a583d21f9dc1166a0a6
Author: Andrew Bartlett <abartlet@samba.org>
Date: Mon Nov 14 11:24:03 2016 +1300
s4-rpc_server: Allow each interface to declare if it uses handles
This will allow the NETLOGON server in the AD DC to declare that it does not use
handles, and so allow some more flexibility with association groups
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Change-Id: Ic09452d27493ff913f5a5c064a038e3783e91df2
Reviewed-on: https://code.wireshark.org/review/23704
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit 31d625bcd2b0cb33dd98a37c202f5b371b871362
Author: Andrew Bartlett <abartlet@samba.org>
Date: Tue Dec 13 09:06:25 2016 +1300
s4-rpc_server: Add back support for lsa over \\pipe\\netlogon optionally
The idea here is that perhaps some real client relies on this (and not just Samba torture
commands), so we need a way to support it for the 4.6 release.
If no such client emerges, it can be deprecated and removed in the normal way.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Change-Id: Id20f98ffbc5eb4752bebee455e7b2b2c0f5017e0
Reviewed-on: https://code.wireshark.org/review/23703
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit 50dff7e094d48793b432992a28571a6f7e5cc73c
Author: Andrew Bartlett <abartlet@samba.org>
Date: Mon Nov 21 11:21:50 2016 +1300
pidl: Make dcesrv\_$name\_interface "static const"
This moves it out of the global namespace
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Thu Dec 8 13:25:57 CET 2016 on sn-devel-144
Change-Id: Ifa9fca377dc217b131f87cef4463624a679660f9
Reviewed-on: https://code.wireshark.org/review/23702
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit 778fc58eb281e38eb1a3346b58cfdf9682f104c4
Author: Andrew Bartlett <abartlet@samba.org>
Date: Mon Nov 21 11:38:24 2016 +1300
pidl: Use a static const initialised struct in dcerpc_server_$name_init(void)
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Change-Id: I5bbc8cfdd94f4c13250fc3b1cb0a61351220116c
Reviewed-on: https://code.wireshark.org/review/23701
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit 823bc4c07add242a5a1d0cd25942ebaab3cd0e23
Author: Stefan Metzmacher <metze@samba.org>
Date: Tue Jun 13 09:57:33 2017 +0200
pidl:NDR/Parser: initialize [skip] values in ndr_pull_*
It's too dangerous to leave values uninitialzed!
[skip_noinit] can be used if required.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Change-Id: I85a173e21fca509fc417ff2532097fd9a220ccd9
Reviewed-on: https://code.wireshark.org/review/23698
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit b922472fd683235fde3abc69ee09d9d8bfdb8644
Author: Stefan Metzmacher <metze@samba.org>
Date: Wed Jun 21 15:05:35 2017 +0200
pidl:NDR/Parser: add "skip_noinit" element
In future "skip" will be changed to initialize the element
with ZERO_STRUCT() on ndr_pull_*.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Change-Id: I4b886c18c9eff27ae446e68fb7220e812721c4e0
Reviewed-on: https://code.wireshark.org/review/23697
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit 3bc6b55385894691792962ecc15978a3b158eca4
Author: Stefan Metzmacher <metze@samba.org>
Date: Mon Jun 19 12:15:21 2017 +0200
pidl:NDR/Parser: fix "skip" for pointers
We should handle the "skip" at the element level before
we traverse trough the element levels.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Change-Id: I8b52e1ad0e0ad2c8a4fc20b94f07441b458e5638
Reviewed-on: https://code.wireshark.org/review/23696
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit d30b008a642c9bb0d85519f42aef56a53e44cc77
Author: Günther Deschner <gd@samba.org>
Date: Mon Jan 23 14:50:45 2017 +0100
pidl: use ndr_push_charset_to_null() when [to_null] keyword is used in IDL
Guenther
Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Change-Id: I26d53e3c4d0aa9fc959f2d9f0455e480c6cd45e2
Reviewed-on: https://code.wireshark.org/review/23695
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit c6c1463852533ed8234911835b8b1fce29b2d3d8
Author: Andrew Bartlett <abartlet@samba.org>
Date: Mon Nov 21 11:58:07 2016 +1300
pidl: Make static struct api_struct also const
This moves the table to read-only memory
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Change-Id: I2a7ce154dff4584c5db445cfd789a8c4f928a338
Reviewed-on: https://code.wireshark.org/review/23693
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pick up change from Samba:
commit d368ee2298bc472caca940a3db7a4f855df6ca21
Author: Andrew Bartlett <abartlet@samba.org>
Date: Mon Nov 21 11:57:48 2016 +1300
pidl: Change *_get_pipe_fns() to return const struct api_struct *
This will allow the table to be made static const in the next commit
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Change-Id: Ib8cecaf695ccf70a78f97152e3286723cbc233ec
Reviewed-on: https://code.wireshark.org/review/23692
Reviewed-by: Guy Harris <guy@alum.mit.edu>
That produces better error messages, giving the name of the offending
field.
Change-Id: I155ac29c68ecd7811cc9752980db9cdc37fea72e
Reviewed-on: https://code.wireshark.org/review/23685
Reviewed-by: Guy Harris <guy@alum.mit.edu>
That's consistent with the other DISSECTOR_ASSERT_FIELD_TYPE... macros.
Change-Id: I1f5711b29ae8a440b0529373eb7903ff122ea18e
Reviewed-on: https://code.wireshark.org/review/23681
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Patch will allow to use stdin/stdout on other than windows platforms.
Change-Id: I729ebd4efaa1675956b085e74b413805125a7d7a
Reviewed-on: https://code.wireshark.org/review/23676
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Pascal Quantin