Commit graph

141 commits

Author SHA1 Message Date
Jeff Morriss
9be16e49c4 From Stefan Metzmacher and Gregor Beck via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5850 :
The smallest LDAP PDU is 7 bytes, not 4.

svn path=/trunk/; revision=36777
2011-04-21 19:51:05 +00:00
Gerald Combs
670d38ec71 Properly initialize our filter counters.
svn path=/trunk/; revision=36190
2011-03-14 16:00:51 +00:00
Gerald Combs
91fe31c9b4 If we encounter an excessively long filter string or one with too many
elements, add an expert item and throw a ReportedBoundsError. We may
want to handle this more cleanly in the future but this avoids
allocating a huge amount of memory.

svn path=/trunk/; revision=36101
2011-03-01 00:50:17 +00:00
Gerald Combs
4783795690 Split get_dns_name() into get_dns_name() and expand_dns_name().
In dissect_ms_compressed_string() dissect_mscldap_string() simply call
expand_dns_name() instead of using duplicate (and insecure) code. This
*might* break CLDAP and SMB dissection. If that's the case we should
probably revert get_dns_name() and simplify expand_dns_name().

Fixes infinite recursion errors found by joernchen of Phenoelit.

svn path=/trunk/; revision=36029
2011-02-23 00:51:02 +00:00
Chris Maynard
8d47cebd00 Declare ett's as gint, not guint.
svn path=/trunk/; revision=35902
2011-02-10 20:55:26 +00:00
Anders Broman
b2992b2310 ldap.cnf:782: warning: ISO C90 forbids mixed declarations and code
svn path=/trunk/; revision=35476
2011-01-11 11:41:03 +00:00
Ronnie Sahlberg
3079c9c931 From Matthieu Patou <mat@samba.org>
Dissect LDAP DirSyncFlags to show the bits of this bitmap.



svn path=/trunk/; revision=35474
2011-01-11 02:27:41 +00:00
Stephen Fisher
802308ca01 More misc. CLDAP improvements for Active Directory including updating
field names and adding descriptions, changing the Domain GUID in the "LDAP
ping" response to a FT_GUID instead of FT_BYTES, etc.


svn path=/trunk/; revision=35407
2011-01-06 22:24:10 +00:00
Stephen Fisher
a9761c53b7 More minor cleanup/fixes for MS Active Directory's use of CLDAP.
svn path=/trunk/; revision=35404
2011-01-06 18:50:39 +00:00
Stephen Fisher
89d9b73e47 Minor corrections to NtVer dissection for NETLOGON_NT_VERSION Options Bits
in MSCLDAP packets per Microsoft's MS-ADTS specification, section 7.3.1.1,
revision 26 (11/19/2010).  Also re-format code a bit.


svn path=/trunk/; revision=35403
2011-01-06 18:08:14 +00:00
Guy Harris
a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Jeff Morriss
f2fc5d42fd Make some prefs callback functions static. (These modules don't use proto_reg_handoff_*() as their prefs callback.)
svn path=/trunk/; revision=35138
2010-12-06 22:08:48 +00:00
Anders Broman
6dc449e99c The CLDAP attribute value on a CLDAP reply is no longer being decoded
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5239

It got broken in Revision 33390 I think, if attr_type is unset at this point it should be set in the calling function.
http://anonsvn.wireshark.org/viewvc/trunk/asn1/ldap/ldap.cnf?r1=33388&r2=33390

svn path=/trunk/; revision=34176
2010-09-21 14:56:55 +00:00
Gerald Combs
6aaa5874c6 Initialize more variables.
svn path=/trunk/; revision=33392
2010-07-01 00:11:14 +00:00
Gerald Combs
caff9b5513 Initialize a variable.
svn path=/trunk/; revision=33390
2010-06-30 23:45:24 +00:00
Gerald Combs
47c6bf912f Initialize a variable.
svn path=/trunk/; revision=33388
2010-06-30 23:36:24 +00:00
Gerald Combs
6d60493b8a Initialize attributedesc_string in a couple of places so that we
don't end up trying to use an invalid pointer.

svn path=/trunk/; revision=33341
2010-06-27 22:38:28 +00:00
Jeff Morriss
81da8e0b6b Use find_or_create_conversation() in some ASN.1 dissectors
svn path=/trunk/; revision=32791
2010-05-13 18:55:31 +00:00
Bill Meier
f8b92f8d0b #include <stdio.h> not needed.
svn path=/trunk/; revision=32405
2010-04-06 17:01:14 +00:00
Anders Broman
c1defb60a7 Try to fix compilation with MSVC.
Please review.

svn path=/trunk/; revision=31962
2010-02-23 06:28:34 +00:00
Guy Harris
b395a98305 Squelch a bunch of compiler warnings.
svn path=/trunk/; revision=31961
2010-02-23 04:35:23 +00:00
Ronnie Sahlberg
cb37c28c37 Export the dissect_mscldap_string() that is used to dissect
compressed dns strings.



svn path=/trunk/; revision=31650
2010-01-25 05:38:22 +00:00
Anders Broman
9a030dda05 Get rid of check_col();
svn path=/trunk/; revision=31552
2010-01-17 18:16:06 +00:00
Gerald Combs
afc57e6fac Add NULL pointer checks. Fixes the fuzz crash in bug 4351.
svn path=/trunk/; revision=31362
2009-12-24 21:23:38 +00:00
Jaap Keuter
e1ec979363 From Mathieu Parent:
As defined in rfc4511 [Lightweight Directory Access Protocol (LDAP): The Protocol],
see the attached patch that dissects IntermediateMessage.

svn path=/trunk/; revision=31251
2009-12-12 09:30:49 +00:00
Gerasimos Dimitriadis
142b31816c From Mathieu Parent:
Dissector for LDAP Content Synchronization Operation
(Modified in order to remove the unneeded oid_add_from_string's)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4309

svn path=/trunk/; revision=31218
2009-12-09 20:59:20 +00:00
Gerasimos Dimitriadis
eff8b8dd39 From Bug 4298:
Add additional LDAP OIDs for LDAP Content Synchronization Operation
(Slightly modified in order to add code in packet-ldap-template.c)

svn path=/trunk/; revision=31179
2009-12-04 23:09:37 +00:00
Stig Bjørlykke
5c0369ba97 Apply r30376 to asn1 template files.
svn path=/trunk/; revision=30767
2009-10-30 10:21:35 +00:00
Kovarththanan Rajaratnam
4f2332256c Remove unused variable
svn path=/trunk/; revision=30506
2009-10-11 14:21:50 +00:00
Kovarththanan Rajaratnam
78b0ee16e2 Backport r29665 to template file so that the change is not overwritten when we regenerate the dissector
svn path=/trunk/; revision=30455
2009-10-09 21:41:06 +00:00
Kovarththanan Rajaratnam
7ab993bee7 Remove unused NEED_PACKET_PROTO_H variable
svn path=/trunk/; revision=30409
2009-10-08 17:26:57 +00:00
Kovarththanan Rajaratnam
00810ff199 * Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards

svn path=/trunk/; revision=30127
2009-09-24 20:21:23 +00:00
Kovarththanan Rajaratnam
8b515e9340 Switch a bunch of dissectors over to using tvb_new_subset_remaining()
svn path=/trunk/; revision=29446
2009-08-16 12:36:22 +00:00
Ronnie Sahlberg
ac1b52a838 From: Matthieu Patou <mat+Informatique.Samba@matws.net>
Date: Mon, 27 Jul 2009 08:55:55 +0000 (+0200)
Subject: patch_ldap_260709

Add a few additional LDAP OIDs
and increase the maximum SASL blob size to be 1M instead of 256kb



svn path=/trunk/; revision=29210
2009-07-28 07:18:05 +00:00
Stig Bjørlykke
0437f102c3 From Kovarththanan Rajaratnam:
More FT_XXX cleanup.

svn path=/trunk/; revision=28971
2009-07-07 09:02:59 +00:00
Anders Broman
f16859def3 From Kovarththanan Rajaratnam:
Cleanup header_field_info definitions
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3548

svn path=/trunk/; revision=28940
2009-07-05 11:49:36 +00:00
Stig Bjørlykke
4721f29558 Changed check for having multiple ldap PDU's in one frame.
The previous check is incorrect when the first ldap frame in the capture is
selected and the filter is changed, or selecting "Follow TCP Stream".

Also removed check_col().

svn path=/trunk/; revision=28889
2009-06-30 10:38:00 +00:00
Stig Bjørlykke
942b03f06e Cleanup protocol name for ldap.
svn path=/trunk/; revision=28888
2009-06-30 08:28:21 +00:00
Stig Bjørlykke
7614d925c2 More header_field_info cleanup.
svn path=/trunk/; revision=28799
2009-06-22 05:35:47 +00:00
Graeme Lunt
05a3dca2bc LDAP control support for Password policy for LDAP directories.
svn path=/trunk/; revision=28783
2009-06-21 09:13:11 +00:00
Bill Meier
cb3db511f6 As suggested by Jakob Zawadzki: (Bug #3311): g_free() is NULL safe, so we don't need check against it.
svn path=/trunk/; revision=27861
2009-03-27 12:16:02 +00:00
Stig Bjørlykke
37575374b8 Added one more string_or_null.
svn path=/trunk/; revision=27482
2009-02-18 10:07:29 +00:00
Gerald Combs
95ddd62076 Add a string utility function "string_or_null" which can be used to
guarantee a non-null string value. Use it in the LDAP dissector. Fixes
the crash on Windows (and other platforms) reported in bug 3262.

svn path=/trunk/; revision=27478
2009-02-17 23:15:35 +00:00
Guy Harris
daf7a9f9f0 Get rid of some warnings.
svn path=/trunk/; revision=26772
2008-11-13 17:54:17 +00:00
Bill Meier
422bca9888 Small changes related to proto_reg_handoff;
Use find_dissector;
 Initialize saved tcp_port pref properly; This should
  fix a possble bug wherein LDAP over SSL would not
  be dissected properly. (I don't have a test capture
  to verify this fix).

svn path=/trunk/; revision=26764
2008-11-12 23:55:52 +00:00
Anders Broman
9c5fa3bc3c Put rev 26706 in the template file.
svn path=/trunk/; revision=26711
2008-11-06 19:41:38 +00:00
Anders Broman
d4a70f2961 Add the missing part of the fix for "Failure to dissect long SASL wrapped LDAP response".
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2687

svn path=/trunk/; revision=26272
2008-09-25 19:21:44 +00:00
Anders Broman
d261400dea From Gary Reynolds:
Extended the cldap desector to include all the current netlogon response data
types.  

Expanded the cldap netlogon ntver option to be a bit mask of the search flags

Updated the DS flags fields to include Windows 2008 options.

svn path=/trunk/; revision=25942
2008-08-06 06:53:04 +00:00
Anders Broman
37969b91b1 From Yaniv Kaul:
( I edited the template files)
Failure to dissect long SASL wrapped LDAP response.

svn path=/trunk/; revision=25890
2008-08-01 11:20:50 +00:00
Anders Broman
201b5205df Get rid of some unused code warnings and fix an Id marking and some indentation changes.
svn path=/trunk/; revision=25803
2008-07-23 12:45:24 +00:00