Commit Graph

61 Commits

Author SHA1 Message Date
Michael Mann 22760b2d2a Remove pinfo->private_data from DCERPC dissectors and instead have dcerpc_info* infomation be passed in as a function parameter. Bug 9387 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9387)
All "generated" source was manually modified (with the power of search/replace), but I believe the "source input" files have been adjusted (checked into revs 53098 and 53099) to reflect the necessary changes (with possible whitespace formatting differences).

The Microsoft compiler doesn't flag "unused function parameters", so I apologize in advance if I may have missed a few.  The "dcerpc_info* di" parameter is used in almost every function.

svn path=/trunk/; revision=53100
2013-11-06 14:31:29 +00:00
Michael Mann 87e55cb9e0 Sync with latest SAMBA PIDL source per http://www.wireshark.org/lists/wireshark-dev/201310/msg00217.html
Didn't integrate
0010-frsrpc-Regenerate-frsrpc-due-to-changes-in-the-pidl-.patch
0016-Regenerate-the-dnserver.patch

due to compilation errors on Windows.

svn path=/trunk/; revision=52744
2013-10-21 19:41:54 +00:00
Michael Mann 0334c5b425 Remove check_col from generated DCE/RPC dissectors. Bug 8804 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8804).
I still couldn't figure out how to generate the source, so I made the modifications to the generated dissectors "manually" (search/replace tool in VS) that would match the "PIDL source" included here.

I will be sending the "PIDL source" (non dissector files) to the samba team.

svn path=/trunk/; revision=52313
2013-10-01 14:45:03 +00:00
Pascal Quantin 0a17799d61 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :
Remove C++ incompatibilities from most of the dcerpc code

svn path=/trunk/; revision=48023
2013-03-02 22:54:39 +00:00
Jeff Morriss 2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Guy Harris e32a3b8a97 The rids argument to samr_GetGroupsForUser() is *not* a single RID, it's
an array of samr_RidWithAttributeArray structures.  Don't equate it to
hf_samr_rid; that causes hf_samr_rid to be added as an item with a
length of -1, but, as hf_samr_rid is an FT_UINT32 field, that causes a
dissector bug error.

The version of Yapp I was using, at least, didn't like C++-style
comments in the IDL file; replace them with C-style comments.

svn path=/trunk/; revision=35304
2010-12-30 02:56:51 +00:00
Jeff Morriss 554ed113a9 Add an SVN Id to these PIDL-generated dissectors. A patch to PIDL will be sent upstream to the Samba developers.
svn path=/trunk/; revision=34713
2010-10-30 14:35:05 +00:00
Guy Harris 8e236e55de For fields of type FT_ABSOLUTE_TIME, have the "display" value be one of
ABSOLUTE_TIME_LOCAL or ABSOLUTE_TIME_UTC, indicating whether to display
the date/time in local time or UTC. (int)ABSOLUTE_TIME_LOCAL ==
(int)BASE_NONE, so there's no source or binary compatiblity issue,
although we might want to eliminate BASE_NONE at some point and have the
BASE_ values used with integral types start at 0, so that you can't
specify BASE_NONE for an integral field.

svn path=/trunk/; revision=31319
2009-12-19 03:17:44 +00:00
Ronnie Sahlberg 6c7cf66046 explicitely cast a guin64 to int to avoid compile warnings
svn path=/trunk/; revision=30412
2009-10-09 04:19:45 +00:00
Anders Broman 1060fd1ede Reverting previous patch as requested by Ronnie.
svn path=/trunk/; revision=30390
2009-10-07 15:41:13 +00:00
Anders Broman 6de05a0476 Make the windows build compile again.
(Probably not the right fix).

svn path=/trunk/; revision=30388
2009-10-07 09:47:45 +00:00
Ronnie Sahlberg c177dd5a0f new samr compiled as a test by the samba4 pidl compiler from mainline
svn path=/trunk/; revision=30383
2009-10-07 07:01:55 +00:00
Ronnie Sahlberg 75b1534c7f more updates to samr to harmonize it with samba
svn path=/trunk/; revision=30354
2009-10-06 08:07:17 +00:00
Anders Broman 1888382b1b Atemt to fix compilation of samr for Windows.
svn path=/trunk/; revision=30294
2009-10-04 09:53:05 +00:00
Ronnie Sahlberg 400c0c987b more merges from samba samr idl file
svn path=/trunk/; revision=30292
2009-10-04 09:00:47 +00:00
Ronnie Sahlberg 384aa6cdfe more merges from the samba samr idl file
svn path=/trunk/; revision=30290
2009-10-04 08:34:25 +00:00
Ronnie Sahlberg 8805b149eb more samr updates for ndr64
svn path=/trunk/; revision=30273
2009-10-04 05:44:18 +00:00
Ronnie Sahlberg 061284dbbd merge some changes to samr from the samba idl
svn path=/trunk/; revision=30272
2009-10-04 04:14:49 +00:00
Ronnie Sahlberg 343b961a48 rename dissect_ndr_4or8 to dissect_ndr_uint3264 to match hte name of
the new datatype uint3264.
create a fake guint3264 type as well


svn path=/trunk/; revision=30264
2009-10-03 05:16:51 +00:00
Ronnie Sahlberg 7783d0f03e add a helper that supports decoding either a 16 or 32 bit integer based
on whether nrd or ndr64 is used.


svn path=/trunk/; revision=30263
2009-10-03 04:49:04 +00:00
Ronnie Sahlberg a6fb5ccdf2 update the handmarshalled code in samr.cnf to handle ndr64 encoding
svn path=/trunk/; revision=30261
2009-10-03 03:39:41 +00:00
Ronnie Sahlberg b70ee1705d a new samr dissector, created using samba PIDL with ndr64 support
svn path=/trunk/; revision=30259
2009-10-03 02:49:04 +00:00
Ronnie Sahlberg d7bdab239c update the alignment for UserInfo so it handles either NDR or NDR64.
This should be done by PIDL once it gets updated.


svn path=/trunk/; revision=30255
2009-10-03 00:13:13 +00:00
Ronnie Sahlberg cfc60e805d update samr.idl and remove a keyword we no longer support in pidl
regenerate samr and frstrans with the new version of pidl


svn path=/trunk/; revision=29219
2009-07-28 14:11:08 +00:00
Ronnie Sahlberg 4802884629 regenerate SAMR using the new version of pidl
svn path=/trunk/; revision=29215
2009-07-28 13:39:42 +00:00
Stig Bjørlykke b228488bc0 From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
Ronnie Sahlberg 5c82d9b784 samr enhancements
svn path=/trunk/; revision=26342
2008-10-03 03:14:48 +00:00
Ronnie Sahlberg 48cabe4f20 SAMR updates
svn path=/trunk/; revision=26340
2008-10-03 02:39:17 +00:00
Ronnie Sahlberg ab6a6c07cb samr updates
svn path=/trunk/; revision=26335
2008-10-02 06:05:05 +00:00
Ronnie Sahlberg 097839cac0 enhancements to SAMR
svn path=/trunk/; revision=26332
2008-10-02 04:45:56 +00:00
Ronnie Sahlberg 8f8f84f6ae update to SAMR
svn path=/trunk/; revision=26330
2008-10-02 00:07:54 +00:00
Ronnie Sahlberg 880bab108c remove a test for null that we dont need since the variable can not be
null at this point


svn path=/trunk/; revision=23045
2007-10-02 08:27:39 +00:00
Ronnie Sahlberg 8fde3b7561 rename dcerpc_smb_store_pol_name to dcerpc_store_polhnd_name
rename dcerpc_smb_fetch_pol  to dcerpc_fetch_polhnd_data and also make 
it take an additional parameter to return the "type" of the policy 
handle, if such a type was stored.

extend the pol_value structure used to track policy handles to also 
store a type to represent what created the policy handle
types could be USER/ALIAS/CONNECT/... etc handles returned from the 
SAMR interface

add a new helper function  dcerpc_store_polhnd_type()

track policy handles between request/responses for dcerpc

update the samr.cnf file to make the samr dissectors for
SetSecurity/QuerySecurity dissect the specific bits for the security 
descriptor correctly based on whether the policy handle refers to a 
CONNECT/DOMAIN/USER/ALIAS or GROUP



svn path=/trunk/; revision=22703
2007-08-28 11:45:08 +00:00
Ronnie Sahlberg b363b1664d dissect lsa_Strings correctly in the samr dissector
svn path=/trunk/; revision=22274
2007-07-09 13:05:52 +00:00
Ronnie Sahlberg 58bc100096 the sidtype is a 32bit enum not a standard enum
svn path=/trunk/; revision=22273
2007-07-09 12:50:57 +00:00
Ronnie Sahlberg 43010b965b make all rids use a single hf filter field
dissect the Type of rid using lsa_Types


svn path=/trunk/; revision=22272
2007-07-09 12:37:20 +00:00
Ronnie Sahlberg 824b7f0a25 rename all policy handles in samr to have a name that describes the type
of handle.



svn path=/trunk/; revision=22270
2007-07-09 10:49:34 +00:00
Ronnie Sahlberg 543f686d6c add the new pidl created SAMR dissector
svn path=/trunk/; revision=22265
2007-07-07 21:47:27 +00:00
Guy Harris 1bc049906a Add some GCC warnings to the standard set, and add some others to the
--enable-extra-gcc-checks set.

If we turn on -pedantic, try turning on -Wno-long-long as well, so that
it's not *so* pedantic that it rejects the 64-bit integral data types
that we explicitly require.

Constify a bunch of stuff, and make some other changes, to get rid of
warnings.

Clean up some indentation.

svn path=/trunk/; revision=21526
2007-04-23 10:59:26 +00:00
Stephen Fisher 2896811274 Fix about 150 warnings new to gcc 4.0 in the error on warning directories.
Comment out -Werror in plugins/asn1/ until warnings can be fixed.


svn path=/trunk/; revision=21158
2007-03-23 22:49:23 +00:00
Gerald Combs 9d5858f635 Move cryptography code to epan/crypt.
svn path=/trunk/; revision=20359
2007-01-09 22:14:07 +00:00
Ronnie Sahlberg eebad152f7 make SAMR not rely on dcv->private_data being persistent any more and use dcv->se_data
once the private_data -> se_data conversion is complete we can plug quite a large number of memory leaks related to dcerpc



svn path=/trunk/; revision=19240
2006-09-16 05:30:31 +00:00
Ronnie Sahlberg feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Guy Harris b13f6dcbd3 Use the new "proto_tree_add_*_format_value" routines.
svn path=/trunk/; revision=17316
2006-02-16 11:43:38 +00:00
Guy Harris dd42bfef7c Get rid of an unused variable.
svn path=/trunk/; revision=16122
2005-10-04 22:08:20 +00:00
Guy Harris 2a8e47b11a Don't ensure all the bytes of a security descriptor exist before calling
"dissect_nt_sec_desc()".  Add a Boolean argument to
"dissect_nt_sec_desc()" to indicate whether a length was passed to it
(so we don't treat -1 as a special value; we want to stop treating -1 as
a special length value, and, in fact, want to stop treating *any*
negative length values specially, so that we don't have to worry about
passing arbitrary 32-bit values from packets as lengths), and have
"dissect_nt_sec_desc()" initially create the protocol tree item for the
security descriptor with a length of "go to the end of the tvbuff", and
set the length once we're done dissecting it - and, if the length was
specified, check at *that* point, *after* we've dissected the security
descriptor, whether we have the entire security descriptor in the
tvbuff.

That means that we don't have to worry about overflows after
"dissect_nt_sec_desc()" returns - if the length was so large that we
would have gotten an overflow, we'd have thrown an exception in the
"tvb_ensure_bytes_exist()" call at the end of "dissect_nt_sec_desc()".

Do sanity checks on offsets within the security descriptor, so we know
the item referred to by the offset is after the fixed-length portion of
the descriptor.

svn path=/trunk/; revision=16113
2005-10-04 10:23:40 +00:00
Luis Ontanon 4dd73467de some ememification
svn path=/trunk/; revision=15431
2005-08-19 15:35:42 +00:00
Jörg Mayer 956eee946f Some 'no previous declararion' warning fixes
svn path=/trunk/; revision=15355
2005-08-14 23:25:20 +00:00
Ulf Lamping 0dc9fb3d4a various code cleanup:
-use g_snprintf instead of sprintf and snprintf
-use g_strdup_printf where appropriate
-remove #include "snprintf.h" (as only g_snprintf should be used)
-replace some more alloc/realloc/calloc/free with their glib pendants

svn path=/trunk/; revision=15264
2005-08-08 18:50:39 +00:00
Jörg Mayer 7949c7f31c char -> const char warning fixes
svn path=/trunk/; revision=15079
2005-07-26 08:01:16 +00:00